move VM into their namespace, and greatly reduce the amount of sg_host_get_name ...

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

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 3ed4bf4..6ed45ba 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -176,6 +176,9 @@ XBT_PUBLIC(void) set_maestro(std::function<void()> code)
 
 void SIMIX_set_maestro(void (*code)(void*), void* data)
 {
+#ifdef _WIN32
+  XBT_INFO("WARNING, SIMIX_set_maestro is believed to not work on windows. Please help us investigating this issue if you need that feature");
+#endif
   maestro_code = std::bind(code, data);
 }
 
@@ -532,7 +535,7 @@ void SIMIX_run()
 
     /* Autorestart all process */
     for (auto host: host_that_restart) {
-      XBT_INFO("Restart processes on host: %s", sg_host_get_name(host));
+      XBT_INFO("Restart processes on host %s", host->cname());
       SIMIX_host_autorestart(host);
     }
     host_that_restart.clear();
@@ -675,13 +678,12 @@ void SIMIX_display_process_status()
         break;
 */
 
-      XBT_INFO("Process %lu (%s@%s): waiting for %s synchro %p (%s) in state %d to finish",
-          process->pid, process->name.c_str(), sg_host_get_name(process->host),
-          synchro_description, process->waiting_synchro,
-          process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state);
+      XBT_INFO("Process %lu (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid,
+               process->cname(), process->host->cname(), synchro_description, process->waiting_synchro,
+               process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state);
     }
     else {
-      XBT_INFO("Process %lu (%s@%s)", process->pid, process->name.c_str(), sg_host_get_name(process->host));
+      XBT_INFO("Process %lu (%s@%s)", process->pid, process->cname(), process->host->cname());
     }
   }
 }