From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 7 Dec 2020 14:02:15 +0000 (+0100)
Subject: Convert deprecated/msg/trace-link-user-variables to s4u/trace-link-user-variables.
X-Git-Tag: v3.26~41
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b03d1c51fa1a01cce71f7feaf7062b834c1f16a5

Convert deprecated/msg/trace-link-user-variables to s4u/trace-link-user-variables.
---

diff --git a/.gitignore b/.gitignore
index 37a2708425..c4985d0b62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,7 +166,6 @@ examples/deprecated/msg/mc/bugged3
 examples/deprecated/msg/mc/centralized_mutex
 examples/deprecated/msg/mc/electric_fence
 examples/deprecated/msg/synchro-semaphore/synchro-semaphore
-examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables
 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
@@ -241,6 +240,7 @@ examples/s4u/synchro-mutex/s4u-synchro-mutex
 examples/s4u/synchro-semaphore/s4u-synchro-semaphore
 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/deprecated/simdag/dag-dotload/sd_dag-dotload
 examples/deprecated/simdag/daxload/sd_daxload
diff --git a/MANIFEST.in b/MANIFEST.in
index 1ddf1d39bc..e9a57eaad0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -262,8 +262,6 @@ include examples/deprecated/msg/mc/centralized_mutex.tesh
 include examples/deprecated/msg/mc/deploy_bugged2_liveness.xml
 include examples/deprecated/msg/mc/deploy_centralized_mutex.xml
 include examples/deprecated/msg/mc/promela_bugged2_liveness
-include examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.c
-include examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.tesh
 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
@@ -519,6 +517,8 @@ include examples/s4u/trace-categories/s4u-trace-categories.cpp
 include examples/s4u/trace-categories/s4u-trace-categories.tesh
 include examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.cpp
 include examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.tesh
+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/smpi/NAS/DGraph.c
diff --git a/examples/deprecated/msg/CMakeLists.txt b/examples/deprecated/msg/CMakeLists.txt
index bbd7af3e3a..0cdbde4230 100644
--- a/examples/deprecated/msg/CMakeLists.txt
+++ b/examples/deprecated/msg/CMakeLists.txt
@@ -1,5 +1,4 @@
-foreach(x trace-route-user-variables trace-link-user-variables
-        trace-masterworker trace-process-migration)
+foreach(x trace-route-user-variables trace-masterworker trace-process-migration)
   if(enable_msg)
     add_executable       (${x}  EXCLUDE_FROM_ALL ${x}/${x}.c)
     target_link_libraries(${x}  simgrid)
@@ -15,8 +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-link-user-variables trace-masterworker
-             trace-process-migration)
+  foreach (x trace-route-user-variables 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-link-user-variables/trace-link-user-variables.c b/examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.c
deleted file mode 100644
index 2fab32ac53..0000000000
--- a/examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.c
+++ /dev/null
@@ -1,68 +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 only shows for links identified by "6" and "3" in the
-  //platform file
-
-  //Set the Link_Capacity variable
-  TRACE_link_variable_set("6", "Link_Capacity", 12.34);
-  TRACE_link_variable_set("3", "Link_Capacity", 56.78);
-
-  //Set the Link_Utilization variable
-  TRACE_link_variable_set("3", "Link_Utilization", 1.2);
-  TRACE_link_variable_set("6", "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_variable_add ("3", "Link_Utilization", 5.6);
-    TRACE_link_variable_add ("6", "Link_Utilization", 7.8);
-  }
-
-  for (int i = 0; i < 10; i++) {
-    create_and_execute_task ();
-
-    //Subtract from link user variables
-    TRACE_link_variable_sub ("3", "Link_Utilization", 3.4);
-    TRACE_link_variable_sub ("6", "Link_Utilization", 5.6);
-  }
-
-  return 0;
-}
-
-int main(int argc, char *argv[])
-{
-  MSG_init(&argc, argv);
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-             "\tExample: %s msg_platform.xml msg_deployment.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");
-
-  //register functions and launch deployment
-  MSG_function_register("master", trace_fun);
-  MSG_function_register("worker", trace_fun);
-  MSG_launch_application(argv[2]);
-
-  MSG_main();
-  return 0;
-}
diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index fa5c4c8e40..1415914791 100644
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -186,7 +186,7 @@ endif()
 # Examples not accepting factories
 ##################################
 
-foreach (example trace-categories trace-host-user-variables trace-platform)
+foreach (example trace-categories trace-host-user-variables trace-link-user-variables trace-platform)
   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-link-user-variables/s4u-trace-link-user-variables.cpp b/examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.cpp
new file mode 100644
index 0000000000..2735055b23
--- /dev/null
+++ b/examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.cpp
@@ -0,0 +1,65 @@
+/* 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"
+
+static void trace_fun()
+{
+  // set initial values for the link user variables this example only shows for links identified by "6" and "3" in the
+  // platform file
+
+  // Set the Link_Capacity variable
+  TRACE_link_variable_set("6", "Link_Capacity", 12.34);
+  TRACE_link_variable_set("3", "Link_Capacity", 56.78);
+
+  // Set the Link_Utilization variable
+  TRACE_link_variable_set("3", "Link_Utilization", 1.2);
+  TRACE_link_variable_set("6", "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_variable_add("3", "Link_Utilization", 5.6);
+    TRACE_link_variable_add("6", "Link_Utilization", 7.8);
+  }
+
+  for (int i = 0; i < 10; i++) {
+    simgrid::s4u::this_actor::execute(1e6);
+
+    // Subtract from link user variables
+    TRACE_link_variable_sub("3", "Link_Utilization", 3.4);
+    TRACE_link_variable_sub("6", "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;
+}
diff --git a/examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.tesh b/examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.tesh
similarity index 98%
rename from examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.tesh
rename to examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.tesh
index e1df638c98..fb51815d75 100644
--- a/examples/deprecated/msg/trace-link-user-variables/trace-link-user-variables.tesh
+++ b/examples/s4u/trace-link-user-variables/s4u-trace-link-user-variables.tesh
@@ -1,7 +1,7 @@
 #!/usr/bin/env tesh
 
 p Trace user variables associated to links of the platform file
-$ ${bindir:=.}/trace-link-user-variables --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml ${srcdir:=.}/../../../c/app-masterworker/app-masterworker_d.xml
+$ ${bindir:=.}/s4u-trace-link-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'