From 217755c78edb8213029749f196de5bb2d9542ddd Mon Sep 17 00:00:00 2001 From: Lucas Schnorr Date: Mon, 23 May 2011 16:59:45 +0200 Subject: [PATCH] [trace] fix tests: tracing-tasks and smpi-tracing-ptp details: - command line parameters for tracing smpi have changed --- examples/msg/tracing/tasks.tesh | 36 ++++++++++++++++----------------- examples/smpi/smpi_traced.tesh | 4 +++- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/examples/msg/tracing/tasks.tesh b/examples/msg/tracing/tasks.tesh index ad14c2ec18..bb1633efc7 100644 --- a/examples/msg/tracing/tasks.tesh +++ b/examples/msg/tracing/tasks.tesh @@ -314,22 +314,22 @@ $ cat tracing/tasks.trace > 9 0.168126 15 1 98095000.000000 > 10 0.386279 15 1 98095000.000000 > 9 0.386279 15 1 98095000.000000 -> 10 0.511874 15 1 98095000.000000 > 9 0.399511 14 13 7859911.230163 > 9 0.399511 14 7 7859911.230163 > 8 0.399511 14 15 0.000000 > 9 0.399511 14 15 7859911.230163 +> 10 0.511874 15 1 98095000.000000 > 10 0.511874 14 13 7859911.230163 > 10 0.511874 14 7 7859911.230163 > 10 0.511874 14 15 7859911.230163 > 13 0.511874 4 17 > 7 0.511874 3 17 > 9 0.511874 14 13 7859911.230163 +> 9 0.511874 14 7 7859911.230163 +> 9 0.511874 14 15 7859911.230163 > 6 0.526739 23 3 4 task-3 > 6 0.526739 24 3 1 task-4 > 10 0.526739 14 13 7859911.230163 -> 9 0.511874 14 7 7859911.230163 -> 9 0.511874 14 15 7859911.230163 > 10 0.526739 14 7 7859911.230163 > 10 0.526739 14 15 7859911.230163 > 8 0.526739 18 23 1.000000 @@ -344,7 +344,6 @@ $ cat tracing/tasks.trace > 6 0.742611 25 3 5 task-4 > 6 0.742611 26 3 1 task-5 > 9 0.547074 14 13 5114134.701194 -> 10 0.742611 14 13 5114134.701194 > 9 0.547074 14 7 5114134.701194 > 9 0.547074 14 10 5114134.701194 > 9 0.547074 14 14 5114134.701194 @@ -353,6 +352,7 @@ $ cat tracing/tasks.trace > 9 0.547074 14 6 5114134.701194 > 8 0.547074 14 8 0.000000 > 9 0.547074 14 8 5114134.701194 +> 10 0.742611 14 13 5114134.701194 > 10 0.742611 14 7 5114134.701194 > 10 0.742611 14 10 5114134.701194 > 10 0.742611 14 14 5114134.701194 @@ -391,14 +391,14 @@ $ cat tracing/tasks.trace > 14 0.989430 7 0 SR 29 7 > 7 0.989430 3 29 > 6 0.989430 30 3 2 task-6 +> 8 0.386279 15 3 0.000000 +> 9 0.386279 15 3 76296000.000000 +> 9 0.744775 15 1 98095000.000000 > 8 0.989430 18 30 1.000000 > 12 0.989430 4 30 6 > 15 0.989430 7 0 SR 30 6 > 12 0.989430 4 30 5 -> 9 0.744775 15 1 98095000.000000 > 10 0.989430 15 1 98095000.000000 -> 8 0.386279 15 3 0.000000 -> 9 0.386279 15 3 76296000.000000 > 10 1.041621 15 3 76296000.000000 > 13 1.041621 4 21 > 7 1.041621 3 21 @@ -444,11 +444,11 @@ $ cat tracing/tasks.trace > 14 1.698296 7 0 SR 35 10 > 7 1.698296 3 35 > 6 1.698296 36 3 4 task-9 +> 9 1.261939 15 1 98095000.000000 > 8 1.698296 18 36 1.000000 > 12 1.698296 4 36 6 > 15 1.698296 7 0 SR 36 9 > 12 1.698296 4 36 5 -> 9 1.261939 15 1 98095000.000000 > 10 1.698296 15 1 98095000.000000 > 9 1.698296 15 1 98095000.000000 > 9 1.713496 14 9 6632970.000000 @@ -488,7 +488,6 @@ $ cat tracing/tasks.trace > 14 1.866422 7 0 SR 40 12 > 7 1.866422 3 40 > 9 1.259775 15 3 76296000.000000 -> 10 1.915117 15 3 76296000.000000 > 9 1.886758 14 13 5114134.701194 > 9 1.886758 14 7 5114134.701194 > 9 1.886758 14 10 5114134.701194 @@ -496,6 +495,7 @@ $ cat tracing/tasks.trace > 9 1.886758 14 12 5114134.701194 > 9 1.886758 14 6 5114134.701194 > 9 1.886758 14 8 5114134.701194 +> 10 1.915117 15 3 76296000.000000 > 10 1.915117 14 13 5114134.701194 > 10 1.915117 14 7 5114134.701194 > 10 1.915117 14 10 5114134.701194 @@ -508,13 +508,13 @@ $ cat tracing/tasks.trace > 6 2.082294 41 3 5 task-12 > 6 2.082294 42 3 1 task-13 > 9 1.915117 14 13 5114134.701194 -> 10 2.082294 14 13 5114134.701194 > 9 1.915117 14 7 5114134.701194 > 9 1.915117 14 10 5114134.701194 > 9 1.915117 14 14 5114134.701194 > 9 1.915117 14 12 5114134.701194 > 9 1.915117 14 6 5114134.701194 > 9 1.915117 14 8 5114134.701194 +> 10 2.082294 14 13 5114134.701194 > 10 2.082294 14 7 5114134.701194 > 10 2.082294 14 10 5114134.701194 > 10 2.082294 14 14 5114134.701194 @@ -568,11 +568,11 @@ $ cat tracing/tasks.trace > 14 2.378296 7 0 SR 45 15 > 7 2.378296 3 45 > 6 2.378296 46 3 1 task-14 +> 9 1.864258 15 2 76296000.000000 > 8 2.378296 18 46 1.000000 > 12 2.378296 4 46 6 > 15 2.378296 7 0 SR 46 14 > 12 2.378296 4 46 5 -> 9 1.864258 15 2 76296000.000000 > 10 2.519600 15 2 76296000.000000 > 13 2.519600 4 37 > 7 2.519600 3 37 @@ -583,13 +583,13 @@ $ cat tracing/tasks.trace > 14 2.685562 7 0 SR 47 16 > 7 2.685562 3 47 > 6 2.685562 48 3 2 task-15 +> 9 1.698296 15 4 48492000.000000 +> 9 2.378296 15 1 98095000.000000 > 8 2.685562 18 48 1.000000 > 12 2.685562 4 48 6 > 15 2.685562 7 0 SR 48 15 > 12 2.685562 4 48 5 -> 9 2.378296 15 1 98095000.000000 > 10 2.685562 15 1 98095000.000000 -> 9 1.698296 15 4 48492000.000000 > 10 2.729394 15 4 48492000.000000 > 13 2.729394 4 36 > 7 2.729394 3 36 @@ -600,11 +600,11 @@ $ cat tracing/tasks.trace > 14 2.869854 7 0 SR 49 17 > 7 2.869854 3 49 > 6 2.869854 50 3 4 task-16 +> 9 2.685562 15 1 98095000.000000 > 8 2.869854 18 50 1.000000 > 12 2.869854 4 50 6 > 15 2.869854 7 0 SR 50 16 > 12 2.869854 4 50 5 -> 9 2.685562 15 1 98095000.000000 > 10 2.869854 15 1 98095000.000000 > 9 2.869854 15 1 98095000.000000 > 10 2.888006 15 1 98095000.000000 @@ -617,11 +617,11 @@ $ cat tracing/tasks.trace > 14 2.890170 7 0 SR 51 18 > 7 2.890170 3 51 > 6 2.890170 52 3 1 task-17 +> 9 2.300447 15 3 76296000.000000 > 8 2.890170 18 52 1.000000 > 12 2.890170 4 52 6 > 15 2.890170 7 0 SR 52 17 > 12 2.890170 4 52 5 -> 9 2.300447 15 3 76296000.000000 > 10 2.955790 15 3 76296000.000000 > 13 2.955790 4 43 > 7 2.955790 3 43 @@ -636,13 +636,13 @@ $ cat tracing/tasks.trace > 14 3.173943 7 0 SR 53 19 > 7 3.173943 3 53 > 6 3.173943 54 3 3 task-18 +> 9 2.685562 15 2 76296000.000000 +> 9 2.890170 15 1 98095000.000000 > 8 3.173943 18 54 1.000000 > 12 3.173943 4 54 6 > 15 3.173943 7 0 SR 54 18 > 12 3.173943 4 54 5 -> 9 2.890170 15 1 98095000.000000 > 10 3.173943 15 1 98095000.000000 -> 9 2.685562 15 2 76296000.000000 > 9 3.194279 14 13 5114134.701194 > 9 3.194279 14 7 5114134.701194 > 9 3.194279 14 10 5114134.701194 @@ -664,13 +664,13 @@ $ cat tracing/tasks.trace > 6 3.389815 56 3 1 task-0 > 1 19 3 finalize "1 1 1" > 9 3.340904 14 13 5114134.701194 -> 10 3.389815 14 13 5114134.701194 > 9 3.340904 14 7 5114134.701194 > 9 3.340904 14 10 5114134.701194 > 9 3.340904 14 14 5114134.701194 > 9 3.340904 14 12 5114134.701194 > 9 3.340904 14 6 5114134.701194 > 9 3.340904 14 8 5114134.701194 +> 10 3.389815 14 13 5114134.701194 > 10 3.389815 14 7 5114134.701194 > 10 3.389815 14 10 5114134.701194 > 10 3.389815 14 14 5114134.701194 diff --git a/examples/smpi/smpi_traced.tesh b/examples/smpi/smpi_traced.tesh index df314b9e69..75c4f20aa7 100644 --- a/examples/smpi/smpi_traced.tesh +++ b/examples/smpi/smpi_traced.tesh @@ -2,7 +2,7 @@ # (since we want to pass it to the child, it has to be redefined before each command) # Go for the first test p Test instrumentation of SMPI -$ ../../bin/smpirun -trace smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/tracing/platform.xml -np 3 ./smpi_traced +$ ../../bin/smpirun -trace -trace-resource -trace-file smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/tracing/platform.xml -np 3 ./smpi_traced > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'TCP_gamma' to '4194304' @@ -12,3 +12,5 @@ $ ../../bin/smpirun -trace smpi_traced.trace -hostfile ${srcdir:=.}/hostfile -pl > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to '1' > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) + +$ rm -f smpi_traced.trace -- 2.20.1