From 7b64200f0b70955c83abad1acf796dfa62287e47 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 28 Jan 2016 11:37:50 +0100 Subject: [PATCH] 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) --- examples/simdag/scheduling/minmin_test.c | 7 +++++++ examples/simdag/scheduling/test_minmin.tesh | 2 +- src/simdag/sd_global.cpp | 2 -- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/examples/simdag/scheduling/minmin_test.c b/examples/simdag/scheduling/minmin_test.c index 10ae769e26..ffc9e88a8a 100644 --- a/examples/simdag/scheduling/minmin_test.c +++ b/examples/simdag/scheduling/minmin_test.c @@ -13,6 +13,10 @@ #include "xbt/ex.h" #include +#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 9a93e1b60c..ce9e7e7779 100644 --- 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 697cc136a5..82bcfd890f 100644 --- 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 -- 2.20.1