[jboss-cvs] JBossCache/tests/perf/org/jboss/cache ...

Manik Surtani msurtani at jboss.com
Sat Dec 30 12:50:00 EST 2006


  User: msurtani
  Date: 06/12/30 12:50:00

  Modified:    tests/perf/org/jboss/cache        LocalMapPerfTest.java
                        ConcurrentEvictAndRemoveTest.java
                        LocalPerfTest.java ReplicatedAsyncMapPerfTest.java
                        ReplicatedAsyncPerfTest.java
                        ReplicatedSyncPerfTest.java
                        ReplicatedSyncMapPerfTest.java
  Log:
  Major changes to restructure cache and node object model
  
  Revision  Changes    Path
  1.6       +9 -9      JBossCache/tests/perf/org/jboss/cache/LocalMapPerfTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocalMapPerfTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/perf/org/jboss/cache/LocalMapPerfTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- LocalMapPerfTest.java	6 Sep 2006 15:31:01 -0000	1.5
  +++ LocalMapPerfTest.java	30 Dec 2006 17:50:00 -0000	1.6
  @@ -29,24 +29,24 @@
   import java.util.Properties;
   
   /**
  - * Local mode performance test for TreeCache.
  + * Local mode performance test for CacheImpl.
    *
    * @author <a href="mailto:bwang at jboss.org">Ben Wang</a> May 20 2003
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class LocalMapPerfTest extends TestCase
   {
  -   TreeCache cache_;
  +   CacheImpl cache_;
      Configuration.CacheMode cachingMode_ = Configuration.CacheMode.LOCAL;
      final static Properties p_;
  -//   final static Log log_=LogFactory.getLog(LocalPerfAopTest.class);
  +   //   final static Log log_=LogFactory.getLog(LocalPerfAopTest.class);
      String oldFactory_ = null;
      final String FACTORY = "org.jboss.cache.transaction.DummyContextFactory";
      DummyTransactionManager tm_;
      Map map_ = new HashMap();
  -//    final int SIZE = 100;
  -//    final String FQN = "/regular/test";
  -//    final String KEY = Integer.toString((SIZE/2));
  +   //    final int SIZE = 100;
  +   //    final String FQN = "/regular/test";
  +   //    final String KEY = Integer.toString((SIZE/2));
      ArrayList nodeList_;
      static final int depth_ = 3;
      static final int children_ = 4;
  @@ -122,7 +122,7 @@
      void initCaches(Configuration.CacheMode caching_mode) throws Exception
      {
         cachingMode_ = caching_mode;
  -      cache_ = new TreeCache();
  +      cache_ = new CacheImpl();
         cache_.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/local-service.xml"));
         cache_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
         cache_.start();
  @@ -273,7 +273,7 @@
   
   
      /**
  -    * Generate the tree nodes quasi-exponentially. I.e., depth is the level
  +    * Generate the cache nodes quasi-exponentially. I.e., depth is the level
       * of the hierarchy and children is the number of children under each node.
       * This strucutre is used to add, get, and remove for each node.
       */
  
  
  
  1.7       +226 -190  JBossCache/tests/perf/org/jboss/cache/ConcurrentEvictAndRemoveTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConcurrentEvictAndRemoveTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/perf/org/jboss/cache/ConcurrentEvictAndRemoveTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ConcurrentEvictAndRemoveTest.java	27 Oct 2006 19:26:07 -0000	1.6
  +++ ConcurrentEvictAndRemoveTest.java	30 Dec 2006 17:50:00 -0000	1.7
  @@ -8,36 +8,37 @@
   
   package org.jboss.cache;
   
  -import java.util.Random;
  -
   import junit.framework.Test;
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.config.Configuration;
   import org.jboss.cache.config.EvictionConfig;
   import org.jboss.cache.factories.XmlConfigurationParser;
   
  +import java.util.Random;
  +
   /**
  - * Local mode test for concurrent EvictionTimerTask evicting nodes and Client removing nodes from TreeCache.
  + * Local mode test for concurrent EvictionTimerTask evicting nodes and Client removing nodes from CacheImpl.
    *
  - * @version $Revision: 1.6 $
    * @author <a href="mailto:uwe.lamprecht at gmx.de">Uwe Lamprecht</a> July 29 2004
  + * @version $Revision: 1.7 $
    */
   public final class ConcurrentEvictAndRemoveTest extends TestCase
   {
       private static final Log log = LogFactory.getLog(ConcurrentEvictAndRemoveTest.class.getName());
  -    private TreeCache cache;
  +   private CacheImpl cache;
   
   
  -   static void log(String msg) {
  +   static void log(String msg)
  +   {
         System.out.println(msg);
         log.info(msg);
      }
   
  -   void err(String msg) {
  +   void err(String msg)
  +   {
         // System.err.println(msg);
         log.error(msg);
      }
  @@ -50,12 +51,13 @@
       public void setUp() throws Exception
       {
           super.setUp();
  -        cache = new TreeCache();
  +      cache = new CacheImpl();
           cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL);
           cache.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/local-mru-eviction-service.xml"));
           cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
           cache.start();
       }
  +
       public void tearDown() throws Exception
       {
           super.tearDown();
  @@ -73,11 +75,13 @@
           {
               final StopWatch stopWatch = new StopWatch();
               int i = 0;
  -            while(true) {
  +         while (true)
  +         {
                   i++;
                   final Fqn fqn = Fqn.fromString("/test/item_" + i);
                   cache.put(fqn, "att", null);
  -                if (stopWatch.getTime()>MAX_LOOP_TIME) {
  +            if (stopWatch.getTime() > MAX_LOOP_TIME)
  +            {
                       break;
                   }
               }
  @@ -99,15 +103,20 @@
               final Random random = new Random();
               final StopWatch stopWatch = new StopWatch();
   
  -            while(true) {
  +         while (true)
  +         {
                   final Fqn fqn = Fqn.fromString("/test/item_" + random.nextInt(numberOfInitialCreatedNodes));
  -                if (cache.exists(fqn)) {
  +            if (cache.exists(fqn))
  +            {
                       cache.remove(fqn);
                       numberCacheHitSuccess++;
  -                } else {
  +            }
  +            else
  +            {
                       numberCacheHitFailure++;
                   }
  -                if (stopWatch.getTime()>MAX_LOOP_TIME) {
  +            if (stopWatch.getTime() > MAX_LOOP_TIME)
  +            {
                       break;
                   }
               }
  @@ -129,58 +138,73 @@
               final long TIMEOUT_DEFAULT = 100000;
               final int MAX_TIMEOUT_FACTOR = 10;
   
  -            for(int i = 0; i < EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; i = i + SEQUENCE_SIZE) {
  +         for (int i = 0; i < EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; i = i + SEQUENCE_SIZE)
  +         {
                   final int sequenceStart = i;
  -                final int sequenceEnd = i + SEQUENCE_SIZE -1;
  +            final int sequenceEnd = i + SEQUENCE_SIZE - 1;
   
                   Thread thread = new Thread(
                           new HelperThread(cache, sequenceStart, sequenceEnd)
                   );
   
  -                long timeout = (HelperThread.getTime()==HelperThread.EXECUTION_TIME_NOT_INITIALIZED)?
  -                        TIMEOUT_DEFAULT:
  -                            HelperThread.getTime()*MAX_TIMEOUT_FACTOR;
  +            long timeout = (HelperThread.getTime() == HelperThread.EXECUTION_TIME_NOT_INITIALIZED) ?
  +                    TIMEOUT_DEFAULT :
  +                    HelperThread.getTime() * MAX_TIMEOUT_FACTOR;
   
                   thread.start();
  -                try {
  +            try
  +            {
                       thread.join(timeout);
  -                    if (thread.isAlive()) {
  +               if (thread.isAlive())
  +               {
                           // Timeout occurred; thread has not finished
                           err("Timeout of " + timeout + " ms exceeded for sequence of put/remove operations.");
                           fail("Timeout of " + timeout + " ms exceeded for sequence of put/remove operations.");
  -                    } else {
  +               }
  +               else
  +               {
                           // Finished
                       }
                   }
  -                catch(InterruptedException ignore) {
  +            catch (InterruptedException ignore)
  +            {
                       err("Thread join interrupted.");
                   }
               }
           }
           log("*** Successfully finished! ***");
       }
  +
       public static Test suite() throws Exception
       {
           return new TestSuite(ConcurrentEvictAndRemoveTest.class);
       }
   
       // private util classes
  -    private static final class StopWatch {
  -        public StopWatch() {
  -            startTime = System.currentTimeMillis() ;
  +   private static final class StopWatch
  +   {
  +      public StopWatch()
  +      {
  +         startTime = System.currentTimeMillis();
           }
  +
           private final long startTime;   // Start time of stopwatch.
           //   (Time is measured in milliseconds.)
   
  -        public String toString() {
  +      public String toString()
  +      {
               return String.valueOf(getTime());
           }
  -        public long getTime() {
  +
  +      public long getTime()
  +      {
               return System.currentTimeMillis() - startTime;
           }
       }
  -    private static final class HelperThread implements Runnable {
  -        private final TreeCache c;
  +
  +   private static final class HelperThread implements Runnable
  +   {
  +      private final CacheImpl c;
           private final int start;
           private final int end;
           // static member
  @@ -188,12 +212,15 @@
           private static long previousExceutionTime = EXECUTION_TIME_NOT_INITIALIZED;
           private static final String FQN_PREFIX =  "/test/overflow-item_";
   
  -        public HelperThread ( TreeCache cache, int start, int end) {
  +      public HelperThread(CacheImpl cache, int start, int end)
  +      {
               this.c = cache;
               this.start = start;
               this.end = end;
           }
  -        public void run() {
  +
  +      public void run()
  +      {
               StopWatch stopWatch = new StopWatch();
               log(
                       "process node range: "
  @@ -201,18 +228,25 @@
                       + "/"
                       + this.end
               );
  -            try {
  -                for (int i = start; i<=end; i++) {
  +         try
  +         {
  +            for (int i = start; i <= end; i++)
  +            {
                       final Fqn fqn = Fqn.fromString(FQN_PREFIX + i);
                       c.put(fqn, "att", null);
                       c.remove(fqn);
                       //Thread.yield();
                   }
  -            } catch (Exception e) {
  +         }
  +         catch (Exception e)
  +         {
                   System.out.println("exception: " + e);
  -                if ( e instanceof RuntimeException) {
  -                    throw (RuntimeException)e;
  -                } else {
  +            if (e instanceof RuntimeException)
  +            {
  +               throw (RuntimeException) e;
  +            }
  +            else
  +            {
                       throw new RuntimeException(e);
                   }
               }
  @@ -223,7 +257,9 @@
                       + " ms"
               );
           }
  -        public static long getTime() {
  +
  +      public static long getTime()
  +      {
               return previousExceutionTime;
           }
       }
  
  
  
  1.6       +6 -6      JBossCache/tests/perf/org/jboss/cache/LocalPerfTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocalPerfTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/perf/org/jboss/cache/LocalPerfTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- LocalPerfTest.java	6 Sep 2006 15:31:01 -0000	1.5
  +++ LocalPerfTest.java	30 Dec 2006 17:50:00 -0000	1.6
  @@ -27,17 +27,17 @@
   import java.util.Properties;
   
   /**
  - * Local mode performance test for TreeCache.
  + * Local mode performance test for CacheImpl.
    *
    * @author <a href="mailto:bwang at jboss.org">Ben Wang</a> May 20 2003
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class LocalPerfTest extends TestCase
   {
  -   TreeCache cache_;
  +   CacheImpl cache_;
      Configuration.CacheMode cachingMode_ = Configuration.CacheMode.LOCAL;
      final static Properties p_;
  -//   final static Log log_=LogFactory.getLog(LocalPerfAopTest.class);
  +   //   final static Log log_=LogFactory.getLog(LocalPerfAopTest.class);
      String oldFactory_ = null;
      final String FACTORY = "org.jboss.cache.transaction.DummyContextFactory";
      ArrayList nodeList_;
  @@ -89,7 +89,7 @@
      void initCaches(Configuration.CacheMode caching_mode) throws Exception
      {
         cachingMode_ = caching_mode;
  -      cache_ = new TreeCache();
  +      cache_ = new CacheImpl();
         cache_.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/local-service.xml"));
         cache_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
         cache_.start();
  @@ -283,7 +283,7 @@
      }
   
      /**
  -    * Generate the tree nodes quasi-exponentially. I.e., depth is the level
  +    * Generate the cache nodes quasi-exponentially. I.e., depth is the level
       * of the hierarchy and children is the number of children under each node.
       * This strucutre is used to add, get, and remove for each node.
       */
  
  
  
  1.7       +9 -9      JBossCache/tests/perf/org/jboss/cache/ReplicatedAsyncMapPerfTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReplicatedAsyncMapPerfTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/perf/org/jboss/cache/ReplicatedAsyncMapPerfTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ReplicatedAsyncMapPerfTest.java	6 Sep 2006 15:31:01 -0000	1.6
  +++ ReplicatedAsyncMapPerfTest.java	30 Dec 2006 17:50:00 -0000	1.7
  @@ -27,24 +27,24 @@
   import java.util.Properties;
   
   /**
  - * Local mode performance test for TreeCache.
  + * Local mode performance test for CacheImpl.
    *
    * @author <a href="mailto:bwang at jboss.org">Ben Wang</a> May 20 2003
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class ReplicatedAsyncMapPerfTest extends TestCase
   {
  -   TreeCache cache_;
  +   CacheImpl cache_;
      Configuration.CacheMode cachingMode_ = Configuration.CacheMode.LOCAL;
      final static Properties p_;
  -//   final static Log log_=LogFactory.getLog(LocalPerfAopTest.class);
  +   //   final static Log log_=LogFactory.getLog(LocalPerfAopTest.class);
      String oldFactory_ = null;
      final String FACTORY = "org.jboss.cache.transaction.DummyContextFactory";
      DummyTransactionManager tm_;
      Map map_ = new HashMap();
  -//    final int SIZE = 100;
  -//    final String FQN = "/regular/test";
  -//    final String KEY = Integer.toString((SIZE/2));
  +   //    final int SIZE = 100;
  +   //    final String FQN = "/regular/test";
  +   //    final String KEY = Integer.toString((SIZE/2));
      ArrayList nodeList_;
      static final int depth_ = 3;
      static final int children_ = 4;
  @@ -137,7 +137,7 @@
      void initCaches(Configuration.CacheMode caching_mode) throws Exception
      {
         cachingMode_ = caching_mode;
  -      cache_ = new TreeCache();
  +      cache_ = new CacheImpl();
         cache_.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/replAsync-service.xml")); // read in generic replAsync xml
         cache_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
         cache_.start();
  @@ -282,7 +282,7 @@
   
   
      /**
  -    * Generate the tree nodes quasi-exponentially. I.e., depth is the level
  +    * Generate the cache nodes quasi-exponentially. I.e., depth is the level
       * of the hierarchy and children is the number of children under each node.
       * This strucutre is used to add, get, and remove for each node.
       */
  
  
  
  1.5       +11 -11    JBossCache/tests/perf/org/jboss/cache/ReplicatedAsyncPerfTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReplicatedAsyncPerfTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/perf/org/jboss/cache/ReplicatedAsyncPerfTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ReplicatedAsyncPerfTest.java	6 Sep 2006 15:31:01 -0000	1.4
  +++ ReplicatedAsyncPerfTest.java	30 Dec 2006 17:50:00 -0000	1.5
  @@ -26,18 +26,18 @@
   import java.util.Properties;
   
   /**
  - * Replicated asynchronous mode performance test for transactional TreeCache
  + * Replicated asynchronous mode performance test for transactional CacheImpl
    *
    * @author <a href="mailto:bwang at jboss.org">Ben Wang</a> May 20 2003
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class ReplicatedAsyncPerfTest extends TestCase
   {
  -   TreeCache cache1_, cache2_, cache3_;
  +   CacheImpl cache1_, cache2_, cache3_;
      Configuration.CacheMode cachingMode_ = Configuration.CacheMode.REPL_ASYNC;
      final String groupName_ = "TreeCacheTestGroup";
      final static Properties p_;
  -//   final static Log log_=LogFactory.getLog(ReplicatedAsyncPerfAopTest.class);
  +   //   final static Log log_=LogFactory.getLog(ReplicatedAsyncPerfAopTest.class);
      String oldFactory_ = null;
      final String FACTORY = "org.jboss.cache.transaction.DummyContextFactory";
   
  @@ -89,9 +89,9 @@
   
      }
   
  -   TreeCache createCache(IsolationLevel level) throws Exception
  +   CacheImpl createCache(IsolationLevel level) throws Exception
      {
  -      TreeCache cache = new TreeCache();
  +      CacheImpl cache = new CacheImpl();
         XmlConfigurationParser parser = new XmlConfigurationParser();
         Configuration c = parser.parseFile("META-INF/replAsync-service.xml"); // read in generic replAsync xml
         cache.setConfiguration(c);
  @@ -99,7 +99,7 @@
         return cache;
      }
   
  -   private void destroyCache(TreeCache cache) throws Exception
  +   private void destroyCache(CacheImpl cache) throws Exception
      {
         if (cache != null)
         {
  @@ -354,7 +354,7 @@
         destroyCache(cache3_);
      }
   
  -   private int _add(TreeCache cache, boolean hasTx) throws Exception
  +   private int _add(CacheImpl cache, boolean hasTx) throws Exception
      {
         UserTransaction tx = null;
         if (hasTx)
  @@ -381,7 +381,7 @@
         return nodeList_.size();
      }
   
  -   private int _get(TreeCache cache, boolean hasTx) throws Exception
  +   private int _get(CacheImpl cache, boolean hasTx) throws Exception
      {
         UserTransaction tx = null;
         if (hasTx)
  @@ -407,7 +407,7 @@
         return nodeList_.size();
      }
   
  -   private int _remove(TreeCache cache, boolean hasTx) throws Exception
  +   private int _remove(CacheImpl cache, boolean hasTx) throws Exception
      {
         UserTransaction tx = null;
         if (hasTx)
  @@ -434,7 +434,7 @@
      }
   
      /**
  -    * Generate the tree nodes quasi-exponentially. I.e., depth is the level
  +    * Generate the cache nodes quasi-exponentially. I.e., depth is the level
       * of the hierarchy and children is the number of children under each node.
       */
      private ArrayList nodeGen(int depth, int children)
  
  
  
  1.5       +14 -14    JBossCache/tests/perf/org/jboss/cache/ReplicatedSyncPerfTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReplicatedSyncPerfTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/perf/org/jboss/cache/ReplicatedSyncPerfTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ReplicatedSyncPerfTest.java	6 Sep 2006 15:31:01 -0000	1.4
  +++ ReplicatedSyncPerfTest.java	30 Dec 2006 17:50:00 -0000	1.5
  @@ -24,15 +24,15 @@
   import java.util.ArrayList;
   
   /**
  - * Replicated synchronous mode performance test for transactional TreeCache.
  + * Replicated synchronous mode performance test for transactional CacheImpl.
    *
    * @author Bela Ban
    * @author <a href="mailto:bwang at jboss.org">Ben Wang</a> May 20 2003
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class ReplicatedSyncPerfTest extends TestCase
   {
  -   TreeCache cache1_, cache2_, cache3_;
  +   CacheImpl cache1_, cache2_, cache3_;
      final String groupName_ = "TreeCacheTestGroup";
      Transaction tx;
   
  @@ -63,9 +63,9 @@
            tx.rollback();
      }
   
  -   TreeCache createCache(IsolationLevel level) throws Exception
  +   CacheImpl createCache(IsolationLevel level) throws Exception
      {
  -      TreeCache cache = new TreeCache();
  +      CacheImpl cache = new CacheImpl();
         cache.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/replSync-service.xml"));
         cache.getConfiguration().setIsolationLevel(level);
         cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
  @@ -75,7 +75,7 @@
         return cache;
      }
   
  -   void destroyCache(TreeCache cache) throws Exception
  +   void destroyCache(CacheImpl cache) throws Exception
      {
         if (cache != null)
         {
  @@ -121,7 +121,7 @@
         {
            failedOps++;
            t.printStackTrace();
  -         System.out.println("tree is " + cache1_.printLockInfo());
  +         System.out.println("cache is " + cache1_.printLockInfo());
            if (tx != null)
               tx.rollback();
         }
  @@ -368,7 +368,7 @@
      }
   
   
  -   private int add(TreeCache cache, boolean hasTx, boolean oneTxOnly) throws Exception
  +   private int add(CacheImpl cache, boolean hasTx, boolean oneTxOnly) throws Exception
      {
         try
         {
  @@ -383,7 +383,7 @@
         }
      }
   
  -   private int _add(TreeCache cache, boolean hasTx, boolean oneTxOnly) throws Exception
  +   private int _add(CacheImpl cache, boolean hasTx, boolean oneTxOnly) throws Exception
      {
         if (hasTx && oneTxOnly)
         {
  @@ -414,7 +414,7 @@
         return nodeList_.size();
      }
   
  -   private int get(TreeCache cache, boolean hasTx, boolean oneTxOnly) throws Exception
  +   private int get(CacheImpl cache, boolean hasTx, boolean oneTxOnly) throws Exception
      {
         try
         {
  @@ -428,7 +428,7 @@
         }
      }
   
  -   private int _get(TreeCache cache, boolean hasTx, boolean oneTxOnly) throws Exception
  +   private int _get(CacheImpl cache, boolean hasTx, boolean oneTxOnly) throws Exception
      {
         if (hasTx && oneTxOnly)
         {
  @@ -459,7 +459,7 @@
      }
   
   
  -   private int remove(TreeCache cache, boolean hasTx, boolean oneTxOnly) throws Exception
  +   private int remove(CacheImpl cache, boolean hasTx, boolean oneTxOnly) throws Exception
      {
         try
         {
  @@ -473,7 +473,7 @@
         }
      }
   
  -   private int _remove(TreeCache cache, boolean hasTx, boolean oneTxOnly) throws Exception
  +   private int _remove(CacheImpl cache, boolean hasTx, boolean oneTxOnly) throws Exception
      {
         if (hasTx && oneTxOnly)
         {
  @@ -504,7 +504,7 @@
      }
   
      /**
  -    * Generate the tree nodes quasi-exponentially. I.e., depth is the level
  +    * Generate the cache nodes quasi-exponentially. I.e., depth is the level
       * of the hierarchy and children is the number of children under each node.
       */
      private ArrayList nodeGen(int depth, int children)
  
  
  
  1.6       +9 -9      JBossCache/tests/perf/org/jboss/cache/ReplicatedSyncMapPerfTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReplicatedSyncMapPerfTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/perf/org/jboss/cache/ReplicatedSyncMapPerfTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ReplicatedSyncMapPerfTest.java	6 Sep 2006 15:31:01 -0000	1.5
  +++ ReplicatedSyncMapPerfTest.java	30 Dec 2006 17:50:00 -0000	1.6
  @@ -29,24 +29,24 @@
   import java.util.Properties;
   
   /**
  - * Local mode performance test for TreeCache.
  + * Local mode performance test for CacheImpl.
    *
    * @author <a href="mailto:bwang at jboss.org">Ben Wang</a> May 20 2003
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class ReplicatedSyncMapPerfTest extends TestCase
   {
  -   TreeCache cache_;
  +   CacheImpl cache_;
      Configuration.CacheMode cachingMode_ = Configuration.CacheMode.LOCAL;
      final static Properties p_;
  -//   final static Log log_=LogFactory.getLog(LocalPerfAopTest.class);
  +   //   final static Log log_=LogFactory.getLog(LocalPerfAopTest.class);
      String oldFactory_ = null;
      final String FACTORY = "org.jboss.cache.transaction.DummyContextFactory";
      DummyTransactionManager tm_;
      Map map_ = new HashMap();
  -//    final int SIZE = 100;
  -//    final String FQN = "/regular/test";
  -//    final String KEY = Integer.toString((SIZE/2));
  +   //    final int SIZE = 100;
  +   //    final String FQN = "/regular/test";
  +   //    final String KEY = Integer.toString((SIZE/2));
      ArrayList nodeList_;
      static final int depth_ = 3;
      static final int children_ = 4;
  @@ -141,7 +141,7 @@
      void initCaches(Configuration.CacheMode caching_mode) throws Exception
      {
         cachingMode_ = caching_mode;
  -      cache_ = new TreeCache();
  +      cache_ = new CacheImpl();
         cache_.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/replSync-service.xml"));
         cache_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
         cache_.start();
  @@ -304,7 +304,7 @@
   
   
      /**
  -    * Generate the tree nodes quasi-exponentially. I.e., depth is the level
  +    * Generate the cache nodes quasi-exponentially. I.e., depth is the level
       * of the hierarchy and children is the number of children under each node.
       * This strucutre is used to add, get, and remove for each node.
       */
  
  
  



More information about the jboss-cvs-commits mailing list