X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f6cbb176d4301cae36a945dfa57e6b6a9cbafef..872d65264714799b25eb231609c3f05bae3d03dc:/src/instr/jedule/jedule_output.cpp diff --git a/src/instr/jedule/jedule_output.cpp b/src/instr/jedule/jedule_output.cpp index fa047a51c8..a0c34619e4 100644 --- a/src/instr/jedule/jedule_output.cpp +++ b/src/instr/jedule/jedule_output.cpp @@ -13,7 +13,7 @@ #include "simgrid/jedule/jedule_output.h" -#ifdef HAVE_JEDULE +#if HAVE_JEDULE XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_out, jedule, "Logging specific to Jedule output"); @@ -88,23 +88,6 @@ static void print_key_value_dict(xbt_dict_t key_value_dict) { } } -static void print_container(jed_simgrid_container_t container) { - unsigned int i; - jed_simgrid_container_t child_container; - - xbt_assert( container != NULL ); - - fprintf(jed_file, " \n", container->name); - if( container->container_children != NULL ) { - xbt_dynar_foreach(container->container_children, i, child_container) { - print_container(child_container); - } - } else { - print_resources(container); - } - fprintf(jed_file, " \n"); -} - static void print_resources(jed_simgrid_container_t resource_parent) { unsigned int res_nb; unsigned int i; @@ -126,6 +109,23 @@ static void print_resources(jed_simgrid_container_t resource_parent) { fprintf(jed_file, "\" />\n"); } +static void print_container(jed_simgrid_container_t container) { + unsigned int i; + jed_simgrid_container_t child_container; + + xbt_assert( container != NULL ); + + fprintf(jed_file, " \n", container->name); + if( container->container_children != NULL ) { + xbt_dynar_foreach(container->container_children, i, child_container) { + print_container(child_container); + } + } else { + print_resources(container); + } + fprintf(jed_file, " \n"); +} + static void print_platform(jed_simgrid_container_t root_container) { fprintf(jed_file, " \n"); print_container(root_container);