X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a9daf6dc6023e088fc54646fbe95de0bf872f2d..9caf173e476622d309cc5653a83d224d05787cc7:/src/simix/smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index adcb65e55d..cdad122f8a 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -23,7 +23,7 @@
 #include "xbt/ex.h" /* ex_backtrace_display */
 
 #include "mc/mc.h"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/surf/StorageImpl.hpp"
 
@@ -103,7 +103,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
   } else  if (siginfo->si_signo == SIGSEGV) {
     fprintf(stderr, "Segmentation fault.\n");
 #if HAVE_SMPI
-    if (smpi_enabled() && smpi_privatize_global_variables == SMPI_PRIVATIZE_NONE) {
+    if (smpi_enabled() && smpi_privatize_global_variables == SmpiPrivStrategies::None) {
 #if HAVE_PRIVATIZATION
       fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n");
 #else
@@ -229,8 +229,8 @@ void SIMIX_global_init(int *argc, char **argv)
     });
 
     simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::StorageImpl* storage) {
-      sg_storage_t s = simgrid::s4u::Storage::byName(storage->getCname());
-      xbt_assert(s != nullptr, "Storage not found for name %s", storage->getCname());
+      sg_storage_t s = simgrid::s4u::Storage::byName(storage->get_cname());
+      xbt_assert(s != nullptr, "Storage not found for name %s", storage->get_cname());
     });
   }
 
@@ -337,15 +337,15 @@ static void SIMIX_wake_processes()
     XBT_DEBUG("Handling the processes whose action failed (if any)");
     while ((action = surf_model_extract_failed_action_set(model))) {
       XBT_DEBUG("   Handling Action %p",action);
-      SIMIX_simcall_exit(static_cast<simgrid::kernel::activity::ActivityImpl*>(action->getData()));
+      SIMIX_simcall_exit(static_cast<simgrid::kernel::activity::ActivityImpl*>(action->get_data()));
     }
     XBT_DEBUG("Handling the processes whose action terminated normally (if any)");
     while ((action = surf_model_extract_done_action_set(model))) {
       XBT_DEBUG("   Handling Action %p",action);
-      if (action->getData() == nullptr)
+      if (action->get_data() == nullptr)
         XBT_DEBUG("probably vcpu's action %p, skip", action);
       else
-        SIMIX_simcall_exit(static_cast<simgrid::kernel::activity::ActivityImpl*>(action->getData()));
+        SIMIX_simcall_exit(static_cast<simgrid::kernel::activity::ActivityImpl*>(action->get_data()));
     }
   }
 }
@@ -496,7 +496,7 @@ void SIMIX_run()
       /* If only daemon processes remain, cancel their actions, mark them to die and reschedule them */
       if (simix_global->process_list.size() == simix_global->daemons.size())
         for (auto const& dmon : simix_global->daemons) {
-          XBT_DEBUG("Kill %s", dmon->getCname());
+          XBT_DEBUG("Kill %s", dmon->get_cname());
           SIMIX_process_kill(dmon, simix_global->maestro_process);
         }
     }
@@ -523,7 +523,7 @@ void SIMIX_run()
 
     /* Autorestart all process */
     for (auto const& host : host_that_restart) {
-      XBT_INFO("Restart processes on host %s", host->getCname());
+      XBT_INFO("Restart processes on host %s", host->get_cname());
       SIMIX_host_autorestart(host);
     }
     host_that_restart.clear();
@@ -654,11 +654,11 @@ void SIMIX_display_process_status()
         synchro_description = "I/O";
 
       XBT_INFO("Process %ld (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid,
-               process->getCname(), process->host->getCname(), synchro_description, process->waiting_synchro.get(),
+               process->get_cname(), process->host->get_cname(), synchro_description, process->waiting_synchro.get(),
                process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state);
     }
     else {
-      XBT_INFO("Process %ld (%s@%s)", process->pid, process->getCname(), process->host->getCname());
+      XBT_INFO("Process %ld (%s@%s)", process->pid, process->get_cname(), process->host->get_cname());
     }
   }
 }