mv examples/platforms/trace examples/platforms/profiles

diff --git a/examples/platforms/faulty_host.xml b/examples/platforms/faulty_host.xml
index 1aedb3a..f6b94c3 100644 (file)
--- a/examples/platforms/faulty_host.xml
+++ b/examples/platforms/faulty_host.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
 <platform version="4.1">
   <zone  id="AS0"  routing="Full">
-    <host id="Faulty Host" speed="1Gf" state_file="trace/faulty_host.trace"/>
+    <host id="Faulty Host" speed="1Gf" state_file="profiles/faulty_host.profile"/>
     <host id="Safe Host" speed="500Mf"/>
   </zone>
 </platform>

diff --git a/examples/platforms/trace/bourassa_state.trace b/examples/platforms/profiles/bourassa_state.profile
similarity index 100%
rename from examples/platforms/trace/bourassa_state.trace
rename to examples/platforms/profiles/bourassa_state.profile

diff --git a/examples/platforms/trace/fafard_state.trace b/examples/platforms/profiles/fafard_state.profile
similarity index 100%
rename from examples/platforms/trace/fafard_state.trace
rename to examples/platforms/profiles/fafard_state.profile

diff --git a/examples/platforms/trace/faulty_host.trace b/examples/platforms/profiles/faulty_host.profile
similarity index 100%
rename from examples/platforms/trace/faulty_host.trace
rename to examples/platforms/profiles/faulty_host.profile

diff --git a/examples/platforms/trace/ginette_state.trace b/examples/platforms/profiles/ginette_state.profile
similarity index 100%
rename from examples/platforms/trace/ginette_state.trace
rename to examples/platforms/profiles/ginette_state.profile

diff --git a/examples/platforms/trace/jupiter_speed.trace b/examples/platforms/profiles/jupiter_speed.profile
similarity index 100%
rename from examples/platforms/trace/jupiter_speed.trace
rename to examples/platforms/profiles/jupiter_speed.profile

diff --git a/examples/platforms/trace/jupiter_state.trace b/examples/platforms/profiles/jupiter_state.profile
similarity index 100%
rename from examples/platforms/trace/jupiter_state.trace
rename to examples/platforms/profiles/jupiter_state.profile

diff --git a/examples/platforms/trace/link1_bandwidth.trace b/examples/platforms/profiles/link1_bandwidth.profile
similarity index 100%
rename from examples/platforms/trace/link1_bandwidth.trace
rename to examples/platforms/profiles/link1_bandwidth.profile

diff --git a/examples/platforms/trace/link1_latency.trace b/examples/platforms/profiles/link1_latency.profile
similarity index 100%
rename from examples/platforms/trace/link1_latency.trace
rename to examples/platforms/profiles/link1_latency.profile

diff --git a/examples/platforms/trace/link3_state.trace b/examples/platforms/profiles/link3_state.profile
similarity index 100%
rename from examples/platforms/trace/link3_state.trace
rename to examples/platforms/profiles/link3_state.profile

diff --git a/examples/platforms/trace/link4_state.trace b/examples/platforms/profiles/link4_state.profile
similarity index 100%
rename from examples/platforms/trace/link4_state.trace
rename to examples/platforms/profiles/link4_state.profile

diff --git a/examples/platforms/trace/linkBandwidth7.bw b/examples/platforms/profiles/linkBandwidth7.bw
similarity index 100%
rename from examples/platforms/trace/linkBandwidth7.bw
rename to examples/platforms/profiles/linkBandwidth7.bw

diff --git a/examples/platforms/trace/trace_A.txt b/examples/platforms/profiles/trace_A.txt
similarity index 100%
rename from examples/platforms/trace/trace_A.txt
rename to examples/platforms/profiles/trace_A.txt

diff --git a/examples/platforms/trace/trace_A_failure.txt b/examples/platforms/profiles/trace_A_failure.txt
similarity index 100%
rename from examples/platforms/trace/trace_A_failure.txt
rename to examples/platforms/profiles/trace_A_failure.txt

diff --git a/examples/platforms/trace/trace_B.txt b/examples/platforms/profiles/trace_B.txt
similarity index 100%
rename from examples/platforms/trace/trace_B.txt
rename to examples/platforms/profiles/trace_B.txt

diff --git a/examples/platforms/simulacrum_7_hosts.xml b/examples/platforms/simulacrum_7_hosts.xml
index c2357c3..248e616 100644 (file)
--- a/examples/platforms/simulacrum_7_hosts.xml
+++ b/examples/platforms/simulacrum_7_hosts.xml
@@ -20,7 +20,7 @@
     <link id="l155" bandwidth="125MBps" latency="100us"/>
     <link id="l156" bandwidth="125MBps" latency="100us"/>
     <link id="l157" bandwidth="125MBps" latency="100us"/>
-    <link id="l159" bandwidth="125MBps" latency="100us" bandwidth_file="trace/linkBandwidth7.bw"/>
+    <link id="l159" bandwidth="125MBps" latency="100us" bandwidth_file="profiles/linkBandwidth7.bw"/>
     <link id="l160" bandwidth="125MBps" latency="100us"/>
     <link id="l161" bandwidth="125MBps" latency="100us"/>
     <link id="l162" bandwidth="125MBps" latency="100us"/>

diff --git a/examples/platforms/small_platform_with_failures.xml b/examples/platforms/small_platform_failures.xml
similarity index 79%
rename from examples/platforms/small_platform_with_failures.xml
rename to examples/platforms/small_platform_failures.xml
index 7e58d50..ef4527d 100644 (file)
--- a/examples/platforms/small_platform_with_failures.xml
+++ b/examples/platforms/small_platform_failures.xml
@@ -3,15 +3,15 @@
 <platform version="4.1">
   <zone  id="AS0"  routing="Full">
     <host id="Tremblay" speed="25Mf"/>
-    <host id="Jupiter"  speed="25Mf" state_file="trace/jupiter_state.trace"/>
-    <host id="Fafard"   speed="25Mf" state_file="trace/fafard_state.trace" />
-    <host id="Ginette"  speed="25Mf" state_file="trace/ginette_state.trace"/>
-    <host id="Bourassa" speed="25Mf" state_file="trace/bourassa_state.trace"/>
+    <host id="Jupiter"  speed="25Mf" state_file="profiles/jupiter_state.profile"/>
+    <host id="Fafard"   speed="25Mf" state_file="profiles/fafard_state.profile" />
+    <host id="Ginette"  speed="25Mf" state_file="profiles/ginette_state.profile"/>
+    <host id="Bourassa" speed="25Mf" state_file="profiles/bourassa_state.profile"/>
 
     <link id="1" bandwidth="1MBps" latency="0"/>
     <link id="2" bandwidth="1MBps" latency="0"/>
-    <link id="3" bandwidth="1MBps" latency="0" state_file="trace/link3_state.trace" />
-    <link id="4" bandwidth="1MBps" latency="0" state_file="trace/link4_state.trace" />
+    <link id="3" bandwidth="1MBps" latency="0" state_file="profiles/link3_state.profile" />
+    <link id="4" bandwidth="1MBps" latency="0" state_file="profiles/link4_state.profile" />
     <link id="5" bandwidth="1MBps" latency="0"/>
     <link id="6" bandwidth="1MBps" latency="0"/>
     <link id="7" bandwidth="1MBps" latency="0"/>

diff --git a/examples/platforms/small_platform_profile.xml b/examples/platforms/small_platform_profile.xml
index efabd6f..064d459 100644 (file)
--- a/examples/platforms/small_platform_profile.xml
+++ b/examples/platforms/small_platform_profile.xml
@@ -3,12 +3,12 @@
 <platform version="4.1">
   <zone  id="AS0"  routing="Full">
     <host id="Tremblay" speed="25Mf"/>
-    <host id="Jupiter"  speed="25Mf" availability_file="trace/jupiter_speed.trace" />
+    <host id="Jupiter"  speed="25Mf" availability_file="profiles/jupiter_speed.profile" />
     <host id="Fafard"   speed="25Mf"/>
     <host id="Ginette"  speed="25Mf"/>
     <host id="Bourassa" speed="25Mf"/>
 
-    <link id="1" bandwidth="1MBps" latency="10ms" bandwidth_file="trace/link1_bandwidth.trace" latency_file="trace/link1_latency.trace" />
+    <link id="1" bandwidth="1MBps" latency="10ms" bandwidth_file="profiles/link1_bandwidth.profile" latency_file="profiles/link1_latency.profile" />
     <link id="2" bandwidth="1MBps" latency="10ms"/>
     <link id="3" bandwidth="1MBps" latency="10ms"/>
     <link id="4" bandwidth="1MBps" latency="10ms"/>

diff --git a/examples/platforms/two_hosts_platform_with_availability.xml b/examples/platforms/two_hosts_platform_with_availability.xml
index a8f4023..5648fe8 100644 (file)
--- a/examples/platforms/two_hosts_platform_with_availability.xml
+++ b/examples/platforms/two_hosts_platform_with_availability.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
 <platform version="4.1">
   <zone  id="AS0"  routing="Full">
-    <host id="Cpu A" speed="10f" availability_file="trace/trace_A.txt" state_file="trace/trace_A_failure.txt"/>
-    <host id="Cpu B" speed="10f" availability_file="trace/trace_B.txt"/>
+    <host id="Cpu A" speed="10f" availability_file="profiles/trace_A.txt" state_file="profiles/trace_A_failure.txt"/>
+    <host id="Cpu B" speed="10f" availability_file="profiles/trace_B.txt"/>
     <link id="LinkA" bandwidth="10MBps" latency="200ms"/>
     <route src="Cpu A" dst="Cpu B">
       <link_ctn id="LinkA"/>

diff --git a/examples/s4u/README.rst b/examples/s4u/README.rst
index e8378dc..d7f8291 100644 (file)
--- a/examples/s4u/README.rst
+++ b/examples/s4u/README.rst
@@ -286,13 +286,13 @@ Interacting with the Platform
    failures in your code.
    
    |br| `examples/platforms/small_platform_with_failure.xml <https://framagit.org/simgrid/simgrid/tree/master/examples/platforms/small_platform_with_failure.xml>`_
-   |br| The state profiles in `examples/platforms/trace <https://framagit.org/simgrid/simgrid/tree/master/examples/platforms/trace>`_
+   |br| The state profiles in `examples/platforms/profiles <https://framagit.org/simgrid/simgrid/tree/master/examples/platforms/profiles>`_
 
  - **Specifying speed profiles:** shows how to specify an external
    load to resources, variating their peak speed over time.
    
    |br| `examples/platforms/small_platform_profile.xml <https://framagit.org/simgrid/simgrid/tree/master/examples/platforms/small_platform_profile.xml>`_
-   |br| The speed, bandwidth and latency profiles in `examples/platforms/trace <https://framagit.org/simgrid/simgrid/tree/master/examples/platforms/trace>`_
+   |br| The speed, bandwidth and latency profiles in `examples/platforms/profiles  <https://framagit.org/simgrid/simgrid/tree/master/examples/platforms/profiles>`_
 
 =================
 Energy Simulation

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 2e41255..3c83780 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1109,20 +1109,20 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/optorsim/transform_optorsim_platform.pl
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml
-  examples/platforms/trace/bourassa_state.trace
-  examples/platforms/trace/fafard_state.trace
-  examples/platforms/trace/faulty_host.trace
-  examples/platforms/trace/ginette_state.trace
-  examples/platforms/trace/jupiter_speed.trace
-  examples/platforms/trace/jupiter_state.trace
-  examples/platforms/trace/link1_bandwidth.trace
-  examples/platforms/trace/link1_latency.trace
-  examples/platforms/trace/link3_state.trace
-  examples/platforms/trace/link4_state.trace
-  examples/platforms/trace/linkBandwidth7.bw
-  examples/platforms/trace/trace_A_failure.txt
-  examples/platforms/trace/trace_A.txt
-  examples/platforms/trace/trace_B.txt
+  examples/platforms/profiles/bourassa_state.profile
+  examples/platforms/profiles/fafard_state.profile
+  examples/platforms/profiles/faulty_host.profile
+  examples/platforms/profiles/ginette_state.profile
+  examples/platforms/profiles/jupiter_speed.profile
+  examples/platforms/profiles/jupiter_state.profile
+  examples/platforms/profiles/link1_bandwidth.profile
+  examples/platforms/profiles/link1_latency.profile
+  examples/platforms/profiles/link3_state.profile
+  examples/platforms/profiles/link4_state.profile
+  examples/platforms/profiles/linkBandwidth7.bw
+  examples/platforms/profiles/trace_A_failure.txt
+  examples/platforms/profiles/trace_A.txt
+  examples/platforms/profiles/trace_B.txt
   examples/platforms/data_center.xml
   examples/platforms/dogbone.xml
   examples/platforms/energy_platform.xml
@@ -1146,10 +1146,10 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/small_platform.xml
   examples/platforms/small_platform.lua
   examples/platforms/small_platform_constant.xml
+  examples/platforms/small_platform_failures.xml
   examples/platforms/small_platform_fatpipe.xml
   examples/platforms/small_platform_one_link_routes.xml
   examples/platforms/small_platform_profile.xml
-  examples/platforms/small_platform_with_failures.xml
   examples/platforms/small_platform_with_routers.xml
   examples/platforms/syscoord/generate_peer_platform.pl
   examples/platforms/syscoord/median_harvard.syscoord