finish the s/FULLDUPLEX/SPLITDUPLEX/

diff --git a/ChangeLog b/ChangeLog
index 73bddf2..8761b39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@ SimGrid (3.19) NOT RELEASED YET (target: March 20 2018, 16:15:27 UTC)
  Fixed bugs:
  - #245: migrating an actor does not migrate its execution
 
+ PLATFORM:
+ - Rename FULLDUPLEX into SPLITDUPLEX (old name still accepted)
+
  TRACING
  - Remove unused run-time parameter "tracing/onelink-only".
 

diff --git a/examples/platforms/cluster_backbone.xml b/examples/platforms/cluster_backbone.xml
index 36211cb..46ede2e 100644 (file)
--- a/examples/platforms/cluster_backbone.xml
+++ b/examples/platforms/cluster_backbone.xml
@@ -46,7 +46,7 @@
            bb_bw="2.25GBps"  bb_lat="500us"/>
           
 
-  <!-- This cluster has a backbone link, but no links are fullduplex.
+  <!-- This cluster has a backbone link, but no links are splitduplex.
     -- It means that up and down communications compete as if they
     -- were using exactly the same resource. If you send and receive
     -- at the same time, then each get half of the bandwidth.

diff --git a/examples/platforms/cluster_prototype.lua b/examples/platforms/cluster_prototype.lua
index 51f4dc4..b198e12 100644 (file)
--- a/examples/platforms/cluster_prototype.lua
+++ b/examples/platforms/cluster_prototype.lua
@@ -60,7 +60,7 @@
     id="AS0",
     bw="125MBps",
     lat="50us",
-    sharing_sharing_policy="FULLDUPLEX"
+    sharing_sharing_policy="SPLITDUPLEX"
   }()
   --my_cluster{prefix="node2-", suffix=".acme.org", radical=seq(0,44) }
 

diff --git a/examples/platforms/storage/content/storage_content.txt b/examples/platforms/storage/content/storage_content.txt
index ec8ccf8..7917cb1 100644 (file)
--- a/examples/platforms/storage/content/storage_content.txt
+++ b/examples/platforms/storage/content/storage_content.txt
@@ -159,11 +159,11 @@
 /doc/simgrid/examples/msg/sendrecv/sendrecv.c  5098
 /doc/simgrid/examples/msg/sendrecv/platform_sendrecv.xml  528
 /doc/simgrid/examples/msg/gtnets/onelink-p.xml 439
-/doc/simgrid/examples/msg/gtnets/fullduplex-p.xml 575
+/doc/simgrid/examples/msg/gtnets/splitduplex-p.xml 575
 /doc/simgrid/examples/msg/gtnets/dogbone-d.xml 576
 /doc/simgrid/examples/msg/gtnets/waxman-d.xml  46642
 /doc/simgrid/examples/msg/gtnets/waxman-p.xml 4964600  
-/doc/simgrid/examples/msg/gtnets/fullduplex-d.xml 1029
+/doc/simgrid/examples/msg/gtnets/splitduplex-d.xml 1029
 /doc/simgrid/examples/msg/gtnets/onelink-d.xml 356
 /doc/simgrid/examples/msg/gtnets/gtnets.c  6172
 /doc/simgrid/examples/msg/gtnets/dogbone-p.xml 1482

diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp
index f554dfe..13619bc 100644 (file)
--- a/include/simgrid/s4u/Link.hpp
+++ b/include/simgrid/s4u/Link.hpp
@@ -48,7 +48,7 @@ public:
   /** @brief Get the latency in seconds of current Link */
   double latency();
 
-  /** @brief The sharing policy is a @{link e_surf_link_sharing_policy_t::EType} (0: FATPIPE, 1: SHARED, 2: FULLDUPLEX)
+  /** @brief The sharing policy is a @{link e_surf_link_sharing_policy_t::EType} (0: FATPIPE, 1: SHARED, 2: SPLITDUPLEX)
    */
   int sharingPolicy();
 

diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt
index 3e8259f..f059384 100644 (file)
--- a/teshsuite/simdag/CMakeLists.txt
+++ b/teshsuite/simdag/CMakeLists.txt
@@ -38,7 +38,7 @@ set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_h
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/host_attributes.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link_attributes.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_multicore.xml
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_fullduplex.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_splitduplex.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_router_id.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_4p_1switch.xml
@@ -51,7 +51,7 @@ set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_h
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_missing_src_gateway.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_missing_dst_gateway.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_two_hosts_asymetric.xml
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link_fullduplex.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link_splitduplex.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/Dijkstra.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1bb.xml

diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
index 12a911e..3e6a786 100644 (file)
--- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
+++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
@@ -1,7 +1,7 @@
 #!/usr/bin/env tesh
 ! output sort
 
-$ ${bindir:=.}/basic-parsing-test ../platforms/one_cluster_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../platforms/one_cluster_splitduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
 > Workstation number: 5, link number: 12
 > Route between bob3.hamburger.edu and bob3.hamburger.edu
@@ -294,7 +294,7 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link.xml FULL_LINK
 >   Route latency = 0.000015, route bandwidth = 498000000.000000
 
 ! output sort
-$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_splitduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
 > Workstation number: 2, link number: 3
 > Route between alice and alice

diff --git a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml b/teshsuite/simdag/platforms/one_cluster_splitduplex.xml
similarity index 100%
rename from teshsuite/simdag/platforms/one_cluster_fullduplex.xml
rename to teshsuite/simdag/platforms/one_cluster_splitduplex.xml

diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml b/teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml
similarity index 100%
rename from teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
rename to teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml