[freenet-cvs] r11359 - trunk/freenet/src/freenet/clients/http

[t...@freenetproject.org]

Author: toad
Date: 2006-12-12 17:12:43 +0000 (Tue, 12 Dec 2006)
New Revision: 11359

Modified:
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
Log:
Better thread count

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2006-12-12 17:10:50 UTC (rev 11358)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2006-12-12 17:12:43 UTC (rev 11359)
@@ -5,6 +5,8 @@
 import java.text.*;
 import java.util.*;

+import org.tanukisoftware.wrapper.WrapperManager;
+
 import freenet.client.*;
 import freenet.config.SubConfig;
 import freenet.io.comm.*;
@@ -452,14 +454,18 @@
                 long usedJavaMem = (long)(totalMemory - freeMemory);
                 long allocatedJavaMem = (long)totalMemory;
                 long maxJavaMem = (long)maxMemory;
-                int threadCount = Thread.activeCount();
                 int availableCpus = rt.availableProcessors();
+                
+                       ThreadGroup tg = 
Thread.currentThread().getThreadGroup();
+                       while(tg.getParent() != null) tg = tg.getParent();
+                       int threadCount = tg.activeCount();

                 jvmStatsList.addChild("li", "Used Java memory:\u00a0" + 
SizeUtil.formatSize(usedJavaMem, true));
                 jvmStatsList.addChild("li", "Allocated Java memory:\u00a0" + 
SizeUtil.formatSize(allocatedJavaMem, true));
                 jvmStatsList.addChild("li", "Maximum Java memory:\u00a0" + 
SizeUtil.formatSize(maxJavaMem, true));
                 jvmStatsList.addChild("li", "Available CPUs:\u00a0" + 
availableCpus);
                 jvmStatsList.addChild("li", "Running threads:\u00a0" + 
thousendPoint.format(threadCount));
+                

                 // unclaimedFIFOMessageCounts box
                                overviewTableRow = overviewTable.addChild("tr");