forgot to commit that ...

diff --git a/.gitignore b/.gitignore
index 8e00bc0..32bf829 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -180,16 +180,14 @@ examples/msg/set-maestro/set-maestro
 examples/msg/simulation.trace
 examples/msg/start_kill_time/start_kill_time
 examples/msg/process-suspend/process-suspend
 examples/msg/simulation.trace
 examples/msg/start_kill_time/start_kill_time
 examples/msg/process-suspend/process-suspend

-examples/msg/tasks.trace

 examples/msg/token_ring/token_ring
 examples/msg/trace/test_trace_integration
 examples/msg/trace-categories/trace-categories
 examples/msg/token_ring/token_ring
 examples/msg/trace/test_trace_integration
 examples/msg/trace-categories/trace-categories

-examples/msg/tracing/link_srcdst_user_variables
-examples/msg/tracing/link_user_variables
-examples/msg/tracing/ms
-examples/msg/tracing/procmig
+examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables
+examples/msg/trace-link-user-variables/trace-link-user-variables
+examples/msg/trace-masterslave/trace-masterslave
+examples/msg/trace-process-migration/trace-process-migration

 examples/msg/trace-simple/trace-simple
 examples/msg/trace-simple/trace-simple

-examples/msg/tracing/tasks

 examples/msg/trace-platform/trace-platform
 examples/msg/trace-user-variables/trace-user-variables
 examples/s4u/basic/s4u_basic
 examples/msg/trace-platform/trace-platform
 examples/msg/trace-user-variables/trace-user-variables
 examples/s4u/basic/s4u_basic

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index af0f6a2..001f995 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -1,8 +1,8 @@
-foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht-chord dht-pastry 
-          exception energy-consumption energy-onoff energy-pstate energy-ptask energy-vm failures io-file io-file-unlink
-          io-remote io-storage pmm priority process-kill process-migration process-suspend properties sendrecv
-          set-maestro start_kill_time synchro token_ring trace-categories trace-link-srcdst-user-variables 
-          trace-link-user-variables trace-platform trace-process-migration trace-simple trace-user-variables)
+foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht-chord dht-pastry exception 
+          energy-consumption energy-onoff energy-pstate energy-ptask energy-vm failures io-file io-file-unlink io-remote
+          io-storage pmm priority process-kill process-migration process-suspend properties sendrecv set-maestro
+          start_kill_time synchro token_ring trace-categories trace-link-srcdst-user-variables trace-link-user-variables
+          trace-masterslave trace-platform trace-process-migration trace-simple trace-user-variables)

   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})


@@ -65,7 +65,7 @@ foreach (example consumption onoff pstate vm)
   ADD_TESH_FACTORIES(msg-energy-${example} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-${example}/energy-${example}.tesh)
 endforeach()
 
   ADD_TESH_FACTORIES(msg-energy-${example} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-${example}/energy-${example}.tesh)
 endforeach()
 

-foreach (x categories link-srcdst-user-variables link-user-variables platform process-migration simple user-variables)
+foreach (x categories link-srcdst-user-variables link-user-variables masterslave platform process-migration simple user-variables)

   ADD_TESH(msg-trace-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/trace-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/trace-${x} trace-${x}.tesh)
 endforeach()
 
   ADD_TESH(msg-trace-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/trace-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/trace-${x} trace-${x}.tesh)
 endforeach()
 

diff --git a/examples/msg/trace-masterslave/trace-masterslave.c b/examples/msg/trace-masterslave/trace-masterslave.c
index eb9deaf..1b8e266 100644 (file)
--- a/examples/msg/trace-masterslave/trace-masterslave.c
+++ b/examples/msg/trace-masterslave/trace-masterslave.c
@@ -82,10 +82,8 @@ static int slave(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);

-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    exit(1);
-  }
+  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]);
 
 
   MSG_create_environment(argv[1]);
 

diff --git a/examples/msg/trace-masterslave/trace-masterslave.tesh b/examples/msg/trace-masterslave/trace-masterslave.tesh
index d99e42d..e166581 100644 (file)
--- a/examples/msg/trace-masterslave/trace-masterslave.tesh
+++ b/examples/msg/trace-masterslave/trace-masterslave.tesh
@@ -1,14 +1,14 @@
 #! ./tesh
 
 p Tracing master/slave application
 #! ./tesh
 
 p Tracing master/slave application

-$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:tracing/ms.cat.plist --cfg=viva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/tracing/deployment.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterslave.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:trace-masterslave.cat.plist --cfg=viva/uncategorized:trace-masterslave.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/deployment_masterslave_mailbox.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'

-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/ms.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterslave.trace'

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'

-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'tracing/ms.cat.plist'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/ms.uncat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterslave.cat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterslave.uncat.plist'

 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request
 > [4.214821] [msg_test/INFO] finalize
 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request
 > [4.214821] [msg_test/INFO] finalize


@@ -18,13 +18,13 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:yes --cfg=tracing/
 > [4.214821] [msg_test/INFO] msmark
 
 p Tracing master/slave application with xml config
 > [4.214821] [msg_test/INFO] msmark
 
 p Tracing master/slave application with xml config

-$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT ${srcdir:=.}/../platforms/config_tracing.xml ${srcdir:=.}/tracing/deployment.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT ${srcdir:=.}/config_tracing.xml ${srcdir:=.}/../msg/masterslave/deployment_masterslave_mailbox.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'

-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'tracing/ms.cat.plist'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/ms.trace'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/ms.uncat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterslave.cat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterslave.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterslave.uncat.plist'

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request


@@ -35,18 +35,18 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT ${srcdir:=.}/../platforms/config
 > [4.214821] [msg_test/INFO] msmark
 
 p Not tracing master/slave application
 > [4.214821] [msg_test/INFO] msmark
 
 p Not tracing master/slave application

-$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/tracing/deployment.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/deployment_masterslave_mailbox.xml

 
 p Testing tracing by process
 
 p Testing tracing by process

-$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:tracing/ms.cat.plist --cfg=viva/uncategorized:tracing/ms.uncat.plist ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/tracing/deployment.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-masterslave$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterslave.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:trace-masterslave.cat.plist --cfg=viva/uncategorized:trace-masterslave.uncat.plist ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/deployment_masterslave_mailbox.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'yes'

-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/ms.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace-masterslave.trace'

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'

-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'tracing/ms.cat.plist'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/ms.uncat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'trace-masterslave.cat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'trace-masterslave.uncat.plist'

 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request
 > [4.214821] [msg_test/INFO] finalize
 > [4.214821] [msg_test/INFO] Declared tracing categories:
 > [4.214821] [msg_test/INFO] request
 > [4.214821] [msg_test/INFO] finalize


@@ -55,7 +55,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:yes --cfg=tracing/
 > [4.214821] [msg_test/INFO] Declared marks:
 > [4.214821] [msg_test/INFO] msmark
 
 > [4.214821] [msg_test/INFO] Declared marks:
 > [4.214821] [msg_test/INFO] msmark
 

-$ $SG_TEST_EXENV cat tracing/ms.uncat.plist
+$ $SG_TEST_EXENV cat trace-masterslave.uncat.plist

 >   node = ("HOST","LINK");
 >   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
 > 
 >   node = ("HOST","LINK");
 >   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
 > 


@@ -70,7 +70,7 @@ $ $SG_TEST_EXENV cat tracing/ms.uncat.plist
 >     values = ("bandwidth_used");
 >   };
 
 >     values = ("bandwidth_used");
 >   };
 

-$ $SG_TEST_EXENV cat tracing/ms.cat.plist
+$ $SG_TEST_EXENV cat trace-masterslave.cat.plist

 >   node = ("HOST","LINK");
 >   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
 > 
 >   node = ("HOST","LINK");
 >   edge = ("0-LINK13-LINK13","0-LINK13-HOST1","0-HOST1-LINK13");
 > 


@@ -85,4 +85,4 @@ $ $SG_TEST_EXENV cat tracing/ms.cat.plist
 >     values = ("bcompute","breport","bfinalize","brequest");
 >   };
 
 >     values = ("bcompute","breport","bfinalize","brequest");
 >   };
 

-$ rm -rf tracing/ms.trace tracing/ms.cat.plist tracing/ms.uncat.plist
+$ rm -rf trace-masterslave.trace trace-masterslave.cat.plist trace-masterslave.uncat.plist

diff --git a/examples/platforms/config_tracing.xml b/examples/platforms/config_tracing.xml
index 360bc57..9b32ad8 100644 (file)
--- a/examples/platforms/config_tracing.xml
+++ b/examples/platforms/config_tracing.xml
@@ -5,9 +5,9 @@
     <prop id="tracing/uncategorized" value="yes"/>
     <prop id="tracing/buffer" value="yes"/>
     <prop id="tracing" value="yes"/>
     <prop id="tracing/uncategorized" value="yes"/>
     <prop id="tracing/buffer" value="yes"/>
     <prop id="tracing" value="yes"/>

-    <prop id="viva/categorized" value="tracing/ms.cat.plist"/>
-    <prop id="tracing/filename" value="tracing/ms.trace"/>
-    <prop id="viva/uncategorized" value="tracing/ms.uncat.plist"/>
+    <prop id="viva/categorized" value="trace-masterslave.cat.plist"/>
+    <prop id="tracing/filename" value="trace-masterslave.trace"/>
+    <prop id="viva/uncategorized" value="trace-masterslave.uncat.plist"/>

     <prop id="tracing/categorized" value="yes"/>
   </config>
 
     <prop id="tracing/categorized" value="yes"/>
   </config>
 

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 1aeef25..92d03a7 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -950,7 +950,6 @@ set(CMAKEFILES_TXT
     examples/msg/dht-kademlia/CMakeLists.txt
     examples/msg/masterslave/CMakeLists.txt
     examples/msg/mc/CMakeLists.txt
     examples/msg/dht-kademlia/CMakeLists.txt
     examples/msg/masterslave/CMakeLists.txt
     examples/msg/mc/CMakeLists.txt

-    examples/msg/tracing/CMakeLists.txt

   examples/s4u/CMakeLists.txt
   examples/simdag/CMakeLists.txt
   examples/smpi/CMakeLists.txt
   examples/s4u/CMakeLists.txt
   examples/simdag/CMakeLists.txt
   examples/smpi/CMakeLists.txt