Energy: Fixed host parsing assertion + mem leak

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

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 534807a..6ed45ba 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -80,14 +80,13 @@ static void inthandler(int ignored)
 static void segvhandler(int signum, siginfo_t *siginfo, void *context)
 {
   if (siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) {
-    fprintf(stderr,
-            "Access violation detected.\n"
-            "This can result from a programming error in your code or, although less likely,\n"
-            "from a bug in SimGrid itself.  This can also be the sign of a bug in the OS or\n"
-            "in third-party libraries.  Failing hardware can sometimes generate such errors\n"
-            "too.\n"
-            "Finally, if nothing of the above applies, this can result from a stack overflow.\n"
-            "Try to increase stack size with --cfg=contexts/stack-size (current size is %d KiB).\n",
+    fprintf(stderr, "Access violation detected.\n"
+                    "This can result from a programming error in your code or, although less likely,\n"
+                    "from a bug in SimGrid itself.  This can also be the sign of a bug in the OS or\n"
+                    "in third-party libraries.  Failing hardware can sometimes generate such errors\n"
+                    "too.\n"
+                    "Finally, if nothing of the above applies, this can result from a stack overflow.\n"
+                    "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",
@@ -177,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);
 }
 
@@ -533,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();
@@ -676,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());
     }
   }
 }