Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 3b9bcdb..3ed4bf4 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",
@@ -226,9 +225,8 @@ void SIMIX_global_init(int *argc, char **argv)
     sg_platf_init();
     simgrid::surf::on_postparse.connect(SIMIX_post_create_environment);
     simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
-      SIMIX_host_create(&host);
+      host.extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
     });
-    SIMIX_HOST_LEVEL = simgrid::s4u::Host::extension_create(SIMIX_host_destroy);
 
     simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::Storage* storage) {
       const char* name = storage->getName();