Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Convert deprecated/msg/trace-host-user-variables to s4u/trace-host-user-variables.
authorArnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Mon, 7 Dec 2020 15:04:37 +0000 (16:04 +0100)
committerArnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Mon, 7 Dec 2020 15:46:19 +0000 (16:46 +0100)
.gitignore
MANIFEST.in
examples/deprecated/msg/CMakeLists.txt
examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.c [deleted file]
examples/s4u/CMakeLists.txt
examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.cpp [new file with mode: 0644]
examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.tesh [moved from examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.tesh with 99% similarity]

index c4985d0..de21cbe 100644 (file)
@@ -168,7 +168,6 @@ examples/deprecated/msg/mc/electric_fence
 examples/deprecated/msg/synchro-semaphore/synchro-semaphore
 examples/deprecated/msg/trace-masterworker/trace-masterworker
 examples/deprecated/msg/trace-process-migration/trace-process-migration
-examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables
 examples/deprecated/msg/*.pcap
 examples/deprecated/msg/*.tr
 examples/s4u/actor-create/s4u-actor-create
@@ -242,6 +241,7 @@ examples/s4u/trace-categories/s4u-trace-categories
 examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables
 examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables
 examples/s4u/trace-platform/s4u-trace-platform
+examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables
 examples/deprecated/simdag/dag-dotload/sd_dag-dotload
 examples/deprecated/simdag/daxload/sd_daxload
 examples/deprecated/simdag/fail/sd_fail
index e9a57ea..2defab8 100644 (file)
@@ -266,8 +266,6 @@ include examples/deprecated/msg/trace-masterworker/trace-masterworker.c
 include examples/deprecated/msg/trace-masterworker/trace-masterworker.tesh
 include examples/deprecated/msg/trace-process-migration/trace-process-migration.c
 include examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh
-include examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.c
-include examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.tesh
 include examples/deprecated/simdag/dag-dotload/dag.dot
 include examples/deprecated/simdag/dag-dotload/dag_with_cycle.dot
 include examples/deprecated/simdag/dag-dotload/sd_dag-dotload.c
@@ -521,6 +519,8 @@ include examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.cpp
 include examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.tesh
 include examples/s4u/trace-platform/s4u-trace-platform.cpp
 include examples/s4u/trace-platform/s4u-trace-platform.tesh
+include examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.cpp
+include examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.tesh
 include examples/smpi/NAS/DGraph.c
 include examples/smpi/NAS/DGraph.h
 include examples/smpi/NAS/README.install
index 0cdbde4..bb6558d 100644 (file)
@@ -1,4 +1,4 @@
-foreach(x trace-route-user-variables trace-masterworker trace-process-migration)
+foreach(x trace-masterworker trace-process-migration)
   if(enable_msg)
     add_executable       (${x}  EXCLUDE_FROM_ALL ${x}/${x}.c)
     target_link_libraries(${x}  simgrid)
@@ -14,7 +14,7 @@ set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README.doc
 set(tesh_files    ${tesh_files}    PARENT_SCOPE)
 
 if(enable_msg)
-  foreach (x trace-route-user-variables trace-masterworker trace-process-migration)
+  foreach (x trace-masterworker trace-process-migration)
     ADD_TESH(msg-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/${x}
                       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/${x} 
                       --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms 
diff --git a/examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.c b/examples/deprecated/msg/trace-route-user-variables/trace-route-user-variables.c
deleted file mode 100644 (file)
index 5c817a1..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright (c) 2012-2020. 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. */
-
-#include <simgrid/msg.h>
-
-//dump function to create and execute a task
-static void create_and_execute_task (void)
-{
-  msg_task_t task = MSG_task_create("task", 1000000, 0, NULL);
-  MSG_task_execute (task);
-  MSG_task_destroy (task);
-}
-
-static int trace_fun(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
-{
-  //Set initial values for the link user variables
-  //This example uses source and destination where source and destination are the name of hosts in the platform file.
-  //The functions will set/change the value of the variable for all links in the route between source and destination.
-
-  //Set the Link_Capacity variable
-  TRACE_link_srcdst_variable_set("Tremblay", "Bourassa", "Link_Capacity", 12.34);
-  TRACE_link_srcdst_variable_set("Fafard", "Ginette", "Link_Capacity", 56.78);
-
-  //Set the Link_Utilization variable
-  TRACE_link_srcdst_variable_set("Tremblay", "Bourassa", "Link_Utilization", 1.2);
-  TRACE_link_srcdst_variable_set("Fafard", "Ginette", "Link_Utilization", 3.4);
-
-  //run the simulation, update my variables accordingly
-  for (int i = 0; i < 10; i++) {
-    create_and_execute_task ();
-
-    //Add to link user variables
-    TRACE_link_srcdst_variable_add ("Tremblay", "Bourassa", "Link_Utilization", 5.6);
-    TRACE_link_srcdst_variable_add ("Fafard", "Ginette", "Link_Utilization", 7.8);
-  }
-
-  for (int i = 0; i < 10; i++) {
-    create_and_execute_task ();
-
-    //Subtract from link user variables
-    TRACE_link_srcdst_variable_sub ("Tremblay", "Bourassa", "Link_Utilization", 3.4);
-    TRACE_link_srcdst_variable_sub ("Fafard", "Ginette", "Link_Utilization", 5.6);
-  }
-
-  return 0;
-}
-
-int main(int argc, char *argv[])
-{
-  MSG_init(&argc, argv);
-  xbt_assert(argc > 1, "Usage: %s platform_file\n \tExample: %s msg_platform.xml\n", argv[0], argv[0]);
-
-  MSG_create_environment(argv[1]);
-
-  // declaring link user variables (one without, another with an RGB color)
-  TRACE_link_variable_declare("Link_Capacity");
-  TRACE_link_variable_declare_with_color ("Link_Utilization", "0.9 0.1 0.1");
-
-  MSG_process_create("master", trace_fun, NULL, MSG_host_by_name("Tremblay"));
-  MSG_process_create("worker", trace_fun, NULL, MSG_host_by_name("Tremblay"));
-  MSG_process_create("worker", trace_fun, NULL, MSG_host_by_name("Jupiter"));
-  MSG_process_create("worker", trace_fun, NULL, MSG_host_by_name("Fafard"));
-  MSG_process_create("worker", trace_fun, NULL, MSG_host_by_name("Ginette"));
-  MSG_process_create("worker", trace_fun, NULL, MSG_host_by_name("Bourassa"));
-
-  MSG_main();
-  return 0;
-}
index 1415914..823779e 100644 (file)
@@ -186,7 +186,8 @@ endif()
 # Examples not accepting factories
 ##################################
 
-foreach (example trace-categories trace-host-user-variables trace-link-user-variables trace-platform)
+foreach (example trace-categories trace-platform
+                 trace-host-user-variables trace-link-user-variables trace-route-user-variables)
   add_executable       (s4u-${example} EXCLUDE_FROM_ALL ${example}/s4u-${example}.cpp)
   target_link_libraries(s4u-${example} simgrid)
   set_target_properties(s4u-${example} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example})
diff --git a/examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.cpp b/examples/s4u/trace-route-user-variables/s4u-trace-route-user-variables.cpp
new file mode 100644 (file)
index 0000000..06f38ed
--- /dev/null
@@ -0,0 +1,68 @@
+/* Copyright (c) 2010-2020. 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. */
+
+/* This source code simply loads the platform. This is only useful to play
+ * with the tracing module. See the tesh file to see how to generate the
+ * traces.
+ */
+
+#include "simgrid/instr.h"
+#include "simgrid/s4u.hpp"
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
+
+static void trace_fun()
+{
+  // Set initial values for the link user variables
+  // This example uses source and destination where source and destination are the name of hosts in the platform file.
+  // The functions will set/change the value of the variable for all links in the route between source and destination.
+
+  // Set the Link_Capacity variable
+  TRACE_link_srcdst_variable_set("Tremblay", "Bourassa", "Link_Capacity", 12.34);
+  TRACE_link_srcdst_variable_set("Fafard", "Ginette", "Link_Capacity", 56.78);
+
+  // Set the Link_Utilization variable
+  TRACE_link_srcdst_variable_set("Tremblay", "Bourassa", "Link_Utilization", 1.2);
+  TRACE_link_srcdst_variable_set("Fafard", "Ginette", "Link_Utilization", 3.4);
+
+  // run the simulation, update my variables accordingly
+  for (int i = 0; i < 10; i++) {
+    simgrid::s4u::this_actor::execute(1e6);
+
+    // Add to link user variables
+    TRACE_link_srcdst_variable_add("Tremblay", "Bourassa", "Link_Utilization", 5.6);
+    TRACE_link_srcdst_variable_add("Fafard", "Ginette", "Link_Utilization", 7.8);
+  }
+
+  for (int i = 0; i < 10; i++) {
+    simgrid::s4u::this_actor::execute(1e6);
+
+    // Subtract from link user variables
+    TRACE_link_srcdst_variable_sub("Tremblay", "Bourassa", "Link_Utilization", 3.4);
+    TRACE_link_srcdst_variable_sub("Fafard", "Ginette", "Link_Utilization", 5.6);
+  }
+}
+
+int main(int argc, char* argv[])
+{
+  simgrid::s4u::Engine e(&argc, argv);
+  xbt_assert(argc > 1, "Usage: %s platform_file\n \tExample: %s small_platform.xml\n", argv[0], argv[0]);
+
+  e.load_platform(argv[1]);
+
+  // declaring link user variables (one without, another with an RGB color)
+  TRACE_link_variable_declare("Link_Capacity");
+  TRACE_link_variable_declare_with_color("Link_Utilization", "0.9 0.1 0.1");
+
+  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), trace_fun);
+  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Tremblay"), trace_fun);
+  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Jupiter"), trace_fun);
+  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Fafard"), trace_fun);
+  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Ginette"), trace_fun);
+  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Bourassa"), trace_fun);
+
+  e.run();
+  return 0;
+}
@@ -1,7 +1,7 @@
 #!/usr/bin/env tesh
 
 p Trace user variables associated to links of the platform file
-$ ${bindir:=.}/trace-route-user-variables --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml
+$ ${bindir:=.}/s4u-trace-route-user-variables --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'