bugs and smells

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 3c94c9d..9f09cc2 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -57,9 +57,8 @@ typedef struct s_smx_timer {
   double date = 0.0;
   simgrid::xbt::Task<void()> callback;
 
-  s_smx_timer() {}
-  s_smx_timer(double date, simgrid::xbt::Task<void()> callback)
-    : date(date), callback(std::move(callback)) {}
+  s_smx_timer()=default;
+  s_smx_timer(double date, simgrid::xbt::Task<void()> callback) : date(date), callback(std::move(callback)) {}
 } s_smx_timer_t;
 
 void (*SMPI_switch_data_segment)(int) = nullptr;
@@ -91,8 +90,7 @@ static void segvhandler(int signum, siginfo_t *siginfo, void *context)
             "Try to increase stack size with --cfg=contexts/stack_size (current size is %d KiB).\n",
             smx_context_stack_size / 1024);
     if (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
-      fprintf(stderr,
-              "siginfo = {si_signo = %d, si_errno = %d, si_code = %d, si_addr = %p}\n",
+      fprintf(stderr, "siginfo = {si_signo = %d, si_errno = %d, si_code = %d, si_addr = %p}\n",
               siginfo->si_signo, siginfo->si_errno, siginfo->si_code, siginfo->si_addr);
     }
   } else  if (siginfo->si_signo == SIGSEGV) {
@@ -100,11 +98,9 @@ static void segvhandler(int signum, siginfo_t *siginfo, void *context)
 #if HAVE_SMPI
     if (smpi_enabled() && !smpi_privatize_global_variables) {
 #if HAVE_PRIVATIZATION
-      fprintf(stderr,
-        "Try to enable SMPI variable privatization with --cfg=smpi/privatize-global-variables:yes.\n");
+      fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatize-global-variables:yes.\n");
 #else
-      fprintf(stderr,
-        "Sadly, your system does not support --cfg=smpi/privatize-global-variables:yes (yet).\n");
+      fprintf(stderr, "Sadly, your system does not support --cfg=smpi/privatize-global-variables:yes (yet).\n");
 #endif /* HAVE_PRIVATIZATION */
     }
 #endif /* HAVE_SMPI */
@@ -146,8 +142,7 @@ static void install_segvhandler()
   }
   if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) {
     XBT_DEBUG("A signal handler was already installed for SIGSEGV (%p). Restore it.",
-             (old_action.sa_flags & SA_SIGINFO) ?
-             (void*)old_action.sa_sigaction : (void*)old_action.sa_handler);
+             (old_action.sa_flags & SA_SIGINFO) ? (void*)old_action.sa_sigaction : (void*)old_action.sa_handler);
     sigaction(SIGSEGV, &old_action, nullptr);
   }
 }
@@ -265,7 +260,8 @@ int smx_cleaned = 0;
  */
 void SIMIX_clean()
 {
-  if (smx_cleaned) return; // to avoid double cleaning by java and C
+  if (smx_cleaned)
+    return; // to avoid double cleaning by java and C
 
 #if HAVE_SMPI
   if (SIMIX_process_count()>0){
@@ -280,7 +276,7 @@ void SIMIX_clean()
 
   smx_cleaned = 1;
   XBT_DEBUG("SIMIX_clean called. Simulation's over.");
-  if (!xbt_dynar_is_empty(simix_global->process_to_run) && SIMIX_get_clock() == 0.0) {
+  if (!xbt_dynar_is_empty(simix_global->process_to_run) && SIMIX_get_clock() <= 0.0) {
     XBT_CRITICAL("   ");
     XBT_CRITICAL("The time is still 0, and you still have processes ready to run.");
     XBT_CRITICAL("It seems that you forgot to run the simulation that you setup.");
@@ -434,14 +430,12 @@ void SIMIX_run()
   smx_process_t process;
 
   do {
-    XBT_DEBUG("New Schedule Round; size(queue)=%lu",
-        xbt_dynar_length(simix_global->process_to_run));
+    XBT_DEBUG("New Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run));
 
     SIMIX_execute_tasks();
 
     while (!xbt_dynar_is_empty(simix_global->process_to_run)) {
-      XBT_DEBUG("New Sub-Schedule Round; size(queue)=%lu",
-              xbt_dynar_length(simix_global->process_to_run));
+      XBT_DEBUG("New Sub-Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run));
 
       /* Run all processes that are ready to run, possibly in parallel */
       SIMIX_process_runall();
@@ -519,7 +513,7 @@ void SIMIX_run()
     }
 
     time = SIMIX_timer_next();
-    if (time != -1.0 || xbt_swag_size(simix_global->process_list) != 0) {
+    if (time > -1.0 || xbt_swag_size(simix_global->process_list) != 0) {
       XBT_DEBUG("Calling surf_solve");
       time = surf_solve(time);
       XBT_DEBUG("Moving time ahead : %g", time);
@@ -552,7 +546,7 @@ void SIMIX_run()
 
     XBT_DEBUG("### time %f, empty %d", time, xbt_dynar_is_empty(simix_global->process_to_run));
 
-  } while (time != -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
+  } while (time > -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
 
   if (xbt_swag_size(simix_global->process_list) != 0) {
 
@@ -613,13 +607,12 @@ void SIMIX_function_register_process_create(smx_creation_func_t function)
 /**
  * \brief Registers a function to kill a process.
  *
- * This function registers a function to be called when a
- * process is killed. The function has to call the SIMIX_process_kill().
+ * This function registers a function to be called when a process is killed. The function has to call the
+ * SIMIX_process_kill().
  *
  * \param function Kill process function
  */
-void SIMIX_function_register_process_kill(void_pfn_smxprocess_t
-                                                     function)
+void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function)
 {
   simix_global->kill_process_function = function;
 }
@@ -627,13 +620,11 @@ void SIMIX_function_register_process_kill(void_pfn_smxprocess_t
 /**
  * \brief Registers a function to cleanup a process.
  *
- * This function registers a user function to be called when
- * a process ends properly.
+ * This function registers a user function to be called when a process ends properly.
  *
  * \param function cleanup process function
  */
-void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t
-                                                        function)
+void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function)
 {
   simix_global->cleanup_process_function = function;
 }
@@ -650,8 +641,7 @@ void SIMIX_display_process_status()
 
   XBT_INFO("%d processes are still running, waiting for something.", nbprocess);
   /*  List the process and their state */
-  XBT_INFO
-    ("Legend of the following listing: \"Process <pid> (<name>@<host>): <status>\"");
+  XBT_INFO("Legend of the following listing: \"Process <pid> (<name>@<host>): <status>\"");
   xbt_swag_foreach(process, simix_global->process_list) {
 
     if (process->waiting_synchro) {
@@ -701,7 +691,7 @@ xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char
 }
 xbt_dict_t SIMIX_asr_get_properties(const char *name)
 {
-  return (xbt_dict_t) xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);
+  return static_cast<xbt_dict_t>(xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL));
 }
 
 int SIMIX_is_maestro()

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index eb06430..5212967 100644 (file)
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -29,7 +29,8 @@ The energy consumption of a CPU depends directly of its current load. Specify th
 
 The first property means that when your host is up and running, but without anything to do, it will dissipate 100 Watts.
 If it's fully loaded, it will dissipate 200 Watts. If its load is at 50%, then it will dissipate 150 Watts.
-The second property means that when your host is turned off, it will dissipate only 10 Watts (please note that these values are arbitrary).
+The second property means that when your host is turned off, it will dissipate only 10 Watts (please note that these
+values are arbitrary).
 
 If your CPU is using pstates, then you can provide one consumption interval per pstate.
 
@@ -41,18 +42,19 @@ If your CPU is using pstates, then you can provide one consumption interval per
 \endverbatim
 
 That host has 3 levels of performance with the following performance: 100 Mflop/s, 50 Mflop/s or 20 Mflop/s.
-It starts at pstate 0 (ie, at 100 Mflop/s). In this case, you have to specify one interval per pstate in the watt_per_state property.
-In this example, the idle consumption is 95 Watts, 93 Watts and 90 Watts in each pstate while the CPU burn consumption are at 200 Watts,
-170 Watts and 150 Watts respectively.
+It starts at pstate 0 (ie, at 100 Mflop/s). In this case, you have to specify one interval per pstate in the
+watt_per_state property.
+In this example, the idle consumption is 95 Watts, 93 Watts and 90 Watts in each pstate while the CPU burn consumption
+are at 200 Watts, 170 Watts, and 150 Watts respectively.
 
-To change the pstate of a given CPU, use the following functions: #MSG_host_get_nb_pstates(), simgrid#s4u#Host#set_pstate(), #MSG_host_get_power_peak_at().
+To change the pstate of a given CPU, use the following functions:
+#MSG_host_get_nb_pstates(), simgrid#s4u#Host#set_pstate(), #MSG_host_get_power_peak_at().
 
 To simulate the energy-related elements, first call the simgrid#energy#sg_energy_plugin_init() before your #MSG_init(),
 and then use the following function to retrieve the consumption of a given host: MSG_host_get_consumed_energy().
  */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_energy, surf,
-                                "Logging specific to the SURF energy plugin");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_energy, surf, "Logging specific to the SURF energy plugin");
 
 using simgrid::energy::HostEnergy;
 
@@ -68,13 +70,12 @@ void HostEnergy::update()
   double start_time = this->last_updated;
   double finish_time = surf_get_clock();
   double cpu_load;
-  if (surf_host->p_cpu->speed_.peak == 0)
-    // Some users declare a pstate of speed 0 flops (eg to model boot time).
+  if (surf_host->p_cpu->speed_.peak <= 0)
+    // Some users declare a pstate of speed 0 flops (e.g., to model boot time).
     // We consider that the machine is then fully loaded. That's arbitrary but it avoids a NaN
     cpu_load = 1;
   else
-    cpu_load = lmm_constraint_get_usage(surf_host->p_cpu->getConstraint())
-                / surf_host->p_cpu->speed_.peak;
+    cpu_load = lmm_constraint_get_usage(surf_host->p_cpu->getConstraint()) / surf_host->p_cpu->speed_.peak;
 
   if (cpu_load > 1) // A machine with a load > 1 consumes as much as a fully loaded machine, not mores
     cpu_load = 1;
@@ -96,8 +97,7 @@ void HostEnergy::update()
       surf_host->getName(), start_time, finish_time, surf_host->p_cpu->speed_.peak, previous_energy, energy_this_step);
 }
 
-HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) :
-  host(ptr), last_updated(surf_get_clock())
+HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : host(ptr), last_updated(surf_get_clock())
 {
   initWattsRangeList();
 
@@ -111,32 +111,26 @@ HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) :
     else
       watts_off = 0;
   }
-
 }
 
-HostEnergy::~HostEnergy()
-{
-}
+HostEnergy::~HostEnergy()=default;
 
 double HostEnergy::getWattMinAt(int pstate)
 {
-  xbt_assert(!power_range_watts_list.empty(),
-    "No power range properties specified for host %s", host->name().c_str());
+  xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->name().c_str());
   return power_range_watts_list[pstate].first;
 }
 
 double HostEnergy::getWattMaxAt(int pstate)
 {
-  xbt_assert(!power_range_watts_list.empty(),
-    "No power range properties specified for host %s", host->name().c_str());
+  xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->name().c_str());
   return power_range_watts_list[pstate].second;
 }
 
 /** @brief Computes the power consumed by the host according to the current pstate and processor load */
 double HostEnergy::getCurrentWattsValue(double cpu_load)
 {
-  xbt_assert(!power_range_watts_list.empty(),
-    "No power range properties specified for host %s", host->name().c_str());
+  xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->name().c_str());
 
   /* min_power corresponds to the idle power (cpu load = 0) */
   /* max_power is the power consumed at 100% cpu load       */
@@ -164,21 +158,18 @@ void HostEnergy::initWattsRangeList()
 {
   if (host->properties() == nullptr)
     return;
-  char* all_power_values_str =
-    (char*)xbt_dict_get_or_null(host->properties(), "watt_per_state");
+  char* all_power_values_str = static_cast<char*>(xbt_dict_get_or_null(host->properties(), "watt_per_state"));
   if (all_power_values_str == nullptr)
     return;
 
   xbt_dynar_t all_power_values = xbt_str_split(all_power_values_str, ",");
   int pstate_nb = xbt_dynar_length(all_power_values);
 
-  for (int i=0; i< pstate_nb; i++)
-  {
+  for (int i=0; i< pstate_nb; i++) {
     /* retrieve the power values associated with the current pstate */
     xbt_dynar_t current_power_values = xbt_str_split(xbt_dynar_get_as(all_power_values, i, char*), ":");
     xbt_assert(xbt_dynar_length(current_power_values) > 1,
-        "Power properties incorrectly defined - "
-        "could not retrieve min and max power values for host %s",
+        "Power properties incorrectly defined - could not retrieve min and max power values for host %s",
         host->name().c_str());
 
     /* min_power corresponds to the idle power (cpu load = 0) */
@@ -244,8 +235,7 @@ static void onHostDestruction(simgrid::s4u::Host& host) {
     return;
   HostEnergy *host_energy = host.extension<HostEnergy>();
   host_energy->update();
-  XBT_INFO("Total energy of host %s: %f Joules",
-    host.name().c_str(), host_energy->getConsumedEnergy());
+  XBT_INFO("Total energy of host %s: %f Joules", host.name().c_str(), host_energy->getConsumedEnergy());
 }
 
 /* **************************** Public interface *************************** */
@@ -272,22 +262,19 @@ void sg_energy_plugin_init()
  */
 double sg_host_get_consumed_energy(sg_host_t host) {
   xbt_assert(HostEnergy::EXTENSION_ID.valid(),
-    "The Energy plugin is not active. "
-    "Please call sg_energy_plugin_init() during initialization.");
+    "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
   return host->extension<HostEnergy>()->getConsumedEnergy();
 }
 
 /** @brief Get the amount of watt dissipated at the given pstate when the host is idling */
 double sg_host_get_wattmin_at(sg_host_t host, int pstate) {
   xbt_assert(HostEnergy::EXTENSION_ID.valid(),
-    "The Energy plugin is not active. "
-    "Please call sg_energy_plugin_init() during initialization.");
+    "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
   return host->extension<HostEnergy>()->getWattMinAt(pstate);
 }
 /** @brief  Returns the amount of watt dissipated at the given pstate when the host burns CPU at 100% */
 double sg_host_get_wattmax_at(sg_host_t host, int pstate) {
   xbt_assert(HostEnergy::EXTENSION_ID.valid(),
-    "The Energy plugin is not active. "
-    "Please call sg_energy_plugin_init() during initialization.");
+    "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
   return host->extension<HostEnergy>()->getWattMaxAt(pstate);
 }