[dubbo] branch master updated: A new class (InternalRunnable) is added to wrap the ordinary Runnable… (#6141)

[liujun]

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 6db0dc1  A new class (InternalRunnable) is added to wrap the ordinary 
Runnable… (#6141)
6db0dc1 is described below

commit 6db0dc12cf3cfc4778433b828a0797198ff9983a
Author: KArthurL <50560956+karth...@users.noreply.github.com>
AuthorDate: Wed Feb 24 00:25:22 2021 +0800

    A new class (InternalRunnable) is added to wrap the ordinary Runnable… 
(#6141)
---
 .../dubbo/common/threadlocal/InternalRunnable.java | 53 ++++++++++++++++++++++
 .../threadlocal/NamedInternalThreadFactory.java    |  2 +-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalRunnable.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalRunnable.java
new file mode 100644
index 0000000..6cc8db8
--- /dev/null
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalRunnable.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.common.threadlocal;
+
+
+/**
+ * InternalRunnable
+ * There is a risk of memory leak when using {@link InternalThreadLocal} 
without calling
+ * {@link InternalThreadLocal#removeAll()}.
+ * This design is learning from {@see 
io.netty.util.concurrent.FastThreadLocalRunnable} which is in Netty.
+ */
+public class InternalRunnable implements Runnable{
+    private final Runnable runnable;
+
+    public InternalRunnable(Runnable runnable){
+        this.runnable=runnable;
+    }
+
+    /**
+     * After the task execution is completed, it will call {@link 
InternalThreadLocal#removeAll()} to clear
+     * unnecessary variables in the thread.
+     */
+    @Override
+    public void run() {
+        try{
+            runnable.run();
+        }finally {
+            InternalThreadLocal.removeAll();
+        }
+    }
+
+    /**
+     * Wrap ordinary Runnable into {@link InternalThreadLocal}.
+     */
+     static Runnable Wrap(Runnable runnable){
+        return runnable instanceof InternalRunnable?runnable:new 
InternalRunnable(runnable);
+    }
+}
diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactory.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactory.java
index 52b8d56..0bb305f 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactory.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactory.java
@@ -40,7 +40,7 @@ public class NamedInternalThreadFactory extends 
NamedThreadFactory {
     @Override
     public Thread newThread(Runnable runnable) {
         String name = mPrefix + mThreadNum.getAndIncrement();
-        InternalThread ret = new InternalThread(mGroup, runnable, name, 0);
+        InternalThread ret = new InternalThread(mGroup, 
InternalRunnable.Wrap(runnable), name, 0);
         ret.setDaemon(mDaemon);
         return ret;
     }