[jboss-cvs] JBossAS SVN: r100743 - in projects/kernel/trunk/dependency/src: test/java/org/jboss/test/dependency/controller/test and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2010-02-09 07:09:36 -0500 (Tue, 09 Feb 2010)
New Revision: 100743

Added:
   projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/Benchmark.java
Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java
Log:
[JBKERNEL-92] Don't try to resolve dependencies for contexts that are already in the final state

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-02-09 12:01:14 UTC (rev 100742)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-02-09 12:09:36 UTC (rev 100743)
@@ -1070,10 +1070,14 @@
          for (ControllerState fromState : stateModel)
          {
             ControllerState toState = stateModel.getNextState(fromState);
-            if (resolveContexts(fromState, toState, trace))
+            
+            if (stateModel.isValidState(toState))
             {
-               resolutions = true;
-               break;
+               if (resolveContexts(fromState, toState, trace))
+               {
+                  resolutions = true;
+                  break;
+               }
             }
          }
       }

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java	2010-02-09 12:01:14 UTC (rev 100742)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java	2010-02-09 12:09:36 UTC (rev 100743)
@@ -177,6 +177,8 @@
    
    public boolean isValidState(ControllerState state)
    {
+      if (state == null)
+         return false;
       return states.containsKey(state);
    }
 

Added: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/Benchmark.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/Benchmark.java	                        (rev 0)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/Benchmark.java	2010-02-09 12:09:36 UTC (rev 100743)
@@ -0,0 +1,94 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.dependency.controller.test;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.dependency.plugins.AbstractDependencyItem;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.test.dependency.controller.support.TestControllerContext;
+import org.jboss.test.dependency.controller.support.TestDelegate;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class Benchmark extends AbstractDependencyTest
+{
+   int iterations = 1000;
+   
+   public Benchmark(String name)
+   {
+      super(name);
+   }
+
+   public void testBenchmark() throws Throwable
+   {
+      List<ControllerContext> contexts = correctDependencies();
+//      List<ControllerContext> contexts = reverseDependencies();
+      
+      long start = System.currentTimeMillis();
+      for (ControllerContext context : contexts)
+      {
+         install(context);
+//         System.out.println(context.getName());
+      }
+      System.out.println("----------> " + (System.currentTimeMillis() - start));
+      
+      for (ControllerContext context : contexts)
+      {
+         assertContext(context, ControllerState.INSTALLED);
+      }
+   }
+   
+   private List<ControllerContext> correctDependencies()
+   {
+      List<ControllerContext> contexts = new ArrayList<ControllerContext>(iterations);
+      for (int i = 0 ; i < iterations ; i++)
+      {
+         TestDelegate delegate = new TestDelegate("Bean" + i);
+         if (i != 0)
+            delegate.addDependency(new AbstractDependencyItem("Bean" + i, "Bean" + (i-1), ControllerState.CONFIGURED, ControllerState.INSTALLED));
+         contexts.add(new TestControllerContext(delegate));
+      }
+      return contexts;
+   }
+   
+   private List<ControllerContext> reverseDependencies()
+   {
+      List<ControllerContext> contexts = new ArrayList<ControllerContext>(iterations);
+      for (int i = 0 ; i < iterations ; i++)
+      {
+         TestDelegate delegate = new TestDelegate("Bean" + i);
+         if (i != iterations - 1)
+            delegate.addDependency(new AbstractDependencyItem("Bean" + i, "Bean" + (i+1), ControllerState.CONFIGURED, ControllerState.INSTALLED));
+         contexts.add(new TestControllerContext(delegate));
+      }
+      return contexts;
+   }
+    
+   
+}