From: Frederic Suter Date: Tue, 21 Nov 2017 17:13:15 +0000 (+0100) Subject: viva is a dead project X-Git-Tag: v3.18~272^2~4 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fbaf01d1d370378f59e8916cfcd42f7d1b6f7536 viva is a dead project remove specific code to generate viva configuration files remove related options remove related tests --- diff --git a/ChangeLog b/ChangeLog index ab45e94f52..41299260ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,9 @@ SimGrid (3.18) NOT RELEASED YET (target: December 24 2017) XML - Remove the undocumented/untested tag + TRACE + - Remove viva specific tracing as the tool is no longer maintained + SimGrid (3.17) Released October 8 2017 The Drained Leaks release: (almost) no known leaks despite the tests. diff --git a/examples/msg/trace-categories/trace-categories.tesh b/examples/msg/trace-categories/trace-categories.tesh index f2836b61a3..ebe181cddd 100644 --- a/examples/msg/trace-categories/trace-categories.tesh +++ b/examples/msg/trace-categories/trace-categories.tesh @@ -2,43 +2,9 @@ p Tracing multiple categories master/worker application -$ $SG_TEST_EXENV ${bindir:=.}/trace-categories$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:categories.cat.plist --cfg=viva/uncategorized:categories.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml +$ $SG_TEST_EXENV ${bindir:=.}/trace-categories$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'categories.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'categories.cat.plist' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'categories.uncat.plist' - -$ $SG_TEST_EXENV cat categories.cat.plist -> node = ("LINK","HOST"); -> edge = ("0-LINK4-LINK4","0-LINK4-HOST1","0-HOST1-LINK4"); -> -> host = { -> type = "square"; -> size = "power"; -> values = ("pcompute","pdata","pfinalize","prequest"); -> }; -> link = { -> type = "rhombus"; -> size = "bandwidth"; -> values = ("bcompute","bdata","bfinalize","brequest"); -> }; - -$ $SG_TEST_EXENV cat categories.uncat.plist -> node = ("LINK","HOST"); -> edge = ("0-LINK4-LINK4","0-LINK4-HOST1","0-HOST1-LINK4"); -> -> host = { -> type = "square"; -> size = "power"; -> values = ("power_used"); -> }; -> link = { -> type = "rhombus"; -> size = "bandwidth"; -> values = ("bandwidth_used"); -> }; - -$ rm -rf categories.trace categories.cat.plist categories.uncat.plist diff --git a/examples/msg/trace-masterworker/trace-masterworker.tesh b/examples/msg/trace-masterworker/trace-masterworker.tesh index d17cce3d64..0ce739d1de 100644 --- a/examples/msg/trace-masterworker/trace-masterworker.tesh +++ b/examples/msg/trace-masterworker/trace-masterworker.tesh @@ -1,14 +1,12 @@ #! ./tesh p Tracing master/worker application -$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:trace-masterworker.cat.plist --cfg=viva/uncategorized:trace-masterworker.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml +$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterworker.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterworker.cat.plist' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterworker.uncat.plist' > [4.214821] [msg_trace_masterworker/INFO] Declared tracing categories: > [4.214821] [msg_trace_masterworker/INFO] compute > [4.214821] [msg_trace_masterworker/INFO] finalize @@ -24,8 +22,6 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT ${srcdir:=.}/config_trac > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterworker.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterworker.cat.plist' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterworker.uncat.plist' > [4.214821] [msg_trace_masterworker/INFO] Declared tracing categories: > [4.214821] [msg_trace_masterworker/INFO] compute > [4.214821] [msg_trace_masterworker/INFO] finalize @@ -38,15 +34,13 @@ p Not tracing master/worker application $ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml p Testing tracing by process -$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:trace-masterworker.cat.plist --cfg=viva/uncategorized:trace-masterworker.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml +$ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterworker.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterworker.cat.plist' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterworker.uncat.plist' > [4.214821] [msg_trace_masterworker/INFO] Declared tracing categories: > [4.214821] [msg_trace_masterworker/INFO] compute > [4.214821] [msg_trace_masterworker/INFO] finalize @@ -55,34 +49,5 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg= > [4.214821] [msg_trace_masterworker/INFO] Declared marks: > [4.214821] [msg_trace_masterworker/INFO] msmark -$ $SG_TEST_EXENV cat trace-masterworker.uncat.plist -> node = ("LINK","HOST"); -> edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13"); -> -> host = { -> type = "square"; -> size = "power"; -> values = ("power_used"); -> }; -> link = { -> type = "rhombus"; -> size = "bandwidth"; -> values = ("bandwidth_used"); -> }; -$ $SG_TEST_EXENV cat trace-masterworker.cat.plist -> node = ("LINK","HOST"); -> edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13"); -> -> host = { -> type = "square"; -> size = "power"; -> values = ("pcompute","pfinalize","preport","prequest"); -> }; -> link = { -> type = "rhombus"; -> size = "bandwidth"; -> values = ("bcompute","bfinalize","breport","brequest"); -> }; - -$ rm -rf trace-masterworker.trace trace-masterworker.cat.plist trace-masterworker.uncat.plist +$ rm -rf trace-masterworker.trace diff --git a/examples/platforms/config_tracing.xml b/examples/platforms/config_tracing.xml index 38b306b636..9f3fbdc317 100644 --- a/examples/platforms/config_tracing.xml +++ b/examples/platforms/config_tracing.xml @@ -5,9 +5,7 @@ - - diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 486b5649f5..b2623ae5c9 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -37,8 +37,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING_TOPOLOGY "tracing/platform/topology" #define OPT_TRACING "tracing" #define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized" -#define OPT_VIVA_CAT_CONF "viva/categorized" -#define OPT_VIVA_UNCAT_CONF "viva/uncategorized" static bool trace_enabled = false; static bool trace_platform; @@ -133,9 +131,6 @@ int TRACE_end() } else { retval = 0; - TRACE_generate_viva_uncat_conf(); - TRACE_generate_viva_cat_conf(); - /* dump trace buffer */ TRACE_last_timestamp_to_dump = surf_get_clock(); TRACE_paje_dump_buffer(true); @@ -290,16 +285,6 @@ std::string TRACE_get_filename() return xbt_cfg_get_string(OPT_TRACING_FILENAME); } -std::string TRACE_get_viva_uncat_conf() -{ - return xbt_cfg_get_string(OPT_VIVA_UNCAT_CONF); -} - -std::string TRACE_get_viva_cat_conf() -{ - return xbt_cfg_get_string(OPT_VIVA_CAT_CONF); -} - void TRACE_global_init() { static bool is_initialised = false; @@ -337,9 +322,6 @@ void TRACE_global_init() "The contents of the file are added to the top of the trace file as comment."); xbt_cfg_register_int(OPT_TRACING_PRECISION, 6, nullptr, "Numerical precision used when timestamping events " "(expressed in number of digits after decimal point)"); - /* Viva graph configuration for uncategorized tracing */ - xbt_cfg_register_string(OPT_VIVA_UNCAT_CONF, "", nullptr, "Viva Graph configuration file for uncategorized resource utilization traces."); - xbt_cfg_register_string(OPT_VIVA_CAT_CONF, "", nullptr, "Viva Graph configuration file for categorized resource utilization traces."); xbt_cfg_register_alias(OPT_TRACING_COMMENT_FILE,"tracing/comment_file"); xbt_cfg_register_alias(OPT_TRACING_DISABLE_DESTROY, "tracing/disable_destroy"); @@ -377,13 +359,13 @@ void TRACE_help (int detailed) " It activates the uncategorized resource utilization tracing. Use it if\n" " this simulator do not use tracing categories and resource use have to be\n" " traced.", detailed); - print_line (OPT_TRACING_FILENAME, "Filename to register traces", - " A file with this name will be created to register the simulation. The file\n" - " is in the Paje format and can be analyzed using Viva, Paje, and PajeNG visualization\n" - " tools. More information can be found in these webpages:\n" - " http://github.com/schnorr/viva/\n" - " http://github.com/schnorr/pajeng/\n" - " http://paje.sourceforge.net/", detailed); + print_line(OPT_TRACING_FILENAME, "Filename to register traces", + " A file with this name will be created to register the simulation. The file\n" + " is in the Paje format and can be analyzed using Paje, and PajeNG visualization\n" + " tools. More information can be found in these webpages:\n" + " http://github.com/schnorr/pajeng/\n" + " http://paje.sourceforge.net/", + detailed); print_line (OPT_TRACING_SMPI, "Trace the MPI Interface (SMPI)", " This option only has effect if this simulator is SMPI-based. Traces the MPI\n" " interface and generates a trace that can be analyzed using Gantt-like\n" @@ -440,18 +422,6 @@ void TRACE_help (int detailed) " Use this to add a comment line to the top of the trace file.", detailed); print_line (OPT_TRACING_COMMENT_FILE, "File contents added to trace file as comment.", " Use this to add the contents of a file to the top of the trace file as comment.", detailed); - print_line (OPT_VIVA_UNCAT_CONF, "Generate a graph configuration for Viva", - " This option can be used in all types of simulators build with SimGrid\n" - " to generate a uncategorized resource utilization graph to be used as\n" - " configuration for the Viva visualization tool. This option\n" - " can be used with tracing/categorized:1 and tracing:1 options to\n" - " analyze an unmodified simulator before changing it to contain\n" - " categories.", detailed); - print_line (OPT_VIVA_CAT_CONF, "Generate an uncategorized graph configuration for Viva", - " This option can be used if this simulator uses tracing categories\n" - " in its code. The file specified by this option holds a graph configuration\n" - " file for the Viva visualization tool that can be used to analyze a categorized\n" - " resource utilization.", detailed); print_line (OPT_TRACING_TOPOLOGY, "Register the platform topology as a graph", " This option (enabled by default) can be used to disable the tracing of\n" " the platform topology in the trace file. Sometimes, such task is really\n" @@ -475,116 +445,6 @@ static void output_types (const char *name, xbt_dynar_t types, FILE *file) xbt_dynar_free (&types); } -static void output_categories(const char* name, FILE* file) -{ - unsigned int i = created_categories.size(); - fprintf (file, " values = ("); - for (auto const& cat : created_categories) { - --i; - fprintf(file, "\"%s%s\"", name, cat.c_str()); - if (i > 0) { - fprintf (file, ","); - }else{ - fprintf (file, ");\n"); - } - } -} - -static void uncat_configuration (FILE *file) -{ - //register NODE and EDGE types - output_types ("node", TRACE_get_node_types(), file); - output_types ("edge", TRACE_get_edge_types(), file); - fprintf (file, "\n"); - - //configuration for all nodes - fprintf (file, - " host = {\n" - " type = \"square\";\n" - " size = \"power\";\n" - " values = (\"power_used\");\n" - " };\n" - " link = {\n" - " type = \"rhombus\";\n" - " size = \"bandwidth\";\n" - " values = (\"bandwidth_used\");\n" - " };\n"); - //close -} - -static void cat_configuration (FILE *file) -{ - //register NODE and EDGE types - output_types ("node", TRACE_get_node_types(), file); - output_types ("edge", TRACE_get_edge_types(), file); - fprintf (file, "\n"); - - //configuration for all nodes - fprintf (file, - " host = {\n" - " type = \"square\";\n" - " size = \"power\";\n"); - output_categories("p", file); - fprintf (file, - " };\n" - " link = {\n" - " type = \"rhombus\";\n" - " size = \"bandwidth\";\n"); - output_categories("b", file); - fprintf (file, " };\n"); - //close -} - -static void generate_uncat_configuration (const char *output, const char *name, int brackets) -{ - if (output && strlen(output) > 0){ - FILE *file = fopen (output, "w"); - if (file == nullptr){ - THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph configuration (uncategorized).", - output, name); - } - - if (brackets) - fprintf (file, "{\n"); - uncat_configuration (file); - if (brackets) - fprintf (file, "}\n"); - fclose (file); - } -} - -static void generate_cat_configuration (const char *output, const char *name, int brackets) -{ - if (output && strlen(output) > 0){ - //check if we do have categories declared - if (created_categories.empty()) { - XBT_INFO("No categories declared, ignoring generation of %s graph configuration", name); - return; - } - - FILE *file = fopen (output, "w"); - if (file == nullptr){ - THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph " - "configuration (categorized).", output, name); - } - - if (brackets) fprintf (file, "{\n"); - cat_configuration (file); - if (brackets) fprintf (file, "}\n"); - fclose (file); - } -} - -void TRACE_generate_viva_uncat_conf () -{ - generate_uncat_configuration(TRACE_get_viva_uncat_conf().c_str(), "viva", 0); -} - -void TRACE_generate_viva_cat_conf () -{ - generate_cat_configuration(TRACE_get_viva_cat_conf().c_str(), "viva", 0); -} - static int previous_trace_state = -1; void instr_pause_tracing () diff --git a/src/instr/instr_paje_events.hpp b/src/instr/instr_paje_events.hpp index a4afdb07a1..c8fa8b2591 100644 --- a/src/instr/instr_paje_events.hpp +++ b/src/instr/instr_paje_events.hpp @@ -63,7 +63,7 @@ public: class StateEvent : public PajeEvent { EntityValue* value; std::string filename; - int linenumber; + int linenumber = 0; TIData* extra_ = nullptr; public: