Changeset 37

Timestamp:

04/17/08 00:45:03 (9 months ago)

Author:

jordi

Message:

fixed ticket#18; TimerTasks? are processed ad-hoc (see ChordNode? and SymphonyNode?)

Location:

trunk

Files:

• conf/chord.properties (modified) (2 diffs)
• conf/master.properties (modified) (1 diff)
• src/planet/chord/ChordNode.java (modified) (5 diffs)
• src/planet/generic/commonapi/NodeImpl.java (modified) (1 diff)
• src/planet/symphony/SymphonyNode.java (modified) (6 diffs)
• src/planet/util/timer/SimulationTimerImpl.java (modified) (1 diff)

trunk/conf/chord.properties

@@ -53 +53 @@
 
 # The default initial network size
-FACTORIES_NETWORKSIZE = 100
+FACTORIES_NETWORKSIZE = 1000
 
 
@@ -86 +86 @@
 # The print level for whole network (to use by GenericApp.printNetwork() method)
 # Default possible values: 0 (no print), 1 (pretty print), 2 (full print)
-SIMULATOR_PRINT_LEVEL = 2
+SIMULATOR_PRINT_LEVEL = 0
 
 # The environment for the current simulation

trunk/conf/master.properties

@@ -36 +36 @@
 
 ################################################################################
-SIMNETTEST = ../conf/chord.properties
-#SIMNETTEST = ../conf/symphony.properties
+#SIMNETTEST = ../conf/chord.properties
+SIMNETTEST = ../conf/symphony.properties
 
 ################################################################################

trunk/src/planet/chord/ChordNode.java

@@ -28 +28 @@
 import planet.util.Properties;
 import planet.util.Queue;
+import planet.util.timer.TimerTask;
 import planet.util.timer.TimerTaskImpl;
 
@@ -45 +46 @@
 public class ChordNode extends planet.generic.commonapi.NodeImpl {
         
+        private static final long serialVersionUID = -3646239557272943682L;
+
         /* ******************  CONSTANTS FOR MODE OF ROUTEMESSAGE *******/
         
@@ -236 +239 @@
         protected NodeHandle[] temp;
         
+        /*
+         * Periodic tasks
+         */
+        /**
+         * Stabilization task
+         */
+        private TimerTask stabilizeTask = new StabilizeTask();
+        /**
+         * Stabilization period (num. of steps)
+         */
+        private int stabPeriod = ((ChordProperties)Properties.overlayPropertiesInstance).stabilizeSteps;
+        /**
+         * FixFinger task
+         */
+        private TimerTask fixFingerTask = new FixFingerTask();
+        /**
+         * FixFinger period (num. of steps)
+         */
+        private int fixFingerPeriod = ((ChordProperties)Properties.overlayPropertiesInstance).fixFingerSteps;
+        /**
+         * Step when node has joined.
+         */
+        private int nodeHasJoinedStep = Logger.getStep();
+
         
         /**
@@ -250 +277 @@
                 hasFailed = false;
                 hasReceivedSucc = true;   //permits the send
-        
-        //add stabilize timer
-        setTimer(new StabilizeTask(),  ((ChordProperties)Properties.overlayPropertiesInstance).stabilizeSteps,
-                ((ChordProperties)Properties.overlayPropertiesInstance).stabilizeSteps);
-        // add fix finger timer
-        setTimer(new FixFingerTask(),  ((ChordProperties)Properties.overlayPropertiesInstance).fixFingerSteps,
-                ((ChordProperties)Properties.overlayPropertiesInstance).fixFingerSteps);
-
         }
         
@@ -838 +857 @@
                 clearFingerChanges();
                 super.process(actualStep);
+                if (((actualStep - nodeHasJoinedStep)%stabPeriod)==0)
+                        stabilizeTask.run();
+                if (((actualStep - nodeHasJoinedStep)%fixFingerPeriod)==0)
+                        fixFingerTask.run();
                 while (hasMoreMessages()) {
                         dispatcher(nextMessage());

trunk/src/planet/generic/commonapi/NodeImpl.java

@@ -106 +106 @@
         public boolean process(int actualStep) {
                 processed = 0;
-                processTasks();
+                if (tasks.size()>0)
+                        processTasks(); 
                 return true;
         }

trunk/src/planet/symphony/SymphonyNode.java

@@ -19 +19 @@
 import planet.generic.commonapi.behaviours.BehavioursPatternImpl;
 import planet.generic.commonapi.factory.GenericFactory;
-import planet.results.LinkStateResults;
 import planet.simulate.Globals;
 import planet.simulate.Logger;
@@ -26 +25 @@
 import planet.symphony.messages.NeighbourMessagePool;
 import planet.util.Properties;
+import planet.util.timer.TimerTask;
 import planet.util.timer.TimerTaskImpl;
 
@@ -42 +42 @@
         extends planet.generic.commonapi.NodeImpl 
 {
+        private static final long serialVersionUID = 3721749298036723514L;
         
         /* ******************  CONSTANTS FOR MODE OF ROUTEMESSAGE *******/
@@ -137 +138 @@
     private NodeHandle estimationNH = null;
     
-    
+    /**
+         * Stabilization task
+         */
+        private TimerTask stabilizeTask = new StabilizeTask();
+        /**
+         * Stabilization period (num. of steps)
+         */
+        private int stabPeriod = ((SymphonyProperties)Properties.overlayPropertiesInstance).stabilizeSteps;
+        /**
+         * Step when node has joined.
+         */
+        private int nodeHasJoinedStep = Logger.getStep();
+
     /**
      * Gets the maximum number of successors per node.
@@ -171 +184 @@
         statisticStabilizationSteps = SymphonyNode.getSuccessorsNumber()*24;
         behPool = GenericFactory.getDefaultBehavioursPool();
-
-        // Stabilize Timer
-        setTimer(new StabilizeTask(),  ((SymphonyProperties)Properties.overlayPropertiesInstance).stabilizeSteps,
-                ((SymphonyProperties)Properties.overlayPropertiesInstance).stabilizeSteps);
     }
         
@@ -707 +716 @@
         requestedNewLongDistance = false; //permits only one QUERY_CONNECT by step
                 super.process(actualStep);
+                if (((actualStep - nodeHasJoinedStep)%stabPeriod)==0)
+                        stabilizeTask.run();
                 while (hasMoreMessages()) {
                         //planet.results.LinkStateResults.updateIncoming(this.id);

trunk/src/planet/util/timer/SimulationTimerImpl.java

@@ -15 +15 @@
  */
 public class SimulationTimerImpl implements SimulationTimer {
+        private static final long serialVersionUID = 1228039166338775231L;
         private TreeSet tasks = null;