Remove some more occurence of 'surf' in comments and such

diff --git a/docs/source/tuto_network_calibration/network_calibration_tutorial.ipynb b/docs/source/tuto_network_calibration/network_calibration_tutorial.ipynb
index bac5f75..8f7ebf2 100644 (file)
--- a/docs/source/tuto_network_calibration/network_calibration_tutorial.ipynb
+++ b/docs/source/tuto_network_calibration/network_calibration_tutorial.ipynb
@@ -10154,7 +10154,7 @@
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/privatization' to '1'\n",
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/np' to '2'\n",
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/hostfile' to '/tmp/host.txt'\n",
-      "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9'\n",
+      "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'precision/timing' to '1e-9'\n",
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'\n",
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/simulate-computation' to '0'\n",
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/display-timing' to 'yes'\n",
@@ -10246,7 +10246,7 @@
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/privatization' to '1'\n",
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/np' to '2'\n",
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/hostfile' to '/tmp/host.txt'\n",
-      "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9'\n",
+      "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'precision/timing' to '1e-9'\n",
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'\n",
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/simulate-computation' to '0'\n",
       "[0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/display-timing' to 'yes'\n",

diff --git a/examples/c/platform-failures/platform-failures.tesh b/examples/c/platform-failures/platform-failures.tesh
index 54fae56..74e5c71 100644 (file)
--- a/examples/c/platform-failures/platform-failures.tesh
+++ b/examples/c/platform-failures/platform-failures.tesh
@@ -214,7 +214,7 @@ p NOT testing the mixture of failures and CpuTI:
 p This test leads to a deadlock because of a bug somewhere in EngineImpl::solve.
 p We should debug this instead of ignoring the issue, but it's utterly
 p   complex with such an integration test. One day, we will setup a set of
-p   unit tests for the surf solver, and such issues will be addressable again.
+p   unit tests for the model's solver, and such issues will be addressable again.
 p For the time being, I just give up, sorry.
 
 p $ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../cpp/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=res_cpu.t:verbose

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 3e170be..075d7ff 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -556,8 +556,7 @@ double EngineImpl::solve(double max_date) const
         XBT_DEBUG("This event invalidates the next_occurring_event() computation of models. Next event set to %f",
                   time_delta);
       }
-      // FIXME: I'm too lame to update now_ live, so I change it and restore it so that the real update with surf_min
-      // will work
+      // FIXME: I'm too lame to update now_ live, so I change it and restore it so that the real update works
       double round_start = now_;
       now_               = next_event_date;
       /* update state of the corresponding resource to the new value. Does not touch lmm.

diff --git a/src/kernel/resource/VirtualMachineImpl.cpp b/src/kernel/resource/VirtualMachineImpl.cpp
index d2d1156..42404db 100644 (file)
--- a/src/kernel/resource/VirtualMachineImpl.cpp
+++ b/src/kernel/resource/VirtualMachineImpl.cpp
@@ -333,7 +333,6 @@ void VirtualMachineImpl::shutdown(actor::ActorImpl* issuer)
   set_state(s4u::VirtualMachine::State::DESTROYED);
 
   s4u::VirtualMachine::on_shutdown(*get_iface());
-  /* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
 }
 
 /** @brief Change the physical host on which the given VM is running

diff --git a/src/kernel/resource/models/network_ns3.cpp b/src/kernel/resource/models/network_ns3.cpp
index 5187493..238218a 100644 (file)
--- a/src/kernel/resource/models/network_ns3.cpp
+++ b/src/kernel/resource/models/network_ns3.cpp
@@ -37,7 +37,7 @@
 #include "simgrid/plugins/energy.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/NetZone.hpp"
-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the signals
 #include "src/kernel/EngineImpl.hpp"
 #include "src/surf/xml/platf_private.hpp" // ClusterCreationArgs
 
@@ -397,9 +397,9 @@ double NetworkNS3Model::next_occurring_event(double now)
   if (double_equals(time_to_next_flow_completion, 0, sg_precision_timing))
     time_to_next_flow_completion = 0.0;
 
-  XBT_DEBUG("min       : %f", now);
-  XBT_DEBUG("ns3  time : %f", ns3::Simulator::Now().GetSeconds());
-  XBT_DEBUG("surf time : %f", EngineImpl::get_clock());
+  XBT_DEBUG("min         : %f", now);
+  XBT_DEBUG("ns-3 time   : %f", ns3::Simulator::Now().GetSeconds());
+  XBT_DEBUG("simgrid time: %f", EngineImpl::get_clock());
   XBT_DEBUG("Next completion %f :", time_to_next_flow_completion);
 
   return time_to_next_flow_completion;

diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp
index 14c1b88..0c12b38 100644 (file)
--- a/src/kernel/routing/NetZoneImpl.cpp
+++ b/src/kernel/routing/NetZoneImpl.cpp
@@ -33,9 +33,9 @@ NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name)
 {
   auto* engine = s4u::Engine::get_instance();
   /* workaroud: first netzoneImpl will be the root netzone.
-   * Without globals and with current surf_*_model_description init functions, we need
+   * Without globals and with current model description init functions (see module.hpp), we need
    * the root netzone to exist when creating the models.
-   * This was usually done at sg_platf.cpp, during XML parsing */
+   * This is usually done at sg_platf.cpp, during XML parsing */
   if (not engine->get_netzone_root()) {
     engine->set_netzone_root(&piface_);
     /* root netzone set, initialize models */

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index 3238ec8..019b492 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -128,7 +128,7 @@ static void explodesRadical(const std::string& radicals, std::vector<int>* explo
 
 static std::vector<std::unordered_map<std::string, std::string>> property_sets;
 
-static FILE* surf_file_to_parse = nullptr;
+static FILE* file_to_parse = nullptr;
 
 /* Stuff relative to storage */
 void STag_simgrid_parse_storage()
@@ -833,7 +833,7 @@ void ETag_simgrid_parse_argument(){/* Nothing to do */}
 void ETag_simgrid_parse_model___prop(){/* Nothing to do */}
 
 /* Open and Close parse file */
-static YY_BUFFER_STATE surf_input_buffer;
+static YY_BUFFER_STATE input_buffer;
 
 void simgrid_parse_open(const std::string& file)
 {
@@ -841,12 +841,12 @@ void simgrid_parse_open(const std::string& file)
   std::string dir      = simgrid::xbt::Path(file).get_dir_name();
   simgrid::xbt::path_push(dir);
 
-  surf_file_to_parse = simgrid::xbt::path_fopen(file, "r");
-  if (surf_file_to_parse == nullptr)
+  file_to_parse = simgrid::xbt::path_fopen(file, "r");
+  if (file_to_parse == nullptr)
     throw std::invalid_argument("Unable to open '" + file + "' from '" + simgrid::xbt::Path().get_name() +
                                 "'. Does this file exist?");
-  surf_input_buffer = simgrid_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
-  simgrid_parse__switch_to_buffer(surf_input_buffer);
+  input_buffer = simgrid_parse__create_buffer(file_to_parse, YY_BUF_SIZE);
+  simgrid_parse__switch_to_buffer(input_buffer);
   simgrid_parse_lineno = 1;
 }
 
@@ -854,10 +854,10 @@ void simgrid_parse_close()
 {
   simgrid::xbt::path_pop(); // remove the dirname of the opened file, that was added in simgrid_parse_open()
 
-  if (surf_file_to_parse) {
-    simgrid_parse__delete_buffer(surf_input_buffer);
-    fclose(surf_file_to_parse);
-    surf_file_to_parse = nullptr; //Must be reset for Bypass
+  if (file_to_parse) {
+    simgrid_parse__delete_buffer(input_buffer);
+    fclose(file_to_parse);
+    file_to_parse = nullptr; // Must be reset for Bypass
   }
 }
 

diff --git a/teshsuite/s4u/activity-lifecycle/testing_comm.cpp b/teshsuite/s4u/activity-lifecycle/testing_comm.cpp
index 04fb363..9f16b73 100644 (file)
--- a/teshsuite/s4u/activity-lifecycle/testing_comm.cpp
+++ b/teshsuite/s4u/activity-lifecycle/testing_comm.cpp
@@ -172,7 +172,7 @@ TEST_CASE("Activity lifecycle: comm activities")
     simgrid::s4u::this_actor::sleep_for(2);
     receiver_basic(recv_done, true, 1);
 
-    // Sleep long enough to let the test ends by itself. 1 + surf_precision should be enough.
+    // Sleep long enough to let the test ends by itself. 1 + precision_timing should be enough.
     simgrid::s4u::this_actor::sleep_for(4);
     INFO("Sender or receiver killed somehow. It shouldn't");
     REQUIRE(dsend_done);
@@ -191,7 +191,7 @@ TEST_CASE("Activity lifecycle: comm activities")
     simgrid::s4u::this_actor::sleep_for(2);
     sender_dtach(dsend_done, true, 0);
 
-    // Sleep long enough to let the test ends by itself. 3 + surf_precision should be enough.
+    // Sleep long enough to let the test ends by itself. 3 + precision_timing should be enough.
     simgrid::s4u::this_actor::sleep_for(4);
     INFO("Sender or receiver killed somehow. It shouldn't");
     REQUIRE(dsend_done);
@@ -219,7 +219,7 @@ TEST_CASE("Activity lifecycle: comm activities")
 
     simgrid::s4u::this_actor::sleep_for(2);
     sender->kill();
-    // let the test ends by itself. waiting for surf_precision should be enough.
+    // let the test ends by itself. waiting for precision_timing should be enough.
     simgrid::s4u::this_actor::sleep_for(0.00001);
 
     INFO("Sender was not killed properly or receiver killed somehow. It shouldn't");