From: Arnaud Giersch Date: Tue, 21 Nov 2017 20:30:06 +0000 (+0100) Subject: Remove remaining traces of viva. X-Git-Tag: v3.18~257^2~2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c39b62afc610cc7f6d04676f467428393687ff5c Remove remaining traces of viva. --- diff --git a/doc/doxygen/tutorial_msg.doc b/doc/doxygen/tutorial_msg.doc index 6adb7d3fa1..3149ffc262 100644 --- a/doc/doxygen/tutorial_msg.doc +++ b/doc/doxygen/tutorial_msg.doc @@ -113,7 +113,6 @@ provided by the [online documentation][fn:4] and by several tutorials: Several tools can be used to visualize the result of SimGrid simulations and get a better understanding of simulations. -- [viva][fn:1] will be useful to make fancy graph or treemap visualizations. - [pajeng][fn:5] provides a Gantt-chart visualization. - [Vite][fn:6] also provides a Gantt-chart visualization. @@ -122,7 +121,7 @@ may have to install from the source on other systems. Check the documentation of each software for more details. ~~~~{.sh} -sudo apt-get install viva pajeng vite +sudo apt-get install pajeng vite ~~~~ \section intro_start Let's get started @@ -158,16 +157,7 @@ specify the full path to simgrid-colorizer on the above line, such as \c /opt/simgrid/bin/simgrid-colorizer. If you did not install it at all, you can find it in /bin/colorize. -For a really fancy output, you should use [viva/triva][fn:1]: - -~~~~{.sh} -./masterworker0 platforms/platform.xml deployment0.xml --cfg=tracing:yes \ - --cfg=tracing/uncategorized:yes --cfg=viva/uncategorized:uncat.plist -LANG=C ; viva simgrid.trace uncat.plist -~~~~ - -For a more classical Gantt-Chart visualization, you can produce a -[Paje][fn:5] trace: +For a classical Gantt-Chart visualization, you can produce a [Paje][fn:5] trace: ~~~~{.sh} ./masterworker0 platforms/platform.xml deployment0.xml --cfg=tracing:yes \ @@ -317,7 +307,7 @@ tasks processed). These debug messages can be activated as follows: ## Using the Tracing Mechanism SimGrid can trace all resource consumption and the outcome can be -displayed with viva as illustrated in the section \ref intro_setup. However, when several +displayed as illustrated in the section \ref intro_setup. However, when several masters are deployed, it is hard to understand what happens. ~~~~{.xml} @@ -349,18 +339,7 @@ void TRACE_category(const char *category); void MSG_task_set_category (msg_task_t task, const char *category); ~~~~ -The outcome can then be visualized as follows: - -~~~~{.sh} -./masterworker3 platforms/platform.xml deployment3.xml --cfg=tracing:yes\ - --cfg=tracing/categorized:yes --cfg=viva/categorized:viva_cat.plist -LANG=C; viva simgrid.trace viva_cat.plist -~~~~ - -Right now, you should realize that nothing is behaving like you -expect. Most workers are idle even though input data are ridiculous -and there are several masters deployed on the platform. Using a -Gantt-chart visualization may help: +The outcome can then be visualized as a Gantt-chart as follows: ~~~~{.sh} ./masterworker3 platforms/platform.xml deployment3.xml --cfg=tracing:yes \ @@ -368,8 +347,10 @@ Gantt-chart visualization may help: pajeng simgrid.trace ~~~~ -OK, so it should now be obvious that round robin is actually -very bad. +Right now, you should realize that nothing is behaving like you expect. Most +workers are idle even though input data are ridiculous and there are several +masters deployed on the platform. So it should now be obvious that round robin +is actually very bad. ## Improving the Scheduling @@ -436,8 +417,8 @@ bytes that you manage to distribute and process in one hour on \section intro_todo TODO: Points to improve for the next time - Propose equivalent exercises and skeleton in java. -- Propose a virtualbox image with everything (simgrid, pajeng, viva, - ...) already set up. +- Propose a virtualbox image with everything (simgrid, pajeng, ...) already set + up. - Ease the installation on mac OS X (binary installer) and windows. - Explain that programming in C or java and having a working diff --git a/doc/manpage/smpirun.1 b/doc/manpage/smpirun.1 index 89783e11a9..abdf45c99d 100644 --- a/doc/manpage/smpirun.1 +++ b/doc/manpage/smpirun.1 @@ -64,9 +64,6 @@ Group MPI processes by location. \fB\-trace-resource\fR Trace resource utilization. .TP -\fB\-trace-viva\fR -Generate configuration for Viva's GraphView. -.TP \fB\-trace-file\fR Name of the tracefile diff --git a/examples/msg/trace-host-user-variables/trace-host-user-variables.c b/examples/msg/trace-host-user-variables/trace-host-user-variables.c index 89ec48da99..49177174e6 100644 --- a/examples/msg/trace-host-user-variables/trace-host-user-variables.c +++ b/examples/msg/trace-host-user-variables/trace-host-user-variables.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2012-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010, 2012-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -77,38 +77,24 @@ int main(int argc, char *argv[]) xbt_dynar_free (&link_variables); } - //create a customized viva graph configuration file - FILE *fp = fopen ("viva_graph.plist", "w"); - if (fp == NULL){ - return 1; - } - fprintf (fp, "{\n node = ("); xbt_dynar_t nodes_type = TRACE_get_node_types (); if (nodes_type){ XBT_INFO ("Node types in the trace:"); char *node_type; xbt_dynar_foreach (nodes_type, cursor, node_type){ XBT_INFO ("%s", node_type); - fprintf (fp, "%s, ", node_type); } xbt_dynar_free (&nodes_type); } - fprintf (fp, ");\n edge = ("); xbt_dynar_t edges_type = TRACE_get_edge_types (); if (edges_type){ XBT_INFO ("Node types in the trace:"); char *edge_type; xbt_dynar_foreach (edges_type, cursor, edge_type){ XBT_INFO ("%s", edge_type); - fprintf (fp, "%s, ", edge_type); } xbt_dynar_free (&edges_type); } - fprintf (fp, ");\n"); - fprintf (fp, " host = {\n type = square;\n size = HDD_capacity; \n values = (HDD_utilization);\n };\n"); - fprintf (fp, " link = {\n type = rhombus;\n size = bandwidth;\n };\n"); - fprintf (fp, "}\n"); - fclose (fp); return 0; } diff --git a/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh b/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh index 431b774ee5..4331c820b1 100644 --- a/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh +++ b/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh @@ -16,9 +16,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-host-user-variables$EXEEXT --cfg=tracing:yes > [0.004078] [msg_test/INFO] 0-LINK3-HOST1 > [0.004078] [msg_test/INFO] 0-LINK3-LINK3 -$ rm -f viva_graph.plist +$ rm -f simgrid.trace p Not tracing user variables $ $SG_TEST_EXENV ${bindir:=.}/trace-host-user-variables$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/app-masterworker/app-masterworker_d.xml - -$ rm -f simgrid.trace viva_graph.plist