network/coordinates option is now useless

diff --git a/ChangeLog b/ChangeLog
index 8eb197e..e45415e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@ SimGrid (3.14) UNRELEASED; urgency=low
    and probably not really working) was deceiving what most users
    would have hoped here.
  * xbt_os_sem_get_value: unused internally, deprecated on OS X El Capitan
    and probably not really working) was deceiving what most users
    would have hoped here.
  * xbt_os_sem_get_value: unused internally, deprecated on OS X El Capitan

+ * Option network/coordinates is now useless and should be dropped.

 
  XML:
  * Add Exa- and Peta- units such as EiB, EB, Eib, Eb for size, and
 
  XML:
  * Add Exa- and Peta- units such as EiB, EB, Eib, Eb for size, and

diff --git a/doc/doxygen/options.doc b/doc/doxygen/options.doc
index 9bc8121..16cd1a3 100644 (file)
--- a/doc/doxygen/options.doc
+++ b/doc/doxygen/options.doc
@@ -265,14 +265,6 @@ can be set to 0 (disable this feature) or 1 (enable it).
 
 Note that with the default host model this option is activated by default.
 
 
 Note that with the default host model this option is activated by default.
 

-\subsubsection options_model_network_coord Coordinated-based network models
-
-When you want to use network coordinates, as it happens when you use
-an \<AS\> in your platform file with \c Vivaldi as a routing (see also
-Section \ref pf_routing_model_vivaldi "Vivaldi Routing Model"), you must
-set the \b network/coordinates to \c yes so that all mandatory
-initialization are done in the simulator.
-

 \subsubsection options_model_network_sendergap Simulating sender gap
 
 (this configuration item is experimental and may change or disapear)
 \subsubsection options_model_network_sendergap Simulating sender gap
 
 (this configuration item is experimental and may change or disapear)


@@ -1169,7 +1161,6 @@ silently overflow on other parts of the memory.
 - \c model-check/visited: \ref options_modelchecking_visited
 
 - \c network/bandwidth-factor: \ref options_model_network_coefs
 - \c model-check/visited: \ref options_modelchecking_visited
 
 - \c network/bandwidth-factor: \ref options_model_network_coefs

-- \c network/coordinates: \ref options_model_network_coord

 - \c network/crosstraffic: \ref options_model_network_crosstraffic
 - \c network/latency-factor: \ref options_model_network_coefs
 - \c network/maxmin-selective-update: \ref options_model_optim
 - \c network/crosstraffic: \ref options_model_network_crosstraffic
 - \c network/latency-factor: \ref options_model_network_coefs
 - \c network/maxmin-selective-update: \ref options_model_optim

diff --git a/doc/doxygen/platform.doc b/doc/doxygen/platform.doc
index 8137f80..badcbae 100644 (file)
--- a/doc/doxygen/platform.doc
+++ b/doc/doxygen/platform.doc
@@ -1737,16 +1737,13 @@ SimGrid allows you to use some coordinated-based system, like vivaldi,
 to describe a platform. The main concept is that you have some peers
 that are located somewhere: this is the function of the
 <b>coordinates</b> of the \<peer\> or \<host\> tag. There's nothing
 to describe a platform. The main concept is that you have some peers
 that are located somewhere: this is the function of the
 <b>coordinates</b> of the \<peer\> or \<host\> tag. There's nothing

-complicated in using it, here is an example of it:
+complicated in using it, here is an example:

 
 \verbatim
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="4">
 
 
 \verbatim
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="4">
 

-<config id="General">
-       <prop id="network/coordinates" value="yes"></prop>
-</config>

  <AS  id="AS0"  routing="Vivaldi">
        <host id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" />
        <host id="100036570" coordinates="-12.7 -9.9 2.1" speed="7.3Gf" />
  <AS  id="AS0"  routing="Vivaldi">
        <host id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" />
        <host id="100036570" coordinates="-12.7 -9.9 2.1" speed="7.3Gf" />


@@ -1774,9 +1771,6 @@ That is for example what is commonly done when using peers (see Section \ref pf_
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="4">
 
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="4">
 

-<config id="General">
- <prop id="network/coordinates" value="yes"></prop>
-</config>

  <AS  id="AS0"  routing="Vivaldi">
    <peer id="peer-0" coordinates="173.0 96.8 0.1" speed="730Mf" bw_in="13.38MBps" bw_out="1.024MBps" lat="500us"/>
    <peer id="peer-1" coordinates="247.0 57.3 0.6" speed="730Mf" bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
  <AS  id="AS0"  routing="Vivaldi">
    <peer id="peer-0" coordinates="173.0 96.8 0.1" speed="730Mf" bw_in="13.38MBps" bw_out="1.024MBps" lat="500us"/>
    <peer id="peer-1" coordinates="247.0 57.3 0.6" speed="730Mf" bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />

diff --git a/examples/java/app/tokenring/app_tokenring.tesh b/examples/java/app/tokenring/app_tokenring.tesh
index 589be45..930d76d 100644 (file)
--- a/examples/java/app/tokenring/app_tokenring.tesh
+++ b/examples/java/app/tokenring/app_tokenring.tesh
@@ -20,7 +20,6 @@ $ java -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/r
 
 $ java -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/two_peers.xml '--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n'
 > [    0.000000] (0:maestro@) Using regular java threads.
 
 $ java -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/two_peers.xml '--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n'
 > [    0.000000] (0:maestro@) Using regular java threads.

-> [    0.000000] (0:maestro@) Configuration change: Set 'network/coordinates' to 'yes'

 > [    0.000000] (0:maestro@) Number of hosts '2'
 > [    0.000000] (1:0@peer_100030591) Host '0' send 'Token' to Host '1'
 > [    0.637910] (2:1@peer_100036570) Host '1' received 'Token'
 > [    0.000000] (0:maestro@) Number of hosts '2'
 > [    0.000000] (1:0@peer_100030591) Host '0' send 'Token' to Host '1'
 > [    0.637910] (2:1@peer_100036570) Host '1' received 'Token'

diff --git a/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh b/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh
index 3b0eca3..9e49419 100644 (file)
--- a/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh
+++ b/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh
@@ -5,7 +5,6 @@ p Testing a simple master/worker example application
 $ $SG_TEST_EXENV ./app-masterworker/app-masterworker  ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/app-masterworker/app-masterworker-vivaldi_d.xml --cfg=network/latency-factor:1.0 --cfg=network/bandwidth-factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/latency-factor' to '1.0'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/bandwidth-factor' to '1.0'
 $ $SG_TEST_EXENV ./app-masterworker/app-masterworker  ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/app-masterworker/app-masterworker-vivaldi_d.xml --cfg=network/latency-factor:1.0 --cfg=network/bandwidth-factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/latency-factor' to '1.0'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/bandwidth-factor' to '1.0'

-> [  0.000000] (0:maestro@) Configuration change: Set 'network/coordinates' to 'yes'

 > [  0.000000] (1:master@100030591) Got 15 workers and 10 tasks to process
 > [  0.000000] (1:master@100030591) Sending "Task_0" (of 10) to mailbox "worker-0"
 > [  0.046299] (1:master@100030591) Sending "Task_1" (of 10) to mailbox "worker-1"
 > [  0.000000] (1:master@100030591) Got 15 workers and 10 tasks to process
 > [  0.000000] (1:master@100030591) Sending "Task_0" (of 10) to mailbox "worker-0"
 > [  0.046299] (1:master@100030591) Sending "Task_1" (of 10) to mailbox "worker-1"

diff --git a/examples/msg/app-token-ring/app-token-ring.tesh b/examples/msg/app-token-ring/app-token-ring.tesh
index 9c43aac..c21fa91 100644 (file)
--- a/examples/msg/app-token-ring/app-token-ring.tesh
+++ b/examples/msg/app-token-ring/app-token-ring.tesh
@@ -17,7 +17,6 @@ $ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${srcdir:=.}/routing_cluster.xml "-
 > [  0.131796] (0:maestro@) Simulation time 0.131796
 
 $ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${srcdir:=.}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.131796] (0:maestro@) Simulation time 0.131796
 
 $ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${srcdir:=.}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"

-> [    0.000000] (0:maestro@) Configuration change: Set 'network/coordinates' to 'yes'

 > [    0.000000] (0:maestro@) Number of hosts '2'
 > [    0.000000] (1:0@peer_100030591) Host "0" send 'Token' to Host "1"
 > [    0.637910] (2:1@peer_100036570) Host "1" received "Token"
 > [    0.000000] (0:maestro@) Number of hosts '2'
 > [    0.000000] (1:0@peer_100030591) Host "0" send 'Token' to Host "1"
 > [    0.637910] (2:1@peer_100036570) Host "1" received "Token"

diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml
index 33308fd..fe0774b 100644 (file)
--- a/examples/platforms/cloud.xml
+++ b/examples/platforms/cloud.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-  <config id="General">
-    <prop id="network/coordinates" value="yes"/>
-  </config>
-

   <AS id="AS0" routing="Vivaldi">
     <AS id="AS1_dc1" routing="Full">
       <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation -->
   <AS id="AS0" routing="Vivaldi">
     <AS id="AS1_dc1" routing="Full">
       <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation -->

diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml
index 6774021..807b0a0 100644 (file)
--- a/examples/platforms/data_center.xml
+++ b/examples/platforms/data_center.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-  <config id="General">
-    <prop id="network/coordinates" value="yes"/>
-  </config>

   <AS id="AS0" routing="Vivaldi">
     <AS id="dataCenter1" routing="Full">
       <!-- 3 cabinets, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
   <AS id="AS0" routing="Vivaldi">
     <AS id="dataCenter1" routing="Full">
       <!-- 3 cabinets, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->

diff --git a/examples/platforms/two_peers.xml b/examples/platforms/two_peers.xml
index 940b207..00d9768 100644 (file)
--- a/examples/platforms/two_peers.xml
+++ b/examples/platforms/two_peers.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-  <config id="General">
-    <prop id="network/coordinates" value="yes"></prop>
-  </config>

   <AS id="AS0" routing="Vivaldi">
     <peer id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" bw_in="2.25GBps" bw_out="2.25GBps" lat="500us" />
     <peer id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" bw_in="2.25GBps" bw_out="2.25GBps" lat="500us" />
   <AS id="AS0" routing="Vivaldi">
     <peer id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" bw_in="2.25GBps" bw_out="2.25GBps" lat="500us" />
     <peer id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" bw_in="2.25GBps" bw_out="2.25GBps" lat="500us" />

diff --git a/examples/platforms/vivaldi.xml b/examples/platforms/vivaldi.xml
index 926b88c..f93727d 100644 (file)
--- a/examples/platforms/vivaldi.xml
+++ b/examples/platforms/vivaldi.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">

-  <config id="General">
-    <prop id="network/coordinates" value="yes"></prop>
-  </config>

   <AS id="AS0" routing="Vivaldi">
     <host id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" />
     <host id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" />
   <AS id="AS0" routing="Vivaldi">
     <host id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" />
     <host id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" />

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 251ff47..621ca12 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -327,17 +327,6 @@ static void _sg_cfg_cb_contexts_parallel_mode(const char *name)
   }
 }
 
   }
 }
 

-static void _sg_cfg_cb__surf_network_coordinates(const char *name)
-{
-  static int already_set = 0;
-  int val = xbt_cfg_get_boolean(name);
-  if (val) {
-    already_set = 1;
-  } else
-    if (already_set)
-      xbt_die("Setting of whether to use coordinate cannot be disabled once set.");
-}
-

 static void _sg_cfg_cb__surf_network_crosstraffic(const char *name)
 {
   sg_network_crosstraffic = xbt_cfg_get_boolean(name);
 static void _sg_cfg_cb__surf_network_crosstraffic(const char *name)
 {
   sg_network_crosstraffic = xbt_cfg_get_boolean(name);


@@ -522,9 +511,6 @@ void sg_config_init(int *argc, char **argv)
         "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)");
 #endif
 
         "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)");
 #endif
 

-    xbt_cfg_register_boolean("network/coordinates", "no", _sg_cfg_cb__surf_network_coordinates,
-        "Whether we use a coordinate-based routing (as Vivaldi)");
-

     xbt_cfg_register_boolean("network/crosstraffic", "yes", _sg_cfg_cb__surf_network_crosstraffic,
         "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)");
 
     xbt_cfg_register_boolean("network/crosstraffic", "yes", _sg_cfg_cb__surf_network_crosstraffic,
         "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)");