Merge pull request #203 from simgrid/fix/execute_benched

Fix smpi_execute_benched.

diff --git a/examples/java/app/masterworker/Master.java b/examples/java/app/masterworker/Master.java
index 6de1072..a88332b 100644 (file)
--- a/examples/java/app/masterworker/Master.java
+++ b/examples/java/app/masterworker/Master.java
@@ -29,7 +29,7 @@ public class Master extends Process {
 
     int workersCount = Integer.parseInt(args[3]);
 
-    Msg.info("Hello! Got "+  workersCount + " workers and "+tasksCount+" tasks to process");
+    Msg.info("Hello! My PID is "+getPID()+". Got "+  workersCount + " workers and "+tasksCount+" tasks to process");
 
     for (int i = 0; i < tasksCount; i++) {
       Task task = new Task("Task_" + i, taskComputeSize, taskCommunicateSize); 

diff --git a/examples/java/app/masterworker/Worker.java b/examples/java/app/masterworker/Worker.java
index dc7d44f..20113dd 100644 (file)
--- a/examples/java/app/masterworker/Worker.java
+++ b/examples/java/app/masterworker/Worker.java
@@ -34,7 +34,7 @@ public class Worker extends Process {
       if ("finalize".equals(task.getName())) {
         break;
       }
-      Msg.info("Received \"" + task.getName() +  "\". Processing it.");
+      Msg.info("Received \"" + task.getName() +  "\". Processing it (my pid is "+getPID()+").");
       try {
         task.execute();
       } catch (TaskCancelledException e) {

diff --git a/examples/java/app/masterworker/app-masterworker.tesh b/examples/java/app/masterworker/app-masterworker.tesh
index e2fcf87..fdf4de7 100644 (file)
--- a/examples/java/app/masterworker/app-masterworker.tesh
+++ b/examples/java/app/masterworker/app-masterworker.tesh
@@ -2,12 +2,12 @@
 
 $ java -classpath ${classpath:=.} app/masterworker/Main ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/app/masterworker/masterworker.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
-> [  0.000000] (1:app.masterworker.Master@Jacquelin) Hello! Got 7 workers and 5 tasks to process
-> [  0.860026] (2:app.masterworker.Worker@Tremblay) Received "Task_0". Processing it.
-> [  1.752187] (3:app.masterworker.Worker@Fafard) Received "Task_1". Processing it.
-> [  1.757531] (4:app.masterworker.Worker@Bourassa) Received "Task_2". Processing it.
-> [  2.806417] (5:app.masterworker.Worker@Boivin) Received "Task_3". Processing it.
-> [  2.811761] (6:app.masterworker.Worker@Ginette) Received "Task_4". Processing it.
+> [  0.000000] (1:app.masterworker.Master@Jacquelin) Hello! My PID is 1. Got 7 workers and 5 tasks to process
+> [  0.860026] (2:app.masterworker.Worker@Tremblay) Received "Task_0". Processing it (my pid is 2).
+> [  1.752187] (3:app.masterworker.Worker@Fafard) Received "Task_1". Processing it (my pid is 3).
+> [  1.757531] (4:app.masterworker.Worker@Bourassa) Received "Task_2". Processing it (my pid is 4).
+> [  2.806417] (5:app.masterworker.Worker@Boivin) Received "Task_3". Processing it (my pid is 5).
+> [  2.811761] (6:app.masterworker.Worker@Ginette) Received "Task_4". Processing it (my pid is 6).
 > [  2.811761] (1:app.masterworker.Master@Jacquelin) All tasks have been dispatched. Let's tell everybody the computation is over.
 > [  3.671783] (2:app.masterworker.Worker@Tremblay) Received Finalize. I'm done. See you!
 > [  4.563940] (3:app.masterworker.Worker@Fafard) Received Finalize. I'm done. See you!

diff --git a/examples/s4u/energy-link/s4u-energy-link.cpp b/examples/s4u/energy-link/s4u-energy-link.cpp
index 94de986..e64eccf 100644 (file)
--- a/examples/s4u/energy-link/s4u-energy-link.cpp
+++ b/examples/s4u/energy-link/s4u-energy-link.cpp
@@ -24,6 +24,7 @@ static void sender(std::vector<std::string> args)
 
   simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(std::string("message"));
 
+  /* Sleep a while before starting the example */
   simgrid::s4u::this_actor::sleep_for(10);
 
   /* - Send the task to the @ref worker */

diff --git a/sonar-project.properties b/sonar-project.properties
index ab7e012..1d43b05 100644 (file)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,5 +1,5 @@
 # This file is used to scan the project for issues automatically 
-# Browse the result here: https://sonarqube.com/dashboard?id=simgrid
+# Browse the result here: https://sonarcloud.io/dashboard/?id=simgrid
 
 sonar.projectKey=simgrid
 sonar.projectName=SimGrid

diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp
index 1d4b58e..05ba285 100644 (file)
--- a/src/bindings/java/jmsg_process.cpp
+++ b/src/bindings/java/jmsg_process.cpp
@@ -127,6 +127,12 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jcl
   return jprocess;
 }
 
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_nativeGetPID(JNIEnv* env, jobject jprocess)
+{
+  msg_process_t process = jprocess_to_native(jprocess, env);
+  return MSG_process_get_PID(process);
+}
+
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject jname) {
   msg_process_t process = jprocess_to_native(jprocess, env);
 

diff --git a/src/bindings/java/jmsg_process.h b/src/bindings/java/jmsg_process.h
index 597f5b2..0d5cc44 100644 (file)
--- a/src/bindings/java/jmsg_process.h
+++ b/src/bindings/java/jmsg_process.h
@@ -50,6 +50,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv* env, jobject
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_daemonize(JNIEnv* env, jobject jprocess);
 JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv* env, jclass cls, jint jresetPID);
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv* env, jclass cls, jint pid);
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_nativeGetPID(JNIEnv* env, jobject jprocess);
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getProperty(JNIEnv* env, jobject jprocess, jobject jname);
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getCurrentProcess(JNIEnv* env, jclass cls);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_suspend(JNIEnv* env, jobject jprocess);

diff --git a/src/bindings/java/org/simgrid/msg/Process.java b/src/bindings/java/org/simgrid/msg/Process.java
index e4c7900..ecc7cee 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/Process.java
+++ b/src/bindings/java/org/simgrid/msg/Process.java
@@ -217,8 +217,13 @@ public abstract class Process implements Runnable {
         *
         */ 
        public int getPID()  {
+               if (pid == -1) // Don't traverse the JNI barrier if you already have the answer
+                       pid = nativeGetPID(); 
                return pid;
        }
+       // This should not be used: the PID is supposed to be initialized from the C directly when the actor is created,
+       // but this sometimes fail, so let's play nasty but safe here.
+       private native int nativeGetPID();
        /**
         * This method returns the PID of the parent of a process.
         *

diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh
index 65e549f..922defa 100755 (executable)
--- a/tools/internal/travis-sonarqube.sh
+++ b/tools/internal/travis-sonarqube.sh
@@ -21,7 +21,7 @@ installSonarQubeScanner() {
   export SONAR_SCANNER_OPTS="-server"
 }
 installBuildWrapper() {
-  curl -LsS https://sonarqube.com/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip
+  curl -LsS https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip
   unzip build-wrapper-linux-x86.zip
 }
 installSonarQubeScanner
@@ -49,7 +49,7 @@ ctest -D ExperimentalCoverage
 # See https://docs.travis-ci.com/user/sonarqube/ for more info on tokens
 # don't show the token in the logs
 set +x
-sonar-scanner -Dsonar.host.url=https://sonarqube.com -Dsonar.login=$SONAR_TOKEN 2>&1 \
+sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN 2>&1 \
   | grep -v 'INFO: Parsing /home/travis/build/simgrid/simgrid/Testing/CoverageInfo'  \
   | grep -v 'WARN: File not analysed by Sonar, so ignoring coverage: /usr/include/'