[jboss-cvs] JBossAS SVN: r111162 - projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2011-04-11 16:03:03 -0400 (Mon, 11 Apr 2011)
New Revision: 111162

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolStatisticsImpl.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
Log:
Count blocking time on pool filling too

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolStatisticsImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolStatisticsImpl.java	2011-04-11 19:12:01 UTC (rev 111161)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolStatisticsImpl.java	2011-04-11 20:03:03 UTC (rev 111162)
@@ -353,10 +353,13 @@
    {
       if (isEnabled())
       {
-         totalBlockingTime.addAndGet(delta);
+         if (delta > 0)
+         {
+            totalBlockingTime.addAndGet(delta);
 
-         if (delta > maxWaitTime.get())
-            maxWaitTime.set(delta);
+            if (delta > maxWaitTime.get())
+               maxWaitTime.set(delta);
+         }
       }
    }
 

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java	2011-04-11 19:12:01 UTC (rev 111161)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java	2011-04-11 20:03:03 UTC (rev 111162)
@@ -609,8 +609,10 @@
          // Also avoids unnessary fill checking when all connections are checked out
          try
          {
+            long startWait = System.currentTimeMillis();
             if (permits.tryAcquire(poolConfiguration.getBlockingTimeout(), TimeUnit.MILLISECONDS))
             {
+               statistics.deltaTotalBlockingTime(System.currentTimeMillis() - startWait);
                try
                {
                   if (shutdown.get())