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 12:48:23 +0000 (13:48 +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-host-user-variables/trace-host-user-variables.c [deleted file]
examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.tesh [deleted file]
examples/s4u/CMakeLists.txt
examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.cpp [new file with mode: 0644]
examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.tesh [new file with mode: 0644]

index a8a9ba5..37a2708 100644 (file)
@@ -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-host-user-variables/trace-host-user-variables
 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
@@ -241,6 +240,7 @@ examples/s4u/synchro-condition-variable/s4u-synchro-condition-variable
 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-platform/s4u-trace-platform
 examples/deprecated/simdag/dag-dotload/sd_dag-dotload
 examples/deprecated/simdag/daxload/sd_daxload
index 986a8b5..1ddf1d3 100644 (file)
@@ -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-host-user-variables/trace-host-user-variables.c
-include examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.tesh
 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
@@ -519,6 +517,8 @@ include examples/s4u/synchro-semaphore/s4u-synchro-semaphore.cpp
 include examples/s4u/synchro-semaphore/s4u-synchro-semaphore.tesh
 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-platform/s4u-trace-platform.cpp
 include examples/s4u/trace-platform/s4u-trace-platform.tesh
 include examples/smpi/NAS/DGraph.c
index d58c3b8..bbd7af3 100644 (file)
@@ -1,5 +1,5 @@
 foreach(x trace-route-user-variables trace-link-user-variables
-        trace-masterworker trace-process-migration trace-host-user-variables)
+        trace-masterworker trace-process-migration)
   if(enable_msg)
     add_executable       (${x}  EXCLUDE_FROM_ALL ${x}/${x}.c)
     target_link_libraries(${x}  simgrid)
@@ -16,7 +16,7 @@ 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 trace-host-user-variables)
+             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-host-user-variables/trace-host-user-variables.c b/examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.c
deleted file mode 100644 (file)
index 4ec6361..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/* 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. */
-
-#include <stdio.h>
-#include "simgrid/msg.h"
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
-
-static int trace_fun(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
-{
-  const char *hostname = MSG_host_get_name(MSG_host_self());
-
-  //the hostname has an empty HDD with a capacity of 100000 (bytes)
-  TRACE_host_variable_set(hostname, "HDD_capacity", 100000);
-  TRACE_host_variable_set(hostname, "HDD_utilization", 0);
-
-  for (int i = 0; i < 10; i++) {
-    //create and execute a task just to make the simulated time advance
-    msg_task_t task = MSG_task_create("task", 10000, 0, NULL);
-    MSG_task_execute (task);
-    MSG_task_destroy (task);
-
-    //ADD: after the execution of this task, the HDD utilization increases by 100 (bytes)
-    TRACE_host_variable_add(hostname, "HDD_utilization", 100);
-  }
-
-  for (int i = 0; i < 10; i++) {
-    //create and execute a task just to make the simulated time advance
-    msg_task_t task = MSG_task_create("task", 10000, 0, NULL);
-    MSG_task_execute (task);
-    MSG_task_destroy (task);
-
-    //SUB: after the execution of this task, the HDD utilization decreases by 100 (bytes)
-    TRACE_host_variable_sub(hostname, "HDD_utilization", 100);
-  }
-  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 user variables
-  TRACE_host_variable_declare("HDD_capacity");
-  TRACE_host_variable_declare("HDD_utilization");
-
-  MSG_process_create("master", trace_fun, NULL, MSG_host_by_name("Tremblay"));
-
-  MSG_main();
-
-  //get user declared variables
-  unsigned int cursor;
-  char *variable;
-  xbt_dynar_t host_variables = TRACE_get_host_variables ();
-  if (host_variables){
-    XBT_INFO ("Declared host variables:");
-    xbt_dynar_foreach (host_variables, cursor, variable){
-      XBT_INFO ("%s", variable);
-    }
-    xbt_dynar_free (&host_variables);
-  }
-  xbt_dynar_t link_variables = TRACE_get_link_variables ();
-  if (link_variables){
-    XBT_INFO ("Declared link variables:");
-    xbt_dynar_foreach (link_variables, cursor, variable){
-      XBT_INFO ("%s", variable);
-    }
-    xbt_dynar_free (&link_variables);
-  }
-  return 0;
-}
diff --git a/examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.tesh b/examples/deprecated/msg/trace-host-user-variables/trace-host-user-variables.tesh
deleted file mode 100644 (file)
index c2015bc..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env tesh
-
-p Tracing user variables for hosts
-$ ${bindir:=.}/trace-host-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'
-> [0.002039] [msg_test/INFO] Declared host variables:
-> [0.002039] [msg_test/INFO] HDD_capacity
-> [0.002039] [msg_test/INFO] HDD_utilization
-> [0.002039] [msg_test/INFO] Declared link variables:
-
-$ rm -f simgrid.trace
-
-p Not tracing user variables
-$ ${bindir:=.}/trace-host-user-variables ${platfdir}/small_platform.xml
index c616c7c..fa5c4c8 100644 (file)
@@ -186,7 +186,7 @@ endif()
 # Examples not accepting factories
 ##################################
 
-foreach (example trace-categories trace-platform)
+foreach (example trace-categories trace-host-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-host-user-variables/s4u-trace-host-user-variables.cpp b/examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.cpp
new file mode 100644 (file)
index 0000000..8d64839
--- /dev/null
@@ -0,0 +1,77 @@
+/* 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()
+{
+  const char* hostname = simgrid::s4u::this_actor::get_host()->get_cname();
+
+  // the hostname has an empty HDD with a capacity of 100000 (bytes)
+  TRACE_host_variable_set(hostname, "HDD_capacity", 100000);
+  TRACE_host_variable_set(hostname, "HDD_utilization", 0);
+
+  for (int i = 0; i < 10; i++) {
+    // create and execute a task just to make the simulated time advance
+    simgrid::s4u::this_actor::execute(1e4);
+
+    // ADD: after the execution of this task, the HDD utilization increases by 100 (bytes)
+    TRACE_host_variable_add(hostname, "HDD_utilization", 100);
+  }
+
+  for (int i = 0; i < 10; i++) {
+    // create and execute a task just to make the simulated time advance
+    simgrid::s4u::this_actor::execute(1e4);
+
+    // SUB: after the execution of this task, the HDD utilization decreases by 100 (bytes)
+    TRACE_host_variable_sub(hostname, "HDD_utilization", 100);
+  }
+}
+
+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 user variables
+  TRACE_host_variable_declare("HDD_capacity");
+  TRACE_host_variable_declare("HDD_utilization");
+
+  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), trace_fun);
+
+  e.run();
+
+  // get user declared variables
+  unsigned int cursor;
+  char* variable;
+  xbt_dynar_t host_variables = TRACE_get_host_variables();
+  if (host_variables) {
+    XBT_INFO("Declared host variables:");
+    xbt_dynar_foreach (host_variables, cursor, variable) {
+      XBT_INFO("%s", variable);
+    }
+    xbt_dynar_free(&host_variables);
+  }
+  xbt_dynar_t link_variables = TRACE_get_link_variables();
+  if (link_variables) {
+    XBT_INFO("Declared link variables:");
+    xbt_dynar_foreach (link_variables, cursor, variable) {
+      XBT_INFO("%s", variable);
+    }
+    xbt_dynar_free(&link_variables);
+  }
+
+  return 0;
+}
diff --git a/examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.tesh b/examples/s4u/trace-host-user-variables/s4u-trace-host-user-variables.tesh
new file mode 100644 (file)
index 0000000..4e141de
--- /dev/null
@@ -0,0 +1,15 @@
+#!/usr/bin/env tesh
+
+p Tracing user variables for hosts
+$ ${bindir:=.}/s4u-trace-host-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'
+> [0.002039] [s4u_test/INFO] Declared host variables:
+> [0.002039] [s4u_test/INFO] HDD_capacity
+> [0.002039] [s4u_test/INFO] HDD_utilization
+> [0.002039] [s4u_test/INFO] Declared link variables:
+
+$ rm -f simgrid.trace
+
+p Not tracing user variables
+$ ${bindir:=.}/s4u-trace-host-user-variables ${platfdir}/small_platform.xml