Fix Java build

java CPU surf binding used to register itself to the list of models that
must be called through shareResources directly. But this was useless
because CPU models are invoked from the host models (leading to
dupplicated lines in the tesh file).

Now that it is not possible anymore to register to that list of models
(which was removed), we must fix the java CPU surf binding.

diff --git a/examples/java/surfCpuModel/surf_cpu_model.tesh b/examples/java/surfCpuModel/surf_cpu_model.tesh
index 990b8c6..a91d278 100644 (file)
--- a/examples/java/surfCpuModel/surf_cpu_model.tesh
+++ b/examples/java/surfCpuModel/surf_cpu_model.tesh
@@ -16,18 +16,14 @@ $ java -classpath ${classpath:=.} surfCpuModel/TestCpuModel ${srcdir:=.}/../plat
 > [0.000000] [jmsg/INFO] Sleep action of duration -1.0 sleeping true
 > [0.000000] [jmsg/INFO] Sleep action of duration -1.0 sleeping true
 > [0.000000] [jmsg/INFO] ShareResources at time -1.0
 > [0.000000] [jmsg/INFO] Sleep action of duration -1.0 sleeping true
 > [0.000000] [jmsg/INFO] Sleep action of duration -1.0 sleeping true
 > [0.000000] [jmsg/INFO] ShareResources at time -1.0

-> [0.000000] [jmsg/INFO] ShareResources at time -1.0

 > [0.019014] [jmsg/INFO] UpdateActionState of 2 actions
 > [0.019014] [jmsg/INFO] ShareResources at time -1.0
 > [0.019014] [jmsg/INFO] UpdateActionState of 2 actions
 > [0.019014] [jmsg/INFO] ShareResources at time -1.0

-> [0.019014] [jmsg/INFO] ShareResources at time -1.0

 > [0.019014] [jmsg/INFO] UpdateActionState of 2 actions
 > [Tremblay:surfCpuModel.Sender:(1) 0.019014] [jmsg/INFO] Send duration: 0.019014479160788175
 > [Tremblay:surfCpuModel.Sender:(1) 0.019014] [jmsg/INFO] goodbye!
 > [0.019014] [jmsg/INFO] Execute action of size 1.0E9 sleeping false
 > [0.019014] [jmsg/INFO] Share action with new time 13.10684701688162
 > [0.019014] [jmsg/INFO] ShareResources at time 13.10684701688162
 > [0.019014] [jmsg/INFO] UpdateActionState of 2 actions
 > [Tremblay:surfCpuModel.Sender:(1) 0.019014] [jmsg/INFO] Send duration: 0.019014479160788175
 > [Tremblay:surfCpuModel.Sender:(1) 0.019014] [jmsg/INFO] goodbye!
 > [0.019014] [jmsg/INFO] Execute action of size 1.0E9 sleeping false
 > [0.019014] [jmsg/INFO] Share action with new time 13.10684701688162
 > [0.019014] [jmsg/INFO] ShareResources at time 13.10684701688162

-> [0.019014] [jmsg/INFO] Share action with new time 13.10684701688162
-> [0.019014] [jmsg/INFO] ShareResources at time 13.10684701688162

 > [13.125861] [jmsg/INFO] UpdateActionState of 1 actions
 > [13.125861] [jmsg/INFO] action remains 0.0 after delta of 13.10684701688162
 > [13.125861] [jmsg/INFO] action DONE
 > [13.125861] [jmsg/INFO] UpdateActionState of 1 actions
 > [13.125861] [jmsg/INFO] action remains 0.0 after delta of 13.10684701688162
 > [13.125861] [jmsg/INFO] action DONE

diff --git a/src/bindings/java/surf_swig.cpp b/src/bindings/java/surf_swig.cpp
index 878f249..e01b952 100644 (file)
--- a/src/bindings/java/surf_swig.cpp
+++ b/src/bindings/java/surf_swig.cpp
@@ -25,7 +25,6 @@ CpuModel *java_cpu_model;
 static void java_cpu_model_init_preparse() {
   surf_cpu_model_pm = java_cpu_model;
   xbt_dynar_push(all_existing_models, &java_cpu_model);
 static void java_cpu_model_init_preparse() {
   surf_cpu_model_pm = java_cpu_model;
   xbt_dynar_push(all_existing_models, &java_cpu_model);

-  xbt_dynar_push(model_list_invoke, &java_cpu_model);

   sg_platf_host_add_cb(cpu_parse_init);
 }
 
   sg_platf_host_add_cb(cpu_parse_init);
 }