rename some fields (change toto to toto_)

[simgrid.git] / src / simix / smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index dfee2be..a4a9b7a 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -537,8 +537,6 @@ void SIMIX_run()
 
   if (not simix_global->process_list.empty()) {
 
-    TRACE_end();
-
     if (simix_global->process_list.size() <= simix_global->daemons.size()) {
       XBT_CRITICAL("Oops! Daemon actors cannot do any blocking activity (communications, synchronization, etc) "
                    "once the simulation is over. Please fix your on_exit() functions.");
@@ -546,10 +544,10 @@ void SIMIX_run()
       XBT_CRITICAL("Oops! Deadlock or code not perfectly clean.");
     }
     SIMIX_display_process_status();
-    simgrid::s4u::onDeadlock();
+    simgrid::s4u::on_deadlock();
     xbt_abort();
   }
-  simgrid::s4u::onSimulationEnd();
+  simgrid::s4u::on_simulation_end();
 }
 
 /**
@@ -656,7 +654,7 @@ void SIMIX_display_process_status()
 
       XBT_INFO("Process %ld (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid,
                process->get_cname(), process->host->get_cname(), synchro_description, process->waiting_synchro.get(),
-               process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state);
+               process->waiting_synchro->name_.c_str(), (int)process->waiting_synchro->state_);
     }
     else {
       XBT_INFO("Process %ld (%s@%s)", process->pid, process->get_cname(), process->host->get_cname());