You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jf...@apache.org on 2018/11/03 19:19:38 UTC
[1/4] tomee git commit: Allow for JMX on ManagedExecutorServices
Repository: tomee
Updated Branches:
refs/heads/tomee-7.0.x 4309ec73f -> 4f56a3009
Allow for JMX on ManagedExecutorServices
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1590538b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1590538b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1590538b
Branch: refs/heads/tomee-7.0.x
Commit: 1590538beb144aacc576728bb6c34512e05a47a8
Parents: 4c98121
Author: Jonathan S. Fisher <ex...@gmail.com>
Authored: Sun Sep 23 22:44:17 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Sun Sep 23 22:44:17 2018 -0500
----------------------------------------------------------------------
.../impl/ManagedExecutorServiceImpl.java | 59 +++++++++++++++++++-
1 file changed, 58 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/1590538b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index e710aa8..59831b4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -29,6 +29,7 @@ import java.util.concurrent.AbstractExecutorService;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
public class ManagedExecutorServiceImpl extends AbstractExecutorService implements ManagedExecutorService, DestroyableResource {
@@ -59,8 +60,64 @@ public class ManagedExecutorServiceImpl extends AbstractExecutorService implemen
public boolean isTerminated() {
return delegate.isTerminated();
}
+
+ public Integer getCorePoolSize() {
+ if (delegate instanceof ThreadPoolExecutor) {
+ return ((ThreadPoolExecutor) delegate).getCorePoolSize();
+ } else {
+ return null;
+ }
+ }
+
+ public Integer getMaximumPoolSize() {
+ if (delegate instanceof ThreadPoolExecutor) {
+ return ((ThreadPoolExecutor) delegate).getMaximumPoolSize();
+ } else {
+ return null;
+ }
+ }
- @Override
+ public Integer getPoolSize() {
+ if (delegate instanceof ThreadPoolExecutor) {
+ return ((ThreadPoolExecutor) delegate).getPoolSize();
+ } else {
+ return null;
+ }
+ }
+
+ public Integer getActiveCount() {
+ if (delegate instanceof ThreadPoolExecutor) {
+ return ((ThreadPoolExecutor) delegate).getActiveCount();
+ } else {
+ return null;
+ }
+ }
+
+ public Integer getLargestPoolSize() {
+ if (delegate instanceof ThreadPoolExecutor) {
+ return ((ThreadPoolExecutor) delegate).getLargestPoolSize();
+ } else {
+ return null;
+ }
+ }
+
+ public Long getTaskCount() {
+ if (delegate instanceof ThreadPoolExecutor) {
+ return ((ThreadPoolExecutor) delegate).getTaskCount();
+ } else {
+ return null;
+ }
+ }
+
+ public Long getCompletedTaskCount() {
+ if (delegate instanceof ThreadPoolExecutor) {
+ return ((ThreadPoolExecutor) delegate).getCompletedTaskCount();
+ } else {
+ return null;
+ }
+ }
+
+ @Override
public boolean awaitTermination(final long timeout, final TimeUnit unit) throws InterruptedException {
return delegate.awaitTermination(timeout, unit);
}
[2/4] tomee git commit: Update ManagedExecutorServiceImpl.java
Posted by jf...@apache.org.
Update ManagedExecutorServiceImpl.java
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0c36aa3c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0c36aa3c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0c36aa3c
Branch: refs/heads/tomee-7.0.x
Commit: 0c36aa3cbf5ca0635bea47f85a9f67dd57c4399f
Parents: 1590538
Author: Jonathan S. Fisher <ex...@gmail.com>
Authored: Tue Sep 25 13:29:37 2018 -0500
Committer: GitHub <no...@github.com>
Committed: Tue Sep 25 13:29:37 2018 -0500
----------------------------------------------------------------------
.../apache/openejb/threads/impl/ManagedExecutorServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/0c36aa3c/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index 59831b4..bea9d1d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -101,9 +101,9 @@ public class ManagedExecutorServiceImpl extends AbstractExecutorService implemen
}
}
- public Long getTaskCount() {
+ public Long getQueueSize() {
if (delegate instanceof ThreadPoolExecutor) {
- return ((ThreadPoolExecutor) delegate).getTaskCount();
+ return ((ThreadPoolExecutor) delegate).getQueue().size();
} else {
return null;
}
[3/4] tomee git commit: Update ManagedExecutorServiceImpl.java
Posted by jf...@apache.org.
Update ManagedExecutorServiceImpl.java
Needs to return an Integer, not a long
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8e907820
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8e907820
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8e907820
Branch: refs/heads/tomee-7.0.x
Commit: 8e907820e35c4f6ac666e0a80bfe0be6385c7e1a
Parents: 0c36aa3
Author: Jonathan S. Fisher <ex...@gmail.com>
Authored: Tue Sep 25 13:34:03 2018 -0500
Committer: GitHub <no...@github.com>
Committed: Tue Sep 25 13:34:03 2018 -0500
----------------------------------------------------------------------
.../apache/openejb/threads/impl/ManagedExecutorServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/8e907820/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index bea9d1d..68b27e8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -101,7 +101,7 @@ public class ManagedExecutorServiceImpl extends AbstractExecutorService implemen
}
}
- public Long getQueueSize() {
+ public Integer getQueueSize() {
if (delegate instanceof ThreadPoolExecutor) {
return ((ThreadPoolExecutor) delegate).getQueue().size();
} else {
[4/4] tomee git commit: Merge branch
'exabrial/TOMEE-2243_jmx-on-managed-executors' of github.com:exabrial/tomee
into tomee-7.0.x
Posted by jf...@apache.org.
Merge branch 'exabrial/TOMEE-2243_jmx-on-managed-executors' of github.com:exabrial/tomee into tomee-7.0.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4f56a300
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4f56a300
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4f56a300
Branch: refs/heads/tomee-7.0.x
Commit: 4f56a300937362c70f643e617eeae8e313b18c10
Parents: 4309ec7 8e90782
Author: Jonathan S. Fisher <ex...@gmail.com>
Authored: Sat Nov 3 14:19:24 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Sat Nov 3 14:19:24 2018 -0500
----------------------------------------------------------------------
.../impl/ManagedExecutorServiceImpl.java | 59 +++++++++++++++++++-
1 file changed, 58 insertions(+), 1 deletion(-)
----------------------------------------------------------------------