From 1bf77f8dd23f67eb2f8138ace9b05730a02edb19 Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 13 Jul 2011 08:01:30 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@419 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../com/alibaba/druid/pool/benckmark/Case1.java | 2 +- .../com/alibaba/druid/pool/benckmark/Case2.java | 2 +- .../com/alibaba/druid/pool/benckmark/Case3.java | 17 ++++++++++------- .../alibaba/druid/pool/benckmark/CaseKylin.java | 2 +- .../druid/pool/benckmark/Oracle_Case3.java | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/alibaba/druid/pool/benckmark/Case1.java b/src/test/java/com/alibaba/druid/pool/benckmark/Case1.java index 13ead18473..a3d361d232 100644 --- a/src/test/java/com/alibaba/druid/pool/benckmark/Case1.java +++ b/src/test/java/com/alibaba/druid/pool/benckmark/Case1.java @@ -128,7 +128,7 @@ public class Case1 extends TestCase { private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { final CountDownLatch startLatch = new CountDownLatch(1); - final CountDownLatch endLatch = new CountDownLatch(1); + final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { diff --git a/src/test/java/com/alibaba/druid/pool/benckmark/Case2.java b/src/test/java/com/alibaba/druid/pool/benckmark/Case2.java index 2175a75748..7704c0532d 100644 --- a/src/test/java/com/alibaba/druid/pool/benckmark/Case2.java +++ b/src/test/java/com/alibaba/druid/pool/benckmark/Case2.java @@ -130,7 +130,7 @@ public class Case2 extends TestCase { private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { final CountDownLatch startLatch = new CountDownLatch(1); - final CountDownLatch endLatch = new CountDownLatch(1); + final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { diff --git a/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java b/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java index 6687640f3c..3ec2224e25 100644 --- a/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java +++ b/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java @@ -10,6 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.sql.DataSource; +import junit.framework.Assert; import junit.framework.TestCase; import org.apache.commons.dbcp.BasicDataSource; @@ -40,15 +41,16 @@ public class Case3 extends TestCase { private long minEvictableIdleTimeMillis = 60000; protected void setUp() throws Exception { - // jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; - // user = "dragoon25"; - // password = "dragoon25"; - // driverClass = "com.alibaba.druid.mock.MockDriver"; - // connectionProperties = "connectSleep=3;executeSleep=0"; +// jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; +// user = "dragoon25"; +// password = "dragoon25"; +// driverClass = "com.alibaba.druid.mock.MockDriver"; +// connectionProperties = "connectSleep=3;executeSleep=0"; jdbcUrl = "jdbc:mysql://10.20.153.104:3306/druid2"; user = "root"; password = "root"; + driverClass = "com.mysql.jdbc.Driver"; } public void test_perf() throws Exception { @@ -145,7 +147,7 @@ public class Case3 extends TestCase { final AtomicInteger errorCount = new AtomicInteger(); final CountDownLatch startLatch = new CountDownLatch(1); - final CountDownLatch endLatch = new CountDownLatch(1); + final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { @@ -188,8 +190,9 @@ public class Case3 extends TestCase { long ygc = TestUtil.getYoungGC() - startYGC; long fullGC = TestUtil.getFullGC() - startFullGC; + Assert.assertEquals(LOOP_COUNT * threadCount, count.get()); Thread.sleep(1); - System.out.println("thread " + threadCount + " " + name + " millis : " + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC + ", TX " + count.get() + ", error " + errorCount.get()); + System.out.println("thread " + threadCount + " " + name + " millis : " + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/pool/benckmark/CaseKylin.java b/src/test/java/com/alibaba/druid/pool/benckmark/CaseKylin.java index 4c83ef32ec..f121f3e318 100644 --- a/src/test/java/com/alibaba/druid/pool/benckmark/CaseKylin.java +++ b/src/test/java/com/alibaba/druid/pool/benckmark/CaseKylin.java @@ -110,7 +110,7 @@ public class CaseKylin extends TestCase { private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { final CountDownLatch startLatch = new CountDownLatch(1); - final CountDownLatch endLatch = new CountDownLatch(1); + final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { diff --git a/src/test/java/com/alibaba/druid/pool/benckmark/Oracle_Case3.java b/src/test/java/com/alibaba/druid/pool/benckmark/Oracle_Case3.java index 5877ca8634..540a721a2e 100644 --- a/src/test/java/com/alibaba/druid/pool/benckmark/Oracle_Case3.java +++ b/src/test/java/com/alibaba/druid/pool/benckmark/Oracle_Case3.java @@ -83,7 +83,7 @@ public class Oracle_Case3 extends TestCase { private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { final CountDownLatch startLatch = new CountDownLatch(1); - final CountDownLatch endLatch = new CountDownLatch(1); + final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() {