[jboss-cvs] JBossAS SVN: r109249 - projects/jboss-jca/branches/performance/pojos/src/main/java/org/jboss/jca/performance/pojos.

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

Author: jesper.pedersen
Date: 2010-11-10 15:30:26 -0500 (Wed, 10 Nov 2010)
New Revision: 109249

Modified:
   projects/jboss-jca/branches/performance/pojos/src/main/java/org/jboss/jca/performance/pojos/DatabaseTester.java
Log:
Shutdown thread pool after the run

Modified: projects/jboss-jca/branches/performance/pojos/src/main/java/org/jboss/jca/performance/pojos/DatabaseTester.java
===================================================================
--- projects/jboss-jca/branches/performance/pojos/src/main/java/org/jboss/jca/performance/pojos/DatabaseTester.java	2010-11-10 20:17:10 UTC (rev 109248)
+++ projects/jboss-jca/branches/performance/pojos/src/main/java/org/jboss/jca/performance/pojos/DatabaseTester.java	2010-11-10 20:30:26 UTC (rev 109249)
@@ -132,7 +132,8 @@
       if (dbJndiName == null || dbJndiName.trim().equals(""))
          throw new IllegalArgumentException("No datasource JNDI name defined");
 
-      long start = System.currentTimeMillis();
+      long start = 0;
+      long end = 0;
 
       if (multiThreaded)
       {
@@ -148,13 +149,16 @@
             threadPoolExecutor.allowCoreThreadTimeOut(true);
             threadPoolExecutor.prestartAllCoreThreads();
 
+            start = System.currentTimeMillis();
             for (int counter = 0; counter < iterations; counter++)
             {
                Test t = new Test(dbJndiName, sqls, cdl);
                threadPoolExecutor.submit(t);
             }
+            cdl.await();
+            end = System.currentTimeMillis();
 
-            cdl.await();
+            threadPoolExecutor.shutdown();
          }
          catch (Throwable t)
          {
@@ -163,14 +167,19 @@
       }
       else
       {
+         start = System.currentTimeMillis();
          Test t = new Test(dbJndiName, sqls);
          for (int counter = 0; counter < iterations; counter++)
          {
             t.run();
          }
+         end = System.currentTimeMillis();
       }
 
-      log.info("Took: " + (System.currentTimeMillis() - start) + " ms");
+      long elapsed = end - start;
+
+      log.info("Took: " + elapsed + " ms");
+      log.info("Unit of work/ms: " + (iterations / (double)elapsed));
    }
 
    /**