Introduce Kernel thread and statistics

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / Kernel.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
index c63184a2435d189f314ebc57319dfabb4469b11b..af4f0ff2a75cd868d7597f42f35b63d0d9a8c9ae 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
@@ -39,10 +39,12 @@ final class Kernel implements ServiceListener {
 
        private final BundleContext bundleContext = Activator.getBundleContext();
 
-       private JackrabbitNode node;
-       private OsgiJackrabbitRepositoryFactory repositoryFactory;
-       private NodeSecurity nodeSecurity;
-       private NodeHttp nodeHttp;
+       ThreadGroup threadGroup = new ThreadGroup(Kernel.class.getSimpleName());
+       JackrabbitNode node;
+       OsgiJackrabbitRepositoryFactory repositoryFactory;
+       NodeSecurity nodeSecurity;
+       NodeHttp nodeHttp;
+       private KernelThread kernelThread;
 
        void init() {
                ClassLoader currentContextCl = Thread.currentThread()
@@ -68,6 +70,11 @@ final class Kernel implements ServiceListener {
                        ExtendedHttpService httpService = waitForHttpService();
                        nodeHttp = new NodeHttp(httpService, node, nodeSecurity);
 
+                       // Kernel thread
+                       kernelThread = new KernelThread(this);
+                       kernelThread.setContextClassLoader(Kernel.class.getClassLoader());
+                       kernelThread.start();
+
                        // Publish services to OSGi
                        nodeSecurity.publish();
                        node.publish(repositoryFactory);
@@ -94,6 +101,8 @@ final class Kernel implements ServiceListener {
        void destroy() {
                long begin = System.currentTimeMillis();
 
+               kernelThread.destroyAndJoin();
+
                if (nodeHttp != null)
                        nodeHttp.destroy();
                if (nodeSecurity != null)