Changeset 20 for branches/multithread

Timestamp:

09/24/07 14:06:42 (1 year ago)

Author:

max

Message:

 

Location:

branches/multithread/src/planet

Files:

• generic/commonapi/MultiThreadedNetworkImpl.java (modified) (1 diff)
• util/Properties.java (modified) (3 diffs)

branches/multithread/src/planet/generic/commonapi/MultiThreadedNetworkImpl.java

@@ -84 +84 @@
      */
     public MultiThreadedNetworkImpl() {
-        PROCESSORS = 2;
+        PROCESSORS = Properties.simulatorProcessors;
         nodes = new HashMap<NodeHandle, Node>();    //to contain all nodes
         toRemove = new Stack<NodeHandle>();

branches/multithread/src/planet/util/Properties.java

@@ -144 +144 @@
      */
     public static final String SIMULATOR_PROCESSED_MESSAGES                     = "SIMULATOR_PROCESSED_MESSAGES";
+    /**
+     * Simulator property: Default key specified in the properties file that
+     * identifies the number of processors the simulator runs on.
+     */
+    public static final String SIMULATOR_PROCESSORS                                                     ="SIMULATOR_PROCESSORS";
 
     /* OPTIONAL */
+    
     /**
      * Simulator property: Default key specified in the properties file that
@@ -405 +411 @@
     public static int simulatorProcessedMessages                                = 0;
 
+    /**
+     * Simulator property: Number of processor for the simulator.
+     */
+    public static int simulatorProcessors = 1;
     /* OPTIONAL */
+    
+    
     /**
      * Simulator property: The events filename to be loaded.
@@ -830 +842 @@
         Properties.simulatorQueueSize         = properties.getPropertyAsInt(SIMULATOR_QUEUE_SIZE);
         Properties.simulatorProcessedMessages = properties.getPropertyAsInt(SIMULATOR_PROCESSED_MESSAGES);
-        
+        Properties.simulatorProcessors = properties.getPropertyAsInt(SIMULATOR_PROCESSORS);
         //testing the correctness of the values
+        ensureValidNumberOfProcessors(Properties.simulatorProcessors);
         ensureValidSimulatorEnvironment(Properties.simulatorEnvironment);
         ensureValidPrintLevel(Properties.simulatorPrintLevel);
     }
-    
-    /**
+    /**
+     * Test if the <b>number of processor</b> is a valid.
+     * @param simProcessors The value to be tested.
+     * @throws InitializationException if the <b>simProcessors</b> has an 
+     * incorrect value.
+     */
+    private static void ensureValidNumberOfProcessors(int simProcessors) throws InitializationException{
+                if(simProcessors<1){
+                        throw new InitializationException(simProcessors+" is not a valid number for "+SIMULATOR_PROCESSORS+" must be >=1");
+                }
+                
+        }
+
+        /**
      * Test if the <b>environment</b> is a valid simulator environment.
      * @param environment The value to be tested.