Merge pull request #2217 from adamretter/hotfix/thread-groups-and-naming

Fix thread naming

Author: dizzzz

.classpath

@@ -22,7 +22,7 @@
 	<classpathentry kind="src" path="extensions/debuggee/test"/>
 	<classpathentry kind="src" path="extensions/webdav/src"/>
 	<classpathentry kind="src" path="extensions/commands/src"/>
-	<classpathentry kind="lib" path="lib/core/j8fu-1.20.jar"/>
+	<classpathentry kind="lib" path="lib/core/j8fu-1.21.jar"/>
 	<classpathentry kind="lib" path="lib/core/icu4j-59_1.jar"/>
 	<classpathentry kind="lib" path="lib/core/icu4j-localespi-59_1.jar"/>
 	<classpathentry kind="lib" path="lib/core/pkg-java-fork.jar"/>

extensions/debuggee/src/org/exist/debuggee/ScriptRunner.java

@@ -31,6 +31,8 @@
 import org.exist.xquery.CompiledXQuery;
 import org.exist.xquery.XQuery;
 
+import static org.exist.util.ThreadUtils.nameInstanceThread;
+
 /**
  * @author <a href="mailto:[email protected]">Dmitriy Shabanov</a>
  *
@@ -48,7 +50,7 @@ public ScriptRunner(SessionImpl session, CompiledXQuery compiled) {
 		this.session = session;
 		expression = compiled;
 
-		thread = new Thread(this);
+		thread = newInstanceThread(BrokerPool.getInstance(), "scriptRunner" this);
 		thread.setDaemon(true);
 		thread.setName("Debug session "+compiled.getContext().hashCode());
 	}

extensions/debuggee/src/org/exist/debugger/DebuggerImpl.java

@@ -50,6 +50,8 @@
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
+import static org.exist.util.ThreadUtils.newGlobalThread;
+
 /**
  * @author <a href="mailto:[email protected]">Dmitriy Shabanov</a>
  * 
@@ -117,7 +119,7 @@ public DebuggingSource init(String url) throws IOException,
 		sources = new HashMap<String, DebuggingSource>();
 		currentTransactionId = 1;
 
-		Thread session = new Thread(new HttpSession(this, url));
+		Thread session = newGlobalThread("debuggerHttpSession" new HttpSession(this, url));
 		session.start();
 
 		// 30s timeout

extensions/fluent/src/org/exist/fluent/Database.java

@@ -30,6 +30,8 @@
 import java.text.MessageFormat;
 import java.util.*;
 
+import static org.exist.util.ThreadUtils.newInstanceThread;
+
 /**
  * <p>The global entry point to an embedded instance of the <a href='http://exist-db.org'>eXist </a>database.
  * The static methods on this class control the lifecycle of the database connection.  It follows that
@@ -561,7 +563,7 @@ private static class Defragmenter implements Runnable {
 
 		public void start() {
 			if (thread != null) return;
-			thread = new Thread(this, "Database defragmenter");
+			thread = newInstanceThread(pool, "fluent.database-defragmenter", this);
 			thread.setPriority(Thread.NORM_PRIORITY-3);
 			thread.setDaemon(true);
 			thread.start();

extensions/fluent/src/org/exist/fluent/WeakMultiValueHashMap.java

@@ -3,6 +3,8 @@
 import java.lang.ref.WeakReference;
 import java.util.*;
 
+import static org.exist.util.ThreadUtils.newGlobalThread;
+
 class WeakMultiValueHashMap<K,V> {
 
 	/**
@@ -84,7 +86,7 @@ public void remove() {
 
 	private static final Sweeper SWEEPER = new Sweeper();
 	static {
-		Thread thread = new Thread(SWEEPER, "WeakMultiValueHashMap sweeper");
+		Thread thread = newGlobalThread("fluent.weakMultiValueHashMap.sweeper", SWEEPER);
 		thread.setPriority(Thread.NORM_PRIORITY-3);
 		thread.setDaemon(true);
 		thread.start();

extensions/modules/src/org/exist/xquery/modules/exi/EXIUtils.java

@@ -50,7 +50,7 @@ protected static InputStream getInputStream(Item item, XQueryContext context) th
                 Serializer serializer = context.getBroker().newSerializer();
 
                 NodeValue node = (NodeValue) item;
-                return new NodeInputStream(serializer, node);
+                return new NodeInputStream(context.getBroker().getBrokerPool(), serializer, node);
             default:
                 LOG.error("Wrong item type " + Type.getTypeName(item.getType()));
                 throw new XPathException("wrong item type " + Type.getTypeName(item.getType()));

lib/core/j8fu-1.20.jar

@@ -11,7 +11,7 @@ file.reference.commons-io-2.6.jar=lib/core/commons-io-2.6.jar
 file.reference.commons-lang3-3.7.jar=lib/optional/commons-lang3-3.7.jar
 file.reference.commons-net-3.6.jar=lib/optional/commons-net-3.6.jar
 file.reference.httpcore-4.4.8.jar=lib/optional/httpcore-4.4.8.jar
-file.reference.j8fu-1.20.jar=lib/core/j8fu-1.20.jar
+file.reference.j8fu-1.21.jar=lib/core/j8fu-1.21.jar
 file.reference.icu4j-59_1.jar=lib/core/icu4j-59_1.jar
 file.reference.icu4j-localespi-59_1.jar=lib/core/icu4j-localespi-59_1.jar
 file.reference.caffeine-2.6.2.jar=lib/core/caffeine-2.6.2.jar
@@ -368,7 +368,7 @@ javac.classpath=\
     ${file.reference.tools-java-1.0-SNAPSHOT.jar}:\
     ${file.reference.tagsoup-1.2.1.jar}:\
     ${file.reference.exquery-annotations-common-1.0-SNAPSHOT.jar}:\
-    ${file.reference.j8fu-1.20.jar}:\
+    ${file.reference.j8fu-1.21.jar}:\
     ${file.reference.icu4j-59_1.jar}:\
     ${file.reference.icu4j-localespi-59_1.jar}:\
     ${file.reference.caffeine-2.6.2.jar}:\

lib/core/j8fu-1.21.jar

@@ -58,6 +58,8 @@ public interface Database {
 
     public String getId();
 
+    ThreadGroup getThreadGroup();
+
     /**
      * 
      * @return SecurityManager