Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
start to split msg/tracing
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Fri, 25 Mar 2016 12:47:09 +0000 (13:47 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Fri, 25 Mar 2016 12:47:09 +0000 (13:47 +0100)
.gitignore
examples/msg/CMakeLists.txt
examples/msg/trace-categories/trace-categories.c [moved from examples/msg/tracing/categories.c with 100% similarity]
examples/msg/trace-categories/trace-categories.tesh [moved from examples/msg/tracing/categories.tesh with 62% similarity]
examples/msg/trace-platform/trace-platform.c [moved from examples/msg/tracing/trace_platform.c with 100% similarity]
examples/msg/trace-platform/trace-platform.tesh [moved from examples/msg/tracing/trace_platform.tesh with 99% similarity]
examples/msg/trace-simple/trace-simple.c [moved from examples/msg/tracing/simple.c with 100% similarity]
examples/msg/trace-simple/trace-simple.tesh [new file with mode: 0644]
examples/msg/tracing/CMakeLists.txt

index b0af184..1ac9db6 100644 (file)
@@ -184,19 +184,15 @@ examples/msg/process-suspend/process-suspend
 examples/msg/tasks.trace
 examples/msg/token_ring/token_ring
 examples/msg/trace/test_trace_integration
-examples/msg/tracing/categories
+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/tracing/simple
+examples/msg/trace-simple/trace-simple
 examples/msg/tracing/tasks
-examples/msg/tracing/trace_platform
+examples/msg/trace-platform/trace-platform
 examples/msg/tracing/user_variables
-examples/msg/tracing/volume
-examples/msg/volume.trace
-examples/msg/z_gtnets.trace
-examples/msg/zmsg_test.trace
 examples/s4u/basic/s4u_basic
 examples/s4u/io/s4u_io
 examples/simdag/dax/sd_dax
index d37f6f1..e2cfd02 100644 (file)
@@ -1,7 +1,7 @@
 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)
+          set-maestro start_kill_time synchro token_ring trace-categories trace-platform trace-simple)
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -50,6 +50,10 @@ 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()
 
+foreach (x categories platform simple)
+  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_FACTORIES(msg-dht-chord-crosstraffic          "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-parallel              "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord.tesh)
@@ -58,7 +62,7 @@ ADD_TESH_FACTORIES(msg-energy-consumption-ptask        "thread;ucontext;raw;boos
 ADD_TESH_FACTORIES(msg-energy-ptask                    "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-ptask/energy-ptask.tesh)
 ADD_TESH_FACTORIES(msg-set-maestro                     "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/set-maestro/set-maestro.tesh)
 
-ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
+ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
 
 # These one are not usable:
 # ADD_TESH_FACTORIES(msg-exception "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/exception/exception.tesh)
similarity index 62%
rename from examples/msg/tracing/categories.tesh
rename to examples/msg/trace-categories/trace-categories.tesh
index 5ca8fe1..3168b2a 100644 (file)
@@ -2,16 +2,16 @@
 
 p Tracing multiple categories master/slave application
 
-$ $SG_TEST_EXENV ${bindir:=.}/tracing/categories$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:tracing/categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:tracing/categories.cat.plist --cfg=viva/uncategorized:tracing/categories.uncat.plist ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/tracing/deployment.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-categories$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=viva/categorized:categories.cat.plist --cfg=viva/uncategorized:categories.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/filename' to 'tracing/categories.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'categories.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 'viva/categorized' to 'tracing/categories.cat.plist'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'tracing/categories.uncat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/categorized' to 'categories.cat.plist'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'categories.uncat.plist'
 
-$ $SG_TEST_EXENV cat tracing/categories.cat.plist
+$ $SG_TEST_EXENV cat categories.cat.plist
 >   node = ("HOST","LINK");
 >   edge = ("0-LINK4-LINK4","0-HOST1-LINK4","0-LINK4-HOST1");
 >
@@ -26,7 +26,7 @@ $ $SG_TEST_EXENV cat tracing/categories.cat.plist
 >     values = ("bdata","bcompute","bfinalize","brequest");
 >   };
 
-$ $SG_TEST_EXENV cat tracing/categories.uncat.plist
+$ $SG_TEST_EXENV cat categories.uncat.plist
 >   node = ("HOST","LINK");
 >   edge = ("0-LINK4-LINK4","0-HOST1-LINK4","0-LINK4-HOST1");
 >
@@ -41,4 +41,4 @@ $ $SG_TEST_EXENV cat tracing/categories.uncat.plist
 >     values = ("bandwidth_used");
 >   };
 
-$ rm -rf tracing/categories.trace tracing/categories.cat.plist tracing/categories.uncat.plist
+$ rm -rf categories.trace categories.cat.plist categories.uncat.plist
similarity index 99%
rename from examples/msg/tracing/trace_platform.tesh
rename to examples/msg/trace-platform/trace-platform.tesh
index 6b0bb20..ee478a0 100644 (file)
@@ -1,12 +1,12 @@
 #! ./tesh
 
-p Tracing master/slave application
-$ $SG_TEST_EXENV ${bindir:=.}/tracing/trace_platform$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:tracing/trace_platform.trace --cfg=tracing/categorized:yes ${srcdir:=.}/../platforms/small_platform.xml
+p Tracing platform only
+$ $SG_TEST_EXENV ${bindir:=.}/trace-platform$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:trace_platform.trace --cfg=tracing/categorized:yes ${srcdir:=.}/small_platform.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/trace_platform.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace_platform.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 
-$ tail -n +3 tracing/trace_platform.trace
+$ tail -n +3 trace_platform.trace
 > %EventDef PajeDefineContainerType 0
 > %       Alias string
 > %       Type string
@@ -217,14 +217,14 @@ $ tail -n +3 tracing/trace_platform.trace
 > 7 0 1 2
 > 7 0 1 4
 
-$ rm -rf tracing/trace_platform.trace
+$ rm -trace_platform.trace
 
-$ $SG_TEST_EXENV ${bindir:=.}/tracing/trace_platform$EXEEXT --cfg=tracing:yes  --cfg=tracing/filename:tracing/trace_platform.trace --cfg=tracing/categorized:yes ${srcdir:=.}/../platforms/g5k.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-platform$EXEEXT --cfg=tracing:yes  --cfg=tracing/filename:trace_platform.trace --cfg=tracing/categorized:yes ${srcdir:=.}/g5k.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/trace_platform.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace_platform.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 
-$ tail -n +3 tracing/trace_platform.trace
+$ tail -n +3 trace_platform.trace
 > %EventDef PajeDefineContainerType 0
 > %       Alias string
 > %       Type string
@@ -30404,4 +30404,4 @@ $ tail -n +3 tracing/trace_platform.trace
 > 7 0 6 4094
 > 7 0 1 3921
 
-$ rm -rf tracing/trace_platform.trace
+$ rm -trace_platform.trace
diff --git a/examples/msg/trace-simple/trace-simple.tesh b/examples/msg/trace-simple/trace-simple.tesh
new file mode 100644 (file)
index 0000000..68c338d
--- /dev/null
@@ -0,0 +1,232 @@
+#! ./tesh
+
+p Simple tracing example
+$ $SG_TEST_EXENV ${bindir:=.}/trace-simple$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:trace_simple.trace --cfg=tracing/uncategorized:yes ${srcdir:=.}/small_platform.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'trace_simple.trace'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
+
+$ tail -n +3 trace_simple.trace
+> %EventDef PajeDefineContainerType 0
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineVariableType 1
+> %       Alias string
+> %       Type string
+> %       Name string
+> %       Color color
+> %EndEventDef
+> %EventDef PajeDefineStateType 2
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineEventType 3
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineLinkType 4
+> %       Alias string
+> %       Type string
+> %       StartContainerType string
+> %       EndContainerType string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineEntityValue 5
+> %       Alias string
+> %       Type string
+> %       Name string
+> %       Color color
+> %EndEventDef
+> %EventDef PajeCreateContainer 6
+> %       Time date
+> %       Alias string
+> %       Type string
+> %       Container string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDestroyContainer 7
+> %       Time date
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeSetVariable 8
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
+> %EndEventDef
+> %EventDef PajeAddVariable 9
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
+> %EndEventDef
+> %EventDef PajeSubVariable 10
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
+> %EndEventDef
+> %EventDef PajeSetState 11
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %EndEventDef
+> %EventDef PajePushState 12
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %EndEventDef
+> %EventDef PajePopState 13
+> %       Time date
+> %       Type string
+> %       Container string
+> %EndEventDef
+> %EventDef PajeResetState 14
+> %       Time date
+> %       Type string
+> %       Container string
+> %EndEventDef
+> %EventDef PajeStartLink 15
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %       StartContainer string
+> %       Key string
+> %EndEventDef
+> %EventDef PajeEndLink 16
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %       EndContainer string
+> %       Key string
+> %EndEventDef
+> %EventDef PajeNewEvent 17
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %EndEventDef
+> 0 1 0 HOST
+> 6 0 1 1 0 "Tremblay"
+> 1 2 1 power "1 1 1"
+> 1 3 1 power_used "0.5 0.5 0.5"
+> 6 0 2 1 0 "Jupiter"
+> 6 0 3 1 0 "Fafard"
+> 6 0 4 1 0 "Ginette"
+> 6 0 5 1 0 "Bourassa"
+> 0 4 0 LINK
+> 6 0 6 4 0 "6"
+> 1 5 4 bandwidth "1 1 1"
+> 1 6 4 latency "1 1 1"
+> 1 7 4 bandwidth_used "0.5 0.5 0.5"
+> 6 0 7 4 0 "3"
+> 6 0 8 4 0 "7"
+> 6 0 9 4 0 "9"
+> 6 0 10 4 0 "2"
+> 6 0 11 4 0 "8"
+> 6 0 12 4 0 "1"
+> 6 0 13 4 0 "4"
+> 6 0 14 4 0 "0"
+> 6 0 15 4 0 "5"
+> 6 0 16 4 0 "loopback"
+> 4 8 0 4 4 0-LINK4-LINK4
+> 4 9 0 1 4 0-HOST1-LINK4
+> 4 10 0 4 1 0-LINK4-HOST1
+> 8 0 2 1 98095000.000000
+> 8 0 2 2 76296000.000000
+> 8 0 2 3 76296000.000000
+> 8 0 2 4 48492000.000000
+> 8 0 2 5 48492000.000000
+> 8 0 5 6 41279125.000000
+> 8 0 6 6 0.000060
+> 8 0 5 7 34285625.000000
+> 8 0 6 7 0.000514
+> 8 0 5 8 11618875.000000
+> 8 0 6 8 0.000190
+> 8 0 5 9 7209750.000000
+> 8 0 6 9 0.001462
+> 8 0 5 10 118682500.000000
+> 8 0 6 10 0.000137
+> 8 0 5 11 8158000.000000
+> 8 0 6 11 0.000271
+> 8 0 5 12 34285625.000000
+> 8 0 6 12 0.000514
+> 8 0 5 13 10099625.000000
+> 8 0 6 13 0.000480
+> 8 0 5 14 41279125.000000
+> 8 0 6 14 0.000060
+> 8 0 5 15 27946250.000000
+> 8 0 6 15 0.000278
+> 8 0 5 16 498000000.000000
+> 8 0 6 16 0.000015
+> 15 0 8 0 topology 13 0
+> 16 0 8 0 topology 7 0
+> 15 0 8 0 topology 6 1
+> 16 0 8 0 topology 8 1
+> 15 0 9 0 topology 1 2
+> 16 0 9 0 topology 13 2
+> 15 0 9 0 topology 1 3
+> 16 0 9 0 topology 9 3
+> 15 0 10 0 topology 9 4
+> 16 0 10 0 topology 2 4
+> 15 0 8 0 topology 10 5
+> 16 0 8 0 topology 14 5
+> 15 0 8 0 topology 12 6
+> 16 0 8 0 topology 11 6
+> 15 0 8 0 topology 9 7
+> 16 0 8 0 topology 13 7
+> 15 0 10 0 topology 8 8
+> 16 0 10 0 topology 5 8
+> 15 0 8 0 topology 14 9
+> 16 0 8 0 topology 12 9
+> 15 0 10 0 topology 15 10
+> 16 0 10 0 topology 4 10
+> 15 0 8 0 topology 10 11
+> 16 0 8 0 topology 15 11
+> 15 0 8 0 topology 7 12
+> 16 0 8 0 topology 15 12
+> 15 0 10 0 topology 11 13
+> 16 0 10 0 topology 3 13
+> 15 0 8 0 topology 7 14
+> 16 0 8 0 topology 10 14
+> 15 0 8 0 topology 12 15
+> 16 0 8 0 topology 6 15
+> 15 0 8 0 topology 11 16
+> 16 0 8 0 topology 6 16
+> 8 0 3 1 0.000000
+> 9 0 3 1 98095000.000000
+> 10 0 3 1 98095000.000000
+> 8 0 3 3 0.000000
+> 9 0 3 3 76296000.000000
+> 10 0 3 3 76296000.000000
+> 9 0 3 1 98095000.000000
+> 9 0 3 3 76296000.000000
+> 10 0.000001 3 1 98095000.000000
+> 10 0.000001 3 3 76296000.000000
+> 7 0.000001 1 3
+> 7 0.000001 1 1
+> 7 0.000001 4 16
+> 7 0.000001 4 14
+> 7 0.000001 4 12
+> 7 0.000001 4 10
+> 7 0.000001 4 7
+> 7 0.000001 4 13
+> 7 0.000001 4 15
+> 7 0.000001 4 6
+> 7 0.000001 4 8
+> 7 0.000001 4 11
+> 7 0.000001 4 9
+> 7 0.000001 1 5
+> 7 0.000001 1 2
+> 7 0.000001 1 4
+
+$ rm -f trace_simple.trace
index c4e742c..295887a 100644 (file)
@@ -1,4 +1,4 @@
-foreach (example ms categories procmig trace_platform user_variables link_user_variables link_srcdst_user_variables)
+foreach (example ms procmig user_variables link_user_variables link_srcdst_user_variables)
   add_executable       (${example} ${example}.c)
   target_link_libraries(${example} simgrid)
   set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${example}.c)
@@ -7,13 +7,10 @@ foreach (example ms categories procmig trace_platform user_variables link_user_v
   ADD_TESH(tracing-${example} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/${example}.tesh)
 endforeach()
 
-add_executable       (simple                     simple.c)
-target_link_libraries(simple                     simgrid)
-
 ## Clean generated files
 get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/ms.cat.plist;${CMAKE_CURRENT_BINARY_DIR}/ms.trace;${CMAKE_CURRENT_BINARY_DIR}/ms.uncat.plist;")
 
 set(tesh_files    ${tesh_files}                                                    PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/simple.c            PARENT_SCOPE)
+set(examples_src  ${examples_src}                                                  PARENT_SCOPE)
 set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml      PARENT_SCOPE)