Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
convert trace-integration test
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Sun, 8 Mar 2020 12:10:24 +0000 (13:10 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Sun, 8 Mar 2020 12:12:09 +0000 (13:12 +0100)
17 files changed:
MANIFEST.in
teshsuite/msg/CMakeLists.txt
teshsuite/s4u/CMakeLists.txt
teshsuite/s4u/trace-integration/test-hbp1-c0s0-c0s1.xml [moved from teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp1-c0s0-c1s0.xml [moved from teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp1-c0s1-c0s2.xml [moved from teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp1-c0s1-c2s2.xml [moved from teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp1-c0s2-c1s0.xml [moved from teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp1-c0s2-c1s1.xml [moved from teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp1-c1s1-c1s2.xml [moved from teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp1-c1s1-c3s2.xml [moved from teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp1.0-hbp1.0-hbp1.0.xml [moved from teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp1.0-hbp3.0-hbp4.0.xml [moved from teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp1.5-hbp1.5.xml [moved from teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml with 100% similarity]
teshsuite/s4u/trace-integration/test-hbp2.5-hbp1.5.xml [moved from teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml with 100% similarity]
teshsuite/s4u/trace-integration/trace-integration.cpp [moved from teshsuite/msg/trace_integration/trace_integration.c with 50% similarity]
teshsuite/s4u/trace-integration/trace-integration.tesh [moved from teshsuite/msg/trace_integration/trace_integration.tesh with 76% similarity]

index 227d242..172a5ec 100644 (file)
@@ -684,20 +684,6 @@ include teshsuite/msg/task_listen_from/task_listen_from.cpp
 include teshsuite/msg/task_listen_from/task_listen_from.tesh
 include teshsuite/msg/task_progress/task_progress.cpp
 include teshsuite/msg/task_progress/task_progress.tesh
-include teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml
-include teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml
-include teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml
-include teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml
-include teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml
-include teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml
-include teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml
-include teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml
-include teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml
-include teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml
-include teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml
-include teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml
-include teshsuite/msg/trace_integration/trace_integration.c
-include teshsuite/msg/trace_integration/trace_integration.tesh
 include teshsuite/python/borken-context/borken-context.py
 include teshsuite/python/borken-context/borken-context.tesh
 include teshsuite/python/borken-context/borken-context_d.xml
@@ -741,6 +727,20 @@ include teshsuite/s4u/pid/pid.cpp
 include teshsuite/s4u/pid/pid.tesh
 include teshsuite/s4u/storage_client_server/storage_client_server.cpp
 include teshsuite/s4u/storage_client_server/storage_client_server.tesh
+include teshsuite/s4u/trace-integration/trace-integration.cpp
+include teshsuite/s4u/trace-integration/trace-integration.tesh
+include teshsuite/s4u/trace_integration/test-hbp1-c0s0-c0s1.xml
+include teshsuite/s4u/trace_integration/test-hbp1-c0s0-c1s0.xml
+include teshsuite/s4u/trace_integration/test-hbp1-c0s1-c0s2.xml
+include teshsuite/s4u/trace_integration/test-hbp1-c0s1-c2s2.xml
+include teshsuite/s4u/trace_integration/test-hbp1-c0s2-c1s0.xml
+include teshsuite/s4u/trace_integration/test-hbp1-c0s2-c1s1.xml
+include teshsuite/s4u/trace_integration/test-hbp1-c1s1-c1s2.xml
+include teshsuite/s4u/trace_integration/test-hbp1-c1s1-c3s2.xml
+include teshsuite/s4u/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml
+include teshsuite/s4u/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml
+include teshsuite/s4u/trace_integration/test-hbp1.5-hbp1.5.xml
+include teshsuite/s4u/trace_integration/test-hbp2.5-hbp1.5.xml
 include teshsuite/s4u/wait-any-for/wait-any-for.cpp
 include teshsuite/s4u/wait-any-for/wait-any-for.tesh
 include teshsuite/simdag/availability/availability.c
index 167bd42..437c1fd 100644 (file)
@@ -2,8 +2,7 @@
 foreach(x cloud-two-tasks
           get_sender
           platform-properties
-          io-file
-          trace_integration)
+          io-file)
   if(enable_msg)
     add_executable       (${x} EXCLUDE_FROM_ALL ${x}/${x}.c)
     target_link_libraries(${x} simgrid)
@@ -44,18 +43,7 @@ set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/ap
 set(bin_files    ${bin_files}      ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/generate.py                  PARENT_SCOPE)
 set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/app-bittorrent_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/platform-properties/platform-properties_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.5-hbp1.5.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s0-c0s1.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s0-c1s0.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s1-c0s2.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s1-c2s2.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s2-c1s0.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s2-c1s1.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c1s1-c1s2.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c1s1-c3s2.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp2.5-hbp1.5.xml    PARENT_SCOPE)
+                                   PARENT_SCOPE)
 
 if(enable_msg)
   foreach(x 
@@ -65,8 +53,7 @@ if(enable_msg)
     get_sender
     task_destroy_cancel task_listen_from task_progress 
     io-file
-    platform-properties
-    trace_integration)
+    platform-properties)
     
     ADD_TESH_FACTORIES(tesh-msg-${x} "raw" 
                                      --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
index c8d623a..21c7cb0 100644 (file)
@@ -5,7 +5,8 @@ foreach(x actor actor-autorestart
         concurrent_rw 
         host-on-off host-on-off-recv
         basic-link-test evaluate-get-route-time evaluate-parse-time is-router
-        storage_client_server listen_async pid )
+        storage_client_server listen_async pid
+        trace-integration)
   add_executable       (${x}  EXCLUDE_FROM_ALL ${x}/${x}.cpp)
   target_link_libraries(${x}  simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -30,7 +31,7 @@ foreach(x actor actor-autorestart
   ADD_TESH_FACTORIES(tesh-s4u-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/s4u/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/teshsuite/s4u/${x} ${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/${x}/${x}.tesh)
 endforeach()
 
-foreach(x basic-link-test host-on-off host-on-off-recv is-router listen_async pid storage_client_server cloud-sharing)
+foreach(x basic-link-test host-on-off host-on-off-recv is-router listen_async pid storage_client_server cloud-sharing trace-integration)
   set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
   ADD_TESH(tesh-s4u-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/teshsuite/s4u/${x} ${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/${x}/${x}.tesh)
 endforeach()
@@ -56,4 +57,16 @@ endforeach()
 
 set(teshsuite_src ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/activity-lifecycle/activity-lifecycle.hpp PARENT_SCOPE)
 set(tesh_files    ${tesh_files}     PARENT_SCOPE)
-set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/activity-lifecycle/testing_platform.xml PARENT_SCOPE)
+set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/activity-lifecycle/testing_platform.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1.0-hbp1.0-hbp1.0.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1.0-hbp3.0-hbp4.0.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1.5-hbp1.5.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1-c0s0-c0s1.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1-c0s0-c1s0.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1-c0s1-c0s2.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1-c0s1-c2s2.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1-c0s2-c1s0.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1-c0s2-c1s1.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1-c1s1-c1s2.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp1-c1s1-c3s2.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/trace-integration/test-hbp2.5-hbp1.5.xml PARENT_SCOPE)
@@ -4,41 +4,37 @@
 /* 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 "simgrid/msg.h"
+#include "simgrid/s4u.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test_trace_integration, "Messages specific for this msg example");
 
 /** test the trace integration cpu model */
-static int test_trace(int argc, char *argv[])
+static void test_trace(int argc, char* argv[])
 {
-  xbt_assert (argc == 3,"Wrong number of arguments!\nUsage: %s <task computational size in FLOPS> <task priority>", argv[0]);
+  xbt_assert(argc == 3, "Wrong number of arguments!\nUsage: %s <task computational size in FLOPS> <task priority>",
+             argv[0]);
 
-  double task_comp_size = xbt_str_parse_double(argv[1], "Invalid computational size: %s");
-  double task_prio      = xbt_str_parse_double(argv[2], "Invalid task priority: %s");
+  double task_comp_size = std::stod(argv[1]);
+  double task_prio      = std::stod(argv[2]);
 
   XBT_INFO("Testing the trace integration cpu model: CpuTI");
   XBT_INFO("Task size: %f", task_comp_size);
   XBT_INFO("Task prio: %f", task_prio);
 
   /* Create and execute a single task. */
-  msg_task_t task = MSG_task_create("proc 0", task_comp_size, 0, NULL);
-  MSG_task_set_priority(task, task_prio);
-  MSG_task_execute(task);
-  MSG_task_destroy(task);
-
+  simgrid::s4u::ExecPtr exec = simgrid::s4u::this_actor::exec_init(task_comp_size);
+  exec->set_priority(task_prio)->wait();
   XBT_INFO("Test finished");
-
-  return 0;
 }
 
-int main(int argc, char *argv[])
+int main(int argc, charargv[])
 {
-  MSG_init(&argc, argv);
+  simgrid::s4u::Engine e(&argc, argv);
   xbt_assert(argc > 2, "Usage: %s test_trace_integration_model.xml deployment.xml\n", argv[0]);
 
-  MSG_function_register("test_trace", test_trace);
-  MSG_create_environment(argv[1]);
-  MSG_launch_application(argv[2]);
-
-  return MSG_main() != MSG_OK;
+  e.register_function("test_trace", test_trace);
+  e.load_platform(argv[1]);
+  e.load_deployment(argv[2]);
+  e.run();
+  return 0;
 }
@@ -4,7 +4,7 @@ p c=cycle s=step p=priority h=host
 p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c0s1.xml, test_trace:start == trace_cycle_0_step_0, test_trace:end < trace_cycle_0_step_1
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s0-c0s1.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s0-c0s1.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -16,7 +16,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp1-c0s1-c0s2.xml, test_trace:start == trace_cycle_0_step_1, test_trace:end < trace_cycle_0_step_2
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s1-c0s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s1-c0s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -28,7 +28,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp1-c0s2-c1s0.xml, test_trace:start == trace_cycle_0_step_2, test_trace:end < trace_cycle_1_step_0
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s2-c1s0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s2-c1s0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -40,7 +40,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c1s0.xml, test_trace:start == trace_cycle_0_step_0, test_trace:end < trace_cycle_1_step_0
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s0-c1s0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s0-c1s0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -52,7 +52,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp1-c0s2-c1s1.xml, test_trace:start == trace_cycle_0_step_2, test_trace:end < trace_cycle_1_step_1
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s2-c1s1.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s2-c1s1.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -64,7 +64,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp1-c0s1-c2s2.xml, test_trace:start == trace_cycle_0_step_1, test_trace:end < trace_cycle_2_step_2
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s1-c2s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c0s1-c2s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -76,7 +76,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp1-c1s1-c1s2.xml, test_trace:start == trace_cycle_1_step_1, test_trace:end < trace_cycle_1_step_2
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c1s1-c1s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c1s1-c1s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -88,7 +88,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp1-c1s1-c3s2.xml, test_trace:start == trace_cycle_1_step_1, test_trace:end < trace_cycle_3_step_2
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c1s1-c3s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1-c1s1-c3s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -100,7 +100,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp1.5-hbp1.5.xml, two process with same priority
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1.5-hbp1.5.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1.5-hbp1.5.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -116,7 +116,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp2.5-hbp1.5.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp2.5-hbp1.5.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -132,7 +132,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority (included)
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability_included.xml  ${srcdir:=.}/test-hbp2.5-hbp1.5.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_platform_with_availability_included.xml  ${srcdir:=.}/test-hbp2.5-hbp1.5.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -148,7 +148,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability_i
 p Testing trace integration using trace_B.txt and test-hbp1.0-hbp1.0-hbp1.0.xml, three process with same priority
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1.0-hbp1.0-hbp1.0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1.0-hbp1.0-hbp1.0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -168,7 +168,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
@@ -188,7 +188,7 @@ $ ${bindir}/trace_integration ${platfdir}/two_hosts_profiles.xml  ${srcdir:=.}/t
 p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority (included)
 
 ! output sort
-$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability_included.xml  ${srcdir:=.}/test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./trace-integration ${platfdir}/two_hosts_platform_with_availability_included.xml  ${srcdir:=.}/test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'