X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..ed4a59a248d0efa948a8a3ea499d55bc96025234:/src/simix/smx_deployment.c

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index 2476a4b5d9..f5187d4209 100644
--- 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"
@@ -19,6 +19,8 @@ static char *parse_host = NULL;
 static double start_time = 0.0;
 static double kill_time = -1.0;
 
+extern int surf_parse_lineno;
+
 static void parse_process_init(void)
 {
   smx_host_t host = SIMIX_host_get_by_name(A_surfxml_process_host);
@@ -73,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) {
@@ -104,6 +106,8 @@ static void parse_process_finalize(void)
  */
 void SIMIX_launch_application(const char *file)
 {
+  xbt_ex_t e;
+
   _XBT_GNUC_UNUSED int parse_status;
   xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_launch_application.");
@@ -117,9 +121,14 @@ void SIMIX_launch_application(const char *file)
                        parse_process_finalize);
 
   surf_parse_open(file);
-  parse_status = surf_parse();
-  surf_parse_close();
-  xbt_assert(!parse_status, "Parse error in %s", file);
+  TRY {
+	  parse_status = surf_parse();
+	  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, e.msg);
+  }
 }
 
 /**