Fix another race in log initializations.

[simgrid.git] / src / simix / smx_deployment.c

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index dcd4497..f5187d4 100644 (file)
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "private.h"
+#include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"
@@ -75,7 +75,7 @@ static void parse_process_finalize(void)
                                             parse_argv,
                                             current_property_set);
     else
-      SIMIX_req_process_create(&process, parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv,
+      simcall_process_create(&process, parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv,
                                current_property_set);
     /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
     if (!process) {
@@ -126,8 +126,8 @@ void SIMIX_launch_application(const char *file)
          surf_parse_close();
          xbt_assert(!parse_status, "Parse error at %s:%d", file,surf_parse_lineno);
   } CATCH(e) {
-         xbt_die("Unrecoverable error at %s:%d: %s", file,surf_parse_lineno,
-                         __xbt_running_ctx_fetch()->exception.msg); //FIXME: that pimple is due to the fact that e.msg does not seem to be set on CATCH(e). The pimple should be removed when the bug is gone.
+         xbt_die("Unrecoverable error at %s:%d: %s",
+                  file, surf_parse_lineno, e.msg);
   }
 }