[GitHub] beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool
beiwei30 commented on a change in pull request #1568: Extension: Enhanced
Thread Pool
URL: https://github.com/apache/incubator-dubbo/pull/1568#discussion_r17958
##
File path:
dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/enhanced/EnhancedThreadPoolExecutor.java
##
@@ -0,0 +1,66 @@
+/*
+ * 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 com.alibaba.dubbo.common.threadpool.support.enhanced;
+
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Enhanced thread pool
+ */
+public class EnhancedThreadPoolExecutor extends ThreadPoolExecutor {
+
+//task count
+private final AtomicInteger submittedTaskCount = new AtomicInteger(0);
+
+public EnhancedThreadPoolExecutor(int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit, EnhancedTaskQueue workQueue,
ThreadFactory threadFactory, RejectedExecutionHandler handler) {
+super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue,
threadFactory, handler);
+}
+
+/**
+ * @return current tasks which are executed
+ */
+public int getSubmittedTaskCount() {
+return submittedTaskCount.get();
+}
+
+@Override
+protected void afterExecute(Runnable r, Throwable t) {
+submittedTaskCount.decrementAndGet();
+}
+
+@Override
+public void execute(Runnable command) {
+//do not increment in method beforeExecute!
Review comment:
add space after `//`
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool
beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool URL: https://github.com/apache/incubator-dubbo/pull/1568#discussion_r17518 ## File path: dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/enhanced/EnhancedTaskQueue.java ## @@ -0,0 +1,73 @@ +/* + * 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 com.alibaba.dubbo.common.threadpool.support.enhanced; + +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RejectedExecutionException; + +/** + * enhanced task queue in the enhanced thread pool Review comment: describe the behavior here This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool
beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool URL: https://github.com/apache/incubator-dubbo/pull/1568#discussion_r18550 ## File path: dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/enhanced/EnhancedTaskQueue.java ## @@ -0,0 +1,73 @@ +/* + * 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 com.alibaba.dubbo.common.threadpool.support.enhanced; Review comment: I suggest change 'enhanced' into other word, more accurate to describe the behavior, for example: eager or greedy? once decided, pls. change package name, class name, and comments. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool
beiwei30 commented on a change in pull request #1568: Extension: Enhanced
Thread Pool
URL: https://github.com/apache/incubator-dubbo/pull/1568#discussion_r17431
##
File path:
dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/enhanced/EnhancedTaskQueue.java
##
@@ -0,0 +1,73 @@
+/*
+ * 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 com.alibaba.dubbo.common.threadpool.support.enhanced;
+
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+
+/**
+ * enhanced task queue in the enhanced thread pool
+ */
+public class EnhancedTaskQueue extends
LinkedBlockingQueue {
+
+private static final long serialVersionUID = -2635853580887179627L;
+
+private EnhancedThreadPoolExecutor executor;
+
+public EnhancedTaskQueue(int capacity) {
+super(capacity);
+}
+
+public void setExecutor(EnhancedThreadPoolExecutor exec) {
+executor = exec;
+}
+
+@Override
+public boolean offer(Runnable runnable) {
+if (executor == null) {
+throw new RejectedExecutionException("enhanced queue does not have
executor !");
+}
+int currentPoolThreadSize = executor.getPoolSize();
+//have free worker. put task into queue to let the worker deal with
task.
+if (executor.getSubmittedTaskCount() < currentPoolThreadSize) {
+return super.offer(runnable);
+}
+
+// return false to let executor create new worker.
+if (currentPoolThreadSize < executor.getMaximumPoolSize()) {
+return false;
+}
+
+//currentPoolThreadSize >= max
+return super.offer(runnable);
+}
+
+/**
+ * retry offer task
+ *
+ * @param o task
+ * @return offer success or not
+ * @throws RejectedExecutionException if executor is terminated.
+ */
+public boolean retryOffer(Runnable o) {
+if (executor.isShutdown()) {
+throw new RejectedExecutionException("Executor is shutdown !");
Review comment:
change "Executor is shutdown !" to "Executor is shutdown!", there's one
extra space.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool
beiwei30 commented on a change in pull request #1568: Extension: Enhanced
Thread Pool
URL: https://github.com/apache/incubator-dubbo/pull/1568#discussion_r17893
##
File path:
dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/enhanced/EnhancedThreadPoolExecutor.java
##
@@ -0,0 +1,66 @@
+/*
+ * 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 com.alibaba.dubbo.common.threadpool.support.enhanced;
+
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Enhanced thread pool
+ */
+public class EnhancedThreadPoolExecutor extends ThreadPoolExecutor {
+
+//task count
+private final AtomicInteger submittedTaskCount = new AtomicInteger(0);
+
+public EnhancedThreadPoolExecutor(int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit, EnhancedTaskQueue workQueue,
ThreadFactory threadFactory, RejectedExecutionHandler handler) {
Review comment:
keep line margin 120 chars.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool
beiwei30 commented on a change in pull request #1568: Extension: Enhanced
Thread Pool
URL: https://github.com/apache/incubator-dubbo/pull/1568#discussion_r17278
##
File path:
dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/enhanced/EnhancedTaskQueue.java
##
@@ -0,0 +1,73 @@
+/*
+ * 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 com.alibaba.dubbo.common.threadpool.support.enhanced;
+
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+
+/**
+ * enhanced task queue in the enhanced thread pool
+ */
+public class EnhancedTaskQueue extends
LinkedBlockingQueue {
+
+private static final long serialVersionUID = -2635853580887179627L;
+
+private EnhancedThreadPoolExecutor executor;
+
+public EnhancedTaskQueue(int capacity) {
+super(capacity);
+}
+
+public void setExecutor(EnhancedThreadPoolExecutor exec) {
+executor = exec;
+}
+
+@Override
+public boolean offer(Runnable runnable) {
+if (executor == null) {
+throw new RejectedExecutionException("enhanced queue does not have
executor !");
+}
+int currentPoolThreadSize = executor.getPoolSize();
+//have free worker. put task into queue to let the worker deal with
task.
Review comment:
leave space after `//`
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool
beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool URL: https://github.com/apache/incubator-dubbo/pull/1568#discussion_r17766 ## File path: dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/enhanced/EnhancedThreadPool.java ## @@ -0,0 +1,50 @@ +/* + * 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 com.alibaba.dubbo.common.threadpool.support.enhanced; + +import com.alibaba.dubbo.common.Constants; +import com.alibaba.dubbo.common.URL; +import com.alibaba.dubbo.common.threadpool.ThreadPool; +import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; +import com.alibaba.dubbo.common.utils.NamedThreadFactory; + +import java.util.concurrent.Executor; +import java.util.concurrent.TimeUnit; + +/** + * enhanced thread pool. + * When the core threads are all in busy , create new thread instead of putting task into blocking queue . Review comment: remove extra space from 'blocking queue .' This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool
beiwei30 commented on a change in pull request #1568: Extension: Enhanced
Thread Pool
URL: https://github.com/apache/incubator-dubbo/pull/1568#discussion_r17679
##
File path:
dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/enhanced/EnhancedThreadPool.java
##
@@ -0,0 +1,50 @@
+/*
+ * 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 com.alibaba.dubbo.common.threadpool.support.enhanced;
+
+import com.alibaba.dubbo.common.Constants;
+import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.threadpool.ThreadPool;
+import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport;
+import com.alibaba.dubbo.common.utils.NamedThreadFactory;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * enhanced thread pool.
+ * When the core threads are all in busy , create new thread instead of
putting task into blocking queue .
+ */
+public class EnhancedThreadPool implements ThreadPool {
+
+@Override
+public Executor getExecutor(URL url) {
+String name = url.getParameter(Constants.THREAD_NAME_KEY,
Constants.DEFAULT_THREAD_NAME);
+int cores = url.getParameter(Constants.CORE_THREADS_KEY,
Constants.DEFAULT_CORE_THREADS);
+int threads = url.getParameter(Constants.THREADS_KEY,
Integer.MAX_VALUE);
+int queues = url.getParameter(Constants.QUEUES_KEY,
Constants.DEFAULT_QUEUES);
+int alive = url.getParameter(Constants.ALIVE_KEY,
Constants.DEFAULT_ALIVE);
+
+//init queue and enhanced executor
+EnhancedTaskQueue enhancedTaskQueue = new
EnhancedTaskQueue(queues <= 0 ? 1 : queues);
+EnhancedThreadPoolExecutor executor = new
EnhancedThreadPoolExecutor(cores, threads, alive, TimeUnit.MILLISECONDS,
enhancedTaskQueue,
Review comment:
keep line margin 120 chars.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] beiwei30 commented on a change in pull request #1568: Extension: Enhanced Thread Pool
beiwei30 commented on a change in pull request #1568: Extension: Enhanced
Thread Pool
URL: https://github.com/apache/incubator-dubbo/pull/1568#discussion_r17993
##
File path:
dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/enhanced/EnhancedThreadPoolExecutor.java
##
@@ -0,0 +1,66 @@
+/*
+ * 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 com.alibaba.dubbo.common.threadpool.support.enhanced;
+
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Enhanced thread pool
+ */
+public class EnhancedThreadPoolExecutor extends ThreadPoolExecutor {
+
+//task count
+private final AtomicInteger submittedTaskCount = new AtomicInteger(0);
+
+public EnhancedThreadPoolExecutor(int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit, EnhancedTaskQueue workQueue,
ThreadFactory threadFactory, RejectedExecutionHandler handler) {
+super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue,
threadFactory, handler);
+}
+
+/**
+ * @return current tasks which are executed
+ */
+public int getSubmittedTaskCount() {
+return submittedTaskCount.get();
+}
+
+@Override
+protected void afterExecute(Runnable r, Throwable t) {
+submittedTaskCount.decrementAndGet();
+}
+
+@Override
+public void execute(Runnable command) {
+//do not increment in method beforeExecute!
+submittedTaskCount.incrementAndGet();
+try {
+super.execute(command);
+} catch (RejectedExecutionException rx) {
+//retry to offer the task into queue .
Review comment:
add space after `//`
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
