From 34bddd35cf7b4fab7e164bbbbabf432e6d583161 Mon Sep 17 00:00:00 2001 From: suter Date: Mon, 26 Nov 2012 13:45:16 +0100 Subject: [PATCH] revalidate (ans simplify) tesh outputs --- teshsuite/simdag/basic0.tesh | 6 +++--- teshsuite/simdag/basic2.tesh | 2 +- teshsuite/simdag/basic3.tesh | 14 +++++++++++--- teshsuite/simdag/basic4.tesh | 14 +++++++++++--- teshsuite/simdag/basic5.tesh | 6 +++--- teshsuite/simdag/basic6.tesh | 6 +++--- teshsuite/simdag/incomplete.tesh | 14 +++++++------- 7 files changed, 39 insertions(+), 23 deletions(-) diff --git a/teshsuite/simdag/basic0.tesh b/teshsuite/simdag/basic0.tesh index a8eeb8d708..058880837d 100644 --- a/teshsuite/simdag/basic0.tesh +++ b/teshsuite/simdag/basic0.tesh @@ -1,3 +1,3 @@ -$ simdag/basic0 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 -> [ 1.000100] (0:@) Simulation time: 1.000100 +$ simdag/basic0 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" +> [ 0.000000] surf_workstation_model_init_ptask_L07 +> [ 0.800100] Simulation time: 0.800100 diff --git a/teshsuite/simdag/basic2.tesh b/teshsuite/simdag/basic2.tesh index 011f97ef69..2614e4e17e 100644 --- a/teshsuite/simdag/basic2.tesh +++ b/teshsuite/simdag/basic2.tesh @@ -1,3 +1,3 @@ $ simdag/basic2 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 -> [ 10.600100] (0:@) Simulation time: 10.600100 +> [ 8.800100] (0:@) Simulation time: 8.800100 \ No newline at end of file diff --git a/teshsuite/simdag/basic3.tesh b/teshsuite/simdag/basic3.tesh index ac9a3c11b5..fb512dac84 100644 --- a/teshsuite/simdag/basic3.tesh +++ b/teshsuite/simdag/basic3.tesh @@ -1,3 +1,11 @@ -$ simdag/basic3 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 -> [ 0.000000] (0:@) Simulation time: 0.000000 +$ simdag/basic3 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose +> [ 0.000000] surf_workstation_model_init_ptask_L07 +> [ 0.000000] Starting simulation... +> [ 0.000000] Run simulation for -1.000000 seconds +> [ 0.000000] Executing task 'Task Init' +> [ 0.000000] Task 'Task Init' done +> [ 0.000000] Executing task 'Task A' +> [ 0.000000] Task 'Task A' done +> [ 0.000000] Executing task 'Task Fin' +> [ 0.000000] Task 'Task Fin' done +> [ 0.000000] Simulation time: 0.000000 diff --git a/teshsuite/simdag/basic4.tesh b/teshsuite/simdag/basic4.tesh index b098d980ca..b6ca71ae1c 100644 --- a/teshsuite/simdag/basic4.tesh +++ b/teshsuite/simdag/basic4.tesh @@ -1,3 +1,11 @@ -$ simdag/basic4 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 -> [ 0.000100] (0:@) Simulation time: 0.000100 +$ simdag/basic4 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose +> [ 0.000000] surf_workstation_model_init_ptask_L07 +> [ 0.000000] Starting simulation... +> [ 0.000000] Run simulation for -1.000000 seconds +> [ 0.000000] Executing task 'Task Init' +> [ 0.000000] Task 'Task Init' done +> [ 0.000000] Executing task 'Task A' +> [ 0.000100] Task 'Task A' done +> [ 0.000100] Executing task 'Task Fin' +> [ 0.000100] Task 'Task Fin' done +> [ 0.000100] Simulation time: 0.000100 diff --git a/teshsuite/simdag/basic5.tesh b/teshsuite/simdag/basic5.tesh index 21d5814798..cdb06cbfd4 100644 --- a/teshsuite/simdag/basic5.tesh +++ b/teshsuite/simdag/basic5.tesh @@ -1,3 +1,3 @@ -$ simdag/basic5 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 -> [ 0.002500] (0:@) Simulation time: 0.002500 +$ simdag/basic5 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" +> [ 0.000000] surf_workstation_model_init_ptask_L07 +> [ 0.002500] Simulation time: 0.002500 diff --git a/teshsuite/simdag/basic6.tesh b/teshsuite/simdag/basic6.tesh index 5435cb2ea1..a4478e0b83 100644 --- a/teshsuite/simdag/basic6.tesh +++ b/teshsuite/simdag/basic6.tesh @@ -1,3 +1,3 @@ -$ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 -> [ 2.000000] (0:@) Simulation time: 2.000000 +$ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" +> [ 0.000000] surf_workstation_model_init_ptask_L07 +> [ 2.000000] Simulation time: 2.000000 diff --git a/teshsuite/simdag/incomplete.tesh b/teshsuite/simdag/incomplete.tesh index b7f40b2732..c237b85a02 100644 --- a/teshsuite/simdag/incomplete.tesh +++ b/teshsuite/simdag/incomplete.tesh @@ -1,7 +1,7 @@ -$ simdag/incomplete ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 -> [ 10.000100] (0:@) Simulation is finished but 3 tasks are still not done -> [ 10.000100] (0:@) Task C is in SD_NOT_SCHEDULED state -> [ 10.000100] (0:@) Task B is in SD_SCHEDULABLE state -> [ 10.000100] (0:@) Task D is in SD_SCHEDULED state -> [ 10.000100] (0:@) Simulation time: 10.000100 +$ simdag/incomplete ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" +> [ 0.000000] surf_workstation_model_init_ptask_L07 +> [ 8.000100] Simulation is finished but 3 tasks are still not done +> [ 8.000100] Task C is in SD_NOT_SCHEDULED state +> [ 8.000100] Task B is in SD_SCHEDULABLE state +> [ 8.000100] Task D is in SD_SCHEDULED state +> [ 8.000100] Simulation time: 8.000100 -- 2.20.1