Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[trace] add new example to show how to use link user variables
authorschnorr <Lucas.Schnorr@imag.fr>
Wed, 21 Mar 2012 10:30:37 +0000 (11:30 +0100)
committerschnorr <Lucas.Schnorr@imag.fr>
Wed, 21 Mar 2012 11:46:04 +0000 (12:46 +0100)
buildtools/Cmake/AddTests.cmake
examples/msg/tracing/CMakeLists.txt
examples/msg/tracing/link_user_variables.c [new file with mode: 0644]
examples/msg/tracing/link_user_variables.tesh [new file with mode: 0644]

index be596bc..c2a33ee 100644 (file)
@@ -392,6 +392,7 @@ IF(HAVE_TRACING)
   ADD_TEST(tracing-ms                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh)
   ADD_TEST(tracing-trace_platform                              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/trace_platform.tesh)
   ADD_TEST(tracing-user_variables                              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/user_variables.tesh)
   ADD_TEST(tracing-ms                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh)
   ADD_TEST(tracing-trace_platform                              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/trace_platform.tesh)
   ADD_TEST(tracing-user_variables                              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/user_variables.tesh)
+  ADD_TEST(tracing-link_user_variables                                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/link_user_variables.tesh)
   ADD_TEST(tracing-categories          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh)
   ADD_TEST(tracing-process-migration ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh)
   ADD_TEST(graphicator ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd ${CMAKE_HOME_DIRECTORY}/tools/graphicator graphicator.tesh)
   ADD_TEST(tracing-categories          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh)
   ADD_TEST(tracing-process-migration ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh)
   ADD_TEST(graphicator ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd ${CMAKE_HOME_DIRECTORY}/tools/graphicator graphicator.tesh)
index 55167d1..c42175b 100644 (file)
@@ -9,6 +9,7 @@ add_executable(procmig    ${CMAKE_CURRENT_SOURCE_DIR}/procmig.c)
 add_executable(simple     ${CMAKE_CURRENT_SOURCE_DIR}/simple.c)
 add_executable(trace_platform     ${CMAKE_CURRENT_SOURCE_DIR}/trace_platform.c)
 add_executable(user_variables     ${CMAKE_CURRENT_SOURCE_DIR}/user_variables.c)
 add_executable(simple     ${CMAKE_CURRENT_SOURCE_DIR}/simple.c)
 add_executable(trace_platform     ${CMAKE_CURRENT_SOURCE_DIR}/trace_platform.c)
 add_executable(user_variables     ${CMAKE_CURRENT_SOURCE_DIR}/user_variables.c)
+add_executable(link_user_variables     ${CMAKE_CURRENT_SOURCE_DIR}/link_user_variables.c)
 
 ### Add definitions for compile
 target_link_libraries(ms simgrid m )
 
 ### Add definitions for compile
 target_link_libraries(ms simgrid m )
@@ -17,6 +18,7 @@ target_link_libraries(procmig simgrid m )
 target_link_libraries(simple simgrid m )
 target_link_libraries(trace_platform simgrid m )
 target_link_libraries(user_variables simgrid m )
 target_link_libraries(simple simgrid m )
 target_link_libraries(trace_platform simgrid m )
 target_link_libraries(user_variables simgrid m )
+target_link_libraries(link_user_variables simgrid m )
 
 ## Clean generated files
 get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
 
 ## Clean generated files
 get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
diff --git a/examples/msg/tracing/link_user_variables.c b/examples/msg/tracing/link_user_variables.c
new file mode 100644 (file)
index 0000000..9f7a5cf
--- /dev/null
@@ -0,0 +1,80 @@
+/* Copyright (c) 2012. 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 <msg/msg.h>
+
+int master(int argc, char *argv[]);
+
+//dump function to create and execute a task
+static void create_and_execute_task (void)
+{
+  m_task_t task = MSG_task_create("task", 1000000, 0, NULL);
+  MSG_task_execute (task);
+  MSG_task_destroy (task);
+}
+
+int master(int argc, char *argv[])
+{
+  int i;
+
+  //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 (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 (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;
+}
+
+/** Main function */
+int main(int argc, char *argv[])
+{
+  MSG_global_init(&argc, argv);
+  if (argc < 3) {
+    printf("Usage: %s platform_file deployment_file\n", argv[0]);
+    exit(1);
+  }
+
+  char *platform_file = argv[1];
+  char *deployment_file = argv[2];
+  MSG_create_environment(platform_file);
+
+  //declaring link user variables (one without, another with a RGB color)
+  TRACE_link_variable_declare("Link_Capacity");
+  TRACE_link_variable_declare_with_color ("Link_Utilization", "0.9 0.1 0.1");
+
+  //register "master" and "slave" functions and launch deployment
+  MSG_function_register("master", master);
+  MSG_function_register("slave", master);
+  MSG_launch_application(deployment_file);
+
+  MSG_main();
+  MSG_clean();
+  return 0;
+}
diff --git a/examples/msg/tracing/link_user_variables.tesh b/examples/msg/tracing/link_user_variables.tesh
new file mode 100644 (file)
index 0000000..9e5b700
--- /dev/null
@@ -0,0 +1,6 @@
+#! ./tesh
+
+p Tracing master/slave application
+$ $SG_TEST_EXENV ${bindir:=.}/tracing/link_user_variables$EXEEXT --cfg=tracing:1 --cfg=tracing/platform:1 ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1'