Bugfix in Mutex class. Forgot the deployment file in masterslave

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bd3872..7c5a9a3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,6 +150,9 @@ set(JAVA_EXAMPLES
        examples/master_slave_kill/MsKill.java
        examples/master_slave_kill/Slave.java
        examples/master_slave_kill/FinalizeTask.java
        examples/master_slave_kill/MsKill.java
        examples/master_slave_kill/Slave.java
        examples/master_slave_kill/FinalizeTask.java

+       examples/migration/Emigrant.java
+       examples/migration/Migration.java
+       examples/migration/Policeman.java

        examples/mutualExclusion/centralized/MutexCentral.java
        examples/mutualExclusion/centralized/GrantTask.java
        examples/mutualExclusion/centralized/Coordinator.java
        examples/mutualExclusion/centralized/MutexCentral.java
        examples/mutualExclusion/centralized/GrantTask.java
        examples/mutualExclusion/centralized/Coordinator.java


@@ -176,17 +179,17 @@ ${CMAKE_HOME_DIRECTORY}/FindSimGrid.cmake
 )
 
 set(XML_FILES
 )
 
 set(XML_FILES

-    examples/commTime/commTimeDeployment.xml
-    examples/mutualExclusion/ring3.xml
-    examples/mutualExclusion/centralized/mutex_centralized_deployment.xml

     examples/platform.xml
     examples/platform.xml

-    examples/pingPong/pingPongDeployment.xml
-    examples/masterslave/basicDeployment.xml
+    examples/async/asyncDeployment.xml
+    examples/bittorrent/bittorrent.xml
+    examples/commTime/commTimeDeployment.xml
+    examples/masterslave/masterslaveDeployment.xml

     examples/masterslave/deploy.xml
     examples/master_slave_bypass/platform.xml
     examples/master_slave_kill/platform.xml
     examples/masterslave/deploy.xml
     examples/master_slave_bypass/platform.xml
     examples/master_slave_kill/platform.xml

-    examples/async/asyncDeployment.xml
-    examples/bittorrent/bittorrent.xml
+    examples/mutualExclusion/ring3.xml  
+    examples/mutualExclusion/centralized/mutex_centralized_deployment.xml
+    examples/pingPong/pingPongDeployment.xml

 )
 
 set(source_to_pack
 )
 
 set(source_to_pack


@@ -265,6 +268,7 @@ add_custom_command(
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/masterslave/*.java
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/*.java
   COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/*.java
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/masterslave/*.java
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/*.java
   COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/*.java

+       COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/migration/*.java

   COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/*.java                                      
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/priority/*.java    
   COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/*.java                                      
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/priority/*.java    


@@ -299,7 +303,7 @@ ADD_TEST(bypass          ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE
 ADD_TEST(commTime        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/commTime/commtime.tesh)
 ADD_TEST(chord          ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/chord/chord.tesh)
 ADD_TEST(kill            ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/kill.tesh)
 ADD_TEST(commTime        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/commTime/commtime.tesh)
 ADD_TEST(chord          ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/chord/chord.tesh)
 ADD_TEST(kill            ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/kill.tesh)

-ADD_TEST(masterslave           ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/masterslave/masterslave.tesh)
+ADD_TEST(masterslave     ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/masterslave/masterslave.tesh)

 ADD_TEST(mutualExclusion ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh)
 ADD_TEST(pingPong        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingpong.tesh)
 ADD_TEST(priority        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/priority/priority.tesh)
 ADD_TEST(mutualExclusion ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh)
 ADD_TEST(pingPong        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingpong.tesh)
 ADD_TEST(priority        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/priority/priority.tesh)

diff --git a/examples/master_slave_bypass/platform.xml b/examples/master_slave_bypass/platform.xml
index 310c6e6..776a31b 100644 (file)
--- a/examples/master_slave_bypass/platform.xml
+++ b/examples/master_slave_bypass/platform.xml
@@ -26,4 +26,4 @@
                                <link_ctn id="3"/>
    </route>
 </AS>
                                <link_ctn id="3"/>
    </route>
 </AS>

-</platform>
\ No newline at end of file
+</platform>

diff --git a/examples/masterslave/masterslaveDeployment.xml b/examples/masterslave/masterslaveDeployment.xml
new file mode 100644 (file)
index 0000000..6c01ac0
--- /dev/null
+++ b/examples/masterslave/masterslaveDeployment.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <process host="Jacquelin" function="masterslave.Master">
+     <argument value="5"/>     <!-- Amount of tasks to dispatch -->
+     <argument value="50000"/> <!-- Computation size of each task -->
+     <argument value="10"/>    <!-- Communication size of each one -->
+     <argument value="7"/>     <!-- Amount of slaves waiting for orders -->
+  </process>
+  
+  <process host="Jackson" function="masterslave.Forwarder">
+     <argument value="0"/>  <!-- Input mailbox -->
+     <argument value="7"/>  <!-- First output mailbox -->
+     <argument value="8"/>  <!-- Last output mailbox -->
+  </process>
+  <process host="Casavant" function="masterslave.Forwarder">
+     <argument value="1"/>  <!-- Input mailbox -->
+     <argument value="9"/>  <!-- First output mailbox -->
+     <argument value="10"/> <!-- Last output mailbox -->
+  </process>
+  
+  <process host="iRMX" function="masterslave.Slave">
+     <argument value="2"/>  <!-- Input mailbox -->
+  </process>
+  <process host="Bousquet" function="masterslave.Slave">
+     <argument value="3"/>  <!-- Input mailbox -->
+  </process>  
+  <process host="Soucy" function="masterslave.Slave">
+     <argument value="4"/>  <!-- Input mailbox -->
+  </process>  
+  <process host="Kuenning" function="masterslave.Slave">
+     <argument value="5"/>  <!-- Input mailbox -->
+  </process>  
+  <process host="Browne" function="masterslave.Slave">
+     <argument value="6"/>  <!-- Input mailbox -->
+  </process>  
+  <process host="Stephen" function="masterslave.Slave">
+     <argument value="7"/>  <!-- Input mailbox -->
+  </process>  
+  <process host="Robert" function="masterslave.Slave">
+     <argument value="8"/>  <!-- Input mailbox -->
+  </process>  
+  <process host="Sirois" function="masterslave.Slave">
+     <argument value="9"/>  <!-- Input mailbox -->
+  </process>  
+  <process host="Monique" function="masterslave.Slave">
+     <argument value="10"/>  <!-- Input mailbox -->
+  </process>  
+</platform>

diff --git a/examples/suspend/DreamMaster.java b/examples/suspend/DreamMaster.java
index 2f1efe5..f3bb90d 100644 (file)
--- a/examples/suspend/DreamMaster.java
+++ b/examples/suspend/DreamMaster.java
@@ -15,7 +15,7 @@ public class DreamMaster extends Process {
                Msg.info("Let's wait a little bit...");
                waitFor(10);
                Msg.info("Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!");
                Msg.info("Let's wait a little bit...");
                waitFor(10);
                Msg.info("Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!");

-               lazyGuy.restart();
+               lazyGuy.resume();

                Msg.info("OK, goodbye now.");
        }
 }
\ No newline at end of file
                Msg.info("OK, goodbye now.");
        }
 }
\ No newline at end of file

diff --git a/examples/suspend/LazyGuy.java b/examples/suspend/LazyGuy.java
index cb7c722..0904636 100644 (file)
--- a/examples/suspend/LazyGuy.java
+++ b/examples/suspend/LazyGuy.java
@@ -10,7 +10,7 @@ public class LazyGuy extends Process {
        } 
        public void main(String[] args) throws MsgException {
                Msg.info("Nobody's watching me ? Let's go to sleep.");
        } 
        public void main(String[] args) throws MsgException {
                Msg.info("Nobody's watching me ? Let's go to sleep.");

-               pause();
+               suspend();

                Msg.info("Uuuh ? Did somebody call me ?");
                Msg.info("Mmmh, goodbye now.");
        }
                Msg.info("Uuuh ? Did somebody call me ?");
                Msg.info("Mmmh, goodbye now.");
        }

diff --git a/org/simgrid/msg/Mutex.java b/org/simgrid/msg/Mutex.java
index 0930552..7032b6e 100644 (file)
--- a/org/simgrid/msg/Mutex.java
+++ b/org/simgrid/msg/Mutex.java
@@ -15,14 +15,14 @@ package org.simgrid.msg;
 public class Mutex {
        private long bind; // The C object -- don't touch it
        
 public class Mutex {
        private long bind; // The C object -- don't touch it
        

-       public Mutex(int capa) {
-               init(capa);
+       public Mutex() {
+               init();

        }
        protected void finalize() {
                exit();
        }
        private native void exit();
        }
        protected void finalize() {
                exit();
        }
        private native void exit();

-       private native void init(int capacity);
+       private native void init();

        public native void acquire();
        public native void release();
        
        public native void acquire();
        public native void release();
        

diff --git a/src/jmsg_synchro.c b/src/jmsg_synchro.c
index abffec4..a504026 100644 (file)
--- a/src/jmsg_synchro.c
+++ b/src/jmsg_synchro.c
@@ -8,6 +8,8 @@
 #include "jmsg_synchro.h"
 #include "jxbt_utilities.h"
 
 #include "jmsg_synchro.h"
 #include "jxbt_utilities.h"
 

+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+

 static jfieldID jsyncro_field_Mutex_bind;
 
 JNIEXPORT void JNICALL
 static jfieldID jsyncro_field_Mutex_bind;
 
 JNIEXPORT void JNICALL