From 30e3072c3212f02886f67c451e27bbb76b2b1add Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 10 Dec 2016 22:55:46 +0100 Subject: [PATCH] network/coordinates option is now useless --- ChangeLog | 1 + doc/doxygen/options.doc | 9 --------- doc/doxygen/platform.doc | 8 +------- examples/java/app/tokenring/app_tokenring.tesh | 1 - .../app-masterworker/app-masterworker-vivaldi.tesh | 1 - examples/msg/app-token-ring/app-token-ring.tesh | 1 - examples/platforms/cloud.xml | 4 ---- examples/platforms/data_center.xml | 3 --- examples/platforms/two_peers.xml | 3 --- examples/platforms/vivaldi.xml | 3 --- src/simgrid/sg_config.cpp | 14 -------------- 11 files changed, 2 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8eb197e607..e45415e02d 100644 --- 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 + * 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 diff --git a/doc/doxygen/options.doc b/doc/doxygen/options.doc index 9bc8121094..16cd1a32ba 100644 --- 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. -\subsubsection options_model_network_coord Coordinated-based network models - -When you want to use network coordinates, as it happens when you use -an \ 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) @@ -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 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 diff --git a/doc/doxygen/platform.doc b/doc/doxygen/platform.doc index 8137f80862..badcbae755 100644 --- 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 coordinates of the \ or \ tag. There's nothing -complicated in using it, here is an example of it: +complicated in using it, here is an example: \verbatim - - - @@ -1774,9 +1771,6 @@ That is for example what is commonly done when using peers (see Section \ref pf_ - - - diff --git a/examples/java/app/tokenring/app_tokenring.tesh b/examples/java/app/tokenring/app_tokenring.tesh index 589be45098..930d76d809 100644 --- 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. -> [ 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' diff --git a/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh b/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh index 3b0eca36bf..9e49419702 100644 --- 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' -> [ 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" diff --git a/examples/msg/app-token-ring/app-token-ring.tesh b/examples/msg/app-token-ring/app-token-ring.tesh index 9c43aac011..c21fa9184b 100644 --- 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.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" diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml index 33308fd982..fe0774bd8c 100644 --- a/examples/platforms/cloud.xml +++ b/examples/platforms/cloud.xml @@ -1,10 +1,6 @@ - - - - diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml index 6774021044..807b0a0c8c 100644 --- a/examples/platforms/data_center.xml +++ b/examples/platforms/data_center.xml @@ -1,9 +1,6 @@ - - - diff --git a/examples/platforms/two_peers.xml b/examples/platforms/two_peers.xml index 940b207edf..00d976883c 100644 --- a/examples/platforms/two_peers.xml +++ b/examples/platforms/two_peers.xml @@ -1,9 +1,6 @@ - - - diff --git a/examples/platforms/vivaldi.xml b/examples/platforms/vivaldi.xml index 926b88c005..f93727d9e4 100644 --- a/examples/platforms/vivaldi.xml +++ b/examples/platforms/vivaldi.xml @@ -1,9 +1,6 @@ - - - diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 251ff478b7..621ca12c0c 100644 --- 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); @@ -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 - 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)"); -- 2.20.1