Author: tolusha Date: 2009-11-26 08:17:10 -0500 (Thu, 26 Nov 2009) New Revision: 880 Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestGetNodesPerf.java Log: EXOJCR-221: test modified Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestGetNodesPerf.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestGetNodesPerf.java 2009-11-26 12:38:16 UTC (rev 879) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestGetNodesPerf.java 2009-11-26 13:17:10 UTC (rev 880) @@ -47,11 +47,8 @@ private GetNodesThread[] threads = new GetNodesThread[sessionCount]; - private NodeIterator[][] nodes = new NodeIterator[sessionCount][tryCount]; - public void testGetNodes() throws Exception { - for (int i = 0; i < sessionCount; i++) { sessions[i] = (SessionImpl)repository.login(credentials, "ws"); @@ -77,24 +74,27 @@ long usedMemory = rt.totalMemory() - rt.freeMemory(); log.info("getting nodes..."); - for (int i = 0; i < sessionCount; i++) + for (int k = 0; k < tryCount; k++) { - threads[i] = new GetNodesThread(sessions[i], i); - threads[i].start(); - } - - outer : while (true) - { for (int i = 0; i < sessionCount; i++) { - if (threads[i].isAlive()) + threads[i] = new GetNodesThread(sessions[i]); + threads[i].start(); + } + + outer : while (true) + { + for (int i = 0; i < sessionCount; i++) { - Thread.sleep(1000); - continue outer; + if (threads[i].isAlive()) + { + Thread.sleep(1000); + continue outer; + } } - } - break; + break; + } } log.info("Memory used: " + (rt.totalMemory() - rt.freeMemory() - usedMemory) / 1024 / 1024 + "Mb"); } @@ -103,12 +103,11 @@ { private final Session curSession; - private final int sessionNumber; + private NodeIterator nodes; - GetNodesThread(Session session, int sessionNumber) + GetNodesThread(Session session) { this.curSession = session; - this.sessionNumber = sessionNumber; } @Override @@ -118,14 +117,10 @@ { Node testRoot = curSession.getRootNode().getNode(testName); - for (int k = 0; k < tryCount; k++) - { - long startTime = System.currentTimeMillis(); - testRoot.getNodes(); - log.info("Total time: " + (System.currentTimeMillis() - startTime) / 1000 + "s"); + long startTime = System.currentTimeMillis(); + nodes = testRoot.getNodes(); + log.info("Total time: " + (System.currentTimeMillis() - startTime) + "ms"); - Thread.sleep(30000); - } } catch (Exception e) {