From 72835f76b7caa8db8b8ec156c8d5522225ecb200 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 16 Feb 2023 00:15:19 +0100 Subject: [PATCH] 15 years later, I finally managed to kill host/model:compound --- ChangeLog | 2 + docs/source/Configuring_SimGrid.rst | 26 ++++-------- examples/c/comm-pingpong/comm-pingpong.tesh | 3 +- .../cpp/comm-pingpong/s4u-comm-pingpong.tesh | 3 +- examples/platforms/config.xml | 1 - src/kernel/routing/NetZoneImpl.cpp | 19 +-------- src/surf/host_clm03.cpp | 20 ++++----- src/surf/ptask_L07.cpp | 4 ++ teshsuite/platforms/properties.xml | 1 - .../basic-parsing-test.tesh | 2 - .../trace-integration/trace-integration.tesh | 42 +++++++------------ 11 files changed, 38 insertions(+), 85 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89aeda6e73..a70a5dcfa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,8 @@ Models: - Same for the latency - Rewrite the corresponding documentation. - Allow to disable the TCP windowing modeling by setting network/TCP-gamma to 0. + - Finally kill the 'compound' host model. You can change the CPU or network model + with the default host model, as it should. sthread: - Implement pthread_join in MC mode. diff --git a/docs/source/Configuring_SimGrid.rst b/docs/source/Configuring_SimGrid.rst index dd985e220d..56342562d7 100644 --- a/docs/source/Configuring_SimGrid.rst +++ b/docs/source/Configuring_SimGrid.rst @@ -231,27 +231,17 @@ models for all existing resources. simulators as network models (see :ref:`models_ns3`). This model can be :ref:`further configured `. -- ``cpu/model``: specify the used CPU model. We have only one model - for now: +- ``cpu/model``: specify the used CPU model. We have only one model for now: - **Cas01:** Simplistic CPU model (time=size/speed) -- ``host/model``: The host concept is the aggregation of a CPU with a - network card. Three models exists, but actually, only 2 of them are - interesting. The "compound" one is simply due to the way our - internal code is organized, and can easily be ignored. So at the - end, you have two host models: The default one allows aggregation of - an existing CPU model with an existing network model, but does not - allow parallel tasks because these beasts need some collaboration - between the network and CPU model. - - - **default:** Default host model. Currently, CPU:Cas01 and - network:LV08 (with cross traffic enabled) - - **compound:** Host model that is automatically chosen if - you change the network and CPU models - - **ptask_L07:** Host model somehow similar to Cas01+CM02 but - allowing "parallel tasks", that are intended to model the moldable - tasks of the grid scheduling literature. +- ``host/model``: we have two such models for now. + + - **default:** Default host model. It simply uses the otherwise configured models for cpu, disk and network (i.e. CPU:Cas01, + disk:S19 and network:LV08 by default) + - **ptask_L07:** This model is mandatory if you plan to use parallel tasks (and useless otherwise). ptasks are intended to + model the moldable tasks of the grid scheduling literature. A specific host model is necessary because each such activity + has a both compute and communicate components, so the CPU and network models must be mixed together. - ``storage/model``: specify the used storage model. Only one model is provided so far. diff --git a/examples/c/comm-pingpong/comm-pingpong.tesh b/examples/c/comm-pingpong/comm-pingpong.tesh index 4040d9b214..355747881a 100644 --- a/examples/c/comm-pingpong/comm-pingpong.tesh +++ b/examples/c/comm-pingpong/comm-pingpong.tesh @@ -41,8 +41,7 @@ $ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform.xml comm-pingpong_d.xm p Testing the surf network constant model -$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform_routing_none.xml comm-pingpong_d.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ${bindir:=.}/c-comm-pingpong ${platfdir}/small_platform_routing_none.xml comm-pingpong_d.xml "--cfg=cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 diff --git a/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh b/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh index 05bcfe222e..861b0df694 100644 --- a/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh +++ b/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh @@ -41,8 +41,7 @@ $ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml --cfg=cpu/model: p Testing the surf network constant model -$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform_routing_none.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform_routing_none.xml "--cfg=cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' > [ 0.000000] (1:pinger@Tremblay) Ping from mailbox Mailbox 1 to mailbox Mailbox 2 diff --git a/examples/platforms/config.xml b/examples/platforms/config.xml index ce1f2f742a..b524bf174a 100644 --- a/examples/platforms/config.xml +++ b/examples/platforms/config.xml @@ -4,7 +4,6 @@ - diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index b255d1feef..8791ad7a1a 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -27,24 +27,7 @@ namespace simgrid::kernel::routing { /* Pick the right models for CPU, net and host, and call their model_init_preparse */ static void surf_config_models_setup() { - std::string host_model_name = simgrid::config::get_value("host/model"); - std::string network_model_name = simgrid::config::get_value("network/model"); - std::string cpu_model_name = simgrid::config::get_value("cpu/model"); - std::string disk_model_name = simgrid::config::get_value("disk/model"); - - /* The compound host model is needed when using non-default net/cpu models */ - if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model") || - not simgrid::config::is_default("disk/model")) && simgrid::config::is_default("host/model")) { - host_model_name = "compound"; - simgrid::config::set_value("host/model", host_model_name); - } - - XBT_DEBUG("host model: %s", host_model_name.c_str()); - if (host_model_name == "compound") { - simgrid_cpu_models().by_name(cpu_model_name).init(); - simgrid_disk_models().by_name(disk_model_name).init(); - simgrid_network_models().by_name(network_model_name).init(); - } + std::string host_model_name = simgrid::config::get_value("host/model"); simgrid_host_models().by_name(host_model_name).init(); diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index 70ac155743..fd55f13cb1 100644 --- a/src/surf/host_clm03.cpp +++ b/src/surf/host_clm03.cpp @@ -21,20 +21,14 @@ SIMGRID_REGISTER_HOST_MODEL( auto* engine = simgrid::kernel::EngineImpl::get_instance(); engine->add_model(host_model); engine->get_netzone_root()->set_host_model(host_model); - simgrid_cpu_models().by_name("Cas01").init(); - simgrid_disk_models().by_name("S19").init(); - simgrid_network_models().by_name("LV08").init(); - }); -SIMGRID_REGISTER_HOST_MODEL(compound, - "Host model that is automatically chosen if you change the CPU, network, and disk models", - []() { - auto host_model = - std::make_shared("Host_CLM03"); - auto* engine = simgrid::kernel::EngineImpl::get_instance(); - engine->add_model(host_model); - engine->get_netzone_root()->set_host_model(host_model); - }); + std::string network_model_name = simgrid::config::get_value("network/model"); + std::string cpu_model_name = simgrid::config::get_value("cpu/model"); + std::string disk_model_name = simgrid::config::get_value("disk/model"); + simgrid_cpu_models().by_name(cpu_model_name).init(); + simgrid_disk_models().by_name(disk_model_name).init(); + simgrid_network_models().by_name(network_model_name).init(); + }); namespace simgrid::kernel::resource { diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 1b14d78e92..564a2be9e1 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include "simgrid/config.h" @@ -36,6 +37,9 @@ SIMGRID_REGISTER_HOST_MODEL( XBT_CINFO(xbt_cfg, "Switching to the L07 model to handle parallel tasks."); xbt_assert(cfg_ptask_solver != "maxmin", "Invalid configuration. Cannot use maxmin solver with parallel tasks."); + xbt_assert(simgrid::config::is_default("network/model") && simgrid::config::is_default("cpu/model"), + "Changing the network or CPU model is not allowed when using the ptasks host model."); + auto* system = simgrid::kernel::lmm::System::build(cfg_ptask_solver.get(), true /* selective update */); auto host_model = std::make_shared("Host_Ptask", system); auto* engine = simgrid::kernel::EngineImpl::get_instance(); diff --git a/teshsuite/platforms/properties.xml b/teshsuite/platforms/properties.xml index 50de5a4bf7..fd238af7af 100644 --- a/teshsuite/platforms/properties.xml +++ b/teshsuite/platforms/properties.xml @@ -4,7 +4,6 @@ - diff --git a/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh b/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh index ddcabb8112..66e38a49e5 100644 --- a/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh +++ b/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh @@ -37,13 +37,11 @@ $ ${bindir:=.}/basic-parsing-test ${platfdir:=.}/cloud.xml --log=root.fmt=%m%n $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/properties.xml --log=root.fmt=%m%n > Configuration change: Set 'cpu/optim' to 'TI' -> Configuration change: Set 'host/model' to 'compound' > Configuration change: Set 'maxmin/precision' to '0.000010' > Workstation number: 1, link number: 1 $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/properties.xml --cfg=cpu/optim:TI --log=root.fmt=%m%n > Configuration change: Set 'cpu/optim' to 'TI' > The custom configuration 'cpu/optim' is already defined by user! -> Configuration change: Set 'host/model' to 'compound' > Configuration change: Set 'maxmin/precision' to '0.000010' > Workstation number: 1, link number: 1 diff --git a/teshsuite/s4u/trace-integration/trace-integration.tesh b/teshsuite/s4u/trace-integration/trace-integration.tesh index 6899622175..41e6267ccf 100644 --- a/teshsuite/s4u/trace-integration/trace-integration.tesh +++ b/teshsuite/s4u/trace-integration/trace-integration.tesh @@ -4,8 +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 -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1-c0s0-c0s1.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -16,8 +15,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 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 -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1-c0s1-c0s2.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -28,8 +26,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 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 -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1-c0s2-c1s0.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 20.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -40,8 +37,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 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 -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1-c0s0-c1s0.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -52,8 +48,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 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 -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1-c0s2-c1s1.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 20.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -64,8 +59,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 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 -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1-c0s1-c2s2.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -76,8 +70,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 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 -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1-c1s1-c1s2.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 40.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -88,8 +81,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 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 -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1-c1s1-c3s2.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 40.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -100,8 +92,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1.5-hbp1.5.xml, two process with same priority ! output sort -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1.5-hbp1.5.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -116,8 +107,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority ! output sort -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp2.5-hbp1.5.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -132,8 +122,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp2 p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority (included) ! output sort -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_platform_with_availability_included.xml ${srcdir:=.}/test-hbp2.5-hbp1.5.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -148,8 +137,7 @@ $ ./trace-integration ${platfdir}/two_hosts_platform_with_availability_included. p Testing trace integration using trace_B.txt and test-hbp1.0-hbp1.0-hbp1.0.xml, three process with same priority ! output sort -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1.0-hbp1.0-hbp1.0.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 0.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -168,8 +156,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority ! output sort -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI @@ -188,8 +175,7 @@ $ ./trace-integration ${platfdir}/two_hosts_profiles.xml ${srcdir:=.}/test-hbp1 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 -$ ./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=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound' +$ ./trace-integration ${platfdir}/two_hosts_platform_with_availability_included.xml ${srcdir:=.}/test-hbp1.0-hbp3.0-hbp4.0.xml --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI' > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI -- 2.20.1