changing jedule binding behavior

Don't let jedule implicetely and systematically dump a file
Modify the minmin scheduling test to examplify an explicit dump (iff
the jedule cmake option is ON)

diff --git a/examples/simdag/scheduling/minmin_test.c b/examples/simdag/scheduling/minmin_test.c
index 10ae769..ffc9e88 100644 (file)
--- a/examples/simdag/scheduling/minmin_test.c
+++ b/examples/simdag/scheduling/minmin_test.c
@@ -13,6 +13,10 @@
 #include "xbt/ex.h"
 #include <string.h>
 
+#ifdef HAVE_JEDULE
+#include "simgrid/jedule/jedule_sd_binding.h"
+#endif
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(test,
                              "Logging specific to this SimDag example");
 
@@ -375,6 +379,9 @@ int main(int argc, char **argv)
 
   fclose(out);
 
+#ifdef HAVE_JEDULE
+  jedule_sd_dump();
+#endif
 
   xbt_dynar_free_container(&ready_tasks);
 

diff --git a/examples/simdag/scheduling/test_minmin.tesh b/examples/simdag/scheduling/test_minmin.tesh
index 9a93e1b..ce9e7e7 100644 (file)
--- a/examples/simdag/scheduling/test_minmin.tesh
+++ b/examples/simdag/scheduling/test_minmin.tesh
@@ -35,4 +35,4 @@ $ $SG_TEST_EXENV ${bindir:=.}/minmin_test --log=sd_daxparse.thresh:critical ${sr
 > [98.184618] [test/INFO] Producing the trace of the run into ./Montage_25.jed
 
 
-$ cmake -E remove -f ${srcdir:=.}/Montage_25.jed
\ No newline at end of file
+$ cmake -E remove -f ${srcdir:=.}/Montage_25.jed ${srcdir:=.}/minmin_test.jed
\ No newline at end of file

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 697cc13..82bcfd8 100644 (file)
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -132,7 +132,6 @@ void SD_application_reinit(void)
 
 
 #ifdef HAVE_JEDULE
-  jedule_sd_dump();
   jedule_sd_cleanup();
   jedule_sd_init();
 #endif
@@ -374,7 +373,6 @@ void SD_exit(void)
   sd_global = NULL;
 
 #ifdef HAVE_JEDULE
-  jedule_sd_dump();
   jedule_sd_cleanup();
   jedule_sd_exit();
 #endif