X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d622ff31635c2228cb721abf806bb28b3cada4d..8c6f8c0c60b29b37b685c6216f32a8b2b1ee06a2:/src/simix/smx_deployment.c

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index c1f8dd5158..d4dac76215 100644
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -4,11 +4,11 @@
 /* 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"
-#include "surf/surfxml_parse_private.h"
+#include "surf/surfxml_parse.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
                                 "Logging specific to SIMIX (deployment)");
@@ -19,34 +19,35 @@ 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)
 {
-  parse_host = xbt_strdup(A_surfxml_process_host);
-  xbt_assert(SIMIX_host_get_by_name(parse_host),
-              "Host '%s' unknown", parse_host);
+  smx_host_t host = SIMIX_host_get_by_name(A_surfxml_process_host);
+  if (!host)
+    THROWF(arg_error, 0, "Host '%s' unknown", A_surfxml_process_host);
+  parse_host = host->name;
   parse_code = SIMIX_get_registered_function(A_surfxml_process_function);
   xbt_assert(parse_code, "Function '%s' unknown",
               A_surfxml_process_function);
-  parse_argc = 0;
-  parse_argv = NULL;
-  parse_argc++;
-  parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *));
-  parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_process_function);
-  surf_parse_get_double(&start_time, A_surfxml_process_start_time);
-  surf_parse_get_double(&kill_time, A_surfxml_process_kill_time);
+  parse_argv = xbt_new(char *, 2);
+  parse_argv[0] = xbt_strdup(A_surfxml_process_function);
+  parse_argc = 1;
+  start_time= surf_parse_get_double(A_surfxml_process_start_time);
+  kill_time = surf_parse_get_double(A_surfxml_process_kill_time);
 }
 
 static void parse_argument(void)
 {
-  parse_argc++;
-  parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *));
-  parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_argument_value);
+  parse_argv = xbt_realloc(parse_argv, (parse_argc + 2) * sizeof(char *));
+  parse_argv[parse_argc++] = xbt_strdup(A_surfxml_argument_value);
 }
 
 static void parse_process_finalize(void)
 {
   smx_process_arg_t arg = NULL;
   smx_process_t process = NULL;
+  parse_argv[parse_argc] = NULL;
   if (start_time > SIMIX_get_clock()) {
     arg = xbt_new0(s_smx_process_arg_t, 1);
     arg->name = parse_argv[0];
@@ -65,18 +66,17 @@ static void parse_process_finalize(void)
     XBT_DEBUG("Starting Process %s(%s) right now", parse_argv[0], parse_host);
 
     if (simix_global->create_process_function)
-      (*simix_global->create_process_function) (&process,
-                                                parse_argv[0],
-                                                parse_code, NULL,
-                                                parse_host, parse_argc,
-                                                parse_argv,
-                                                current_property_set);
+      simix_global->create_process_function(&process,
+                                            parse_argv[0],
+                                            parse_code, NULL,
+                                            parse_host, parse_argc,
+                                            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) {
-      xbt_free(parse_host);
       return;
     }
     if (kill_time > SIMIX_get_clock()) {
@@ -84,7 +84,6 @@ static void parse_process_finalize(void)
         SIMIX_timer_set(start_time, simix_global->kill_process_function, process);
       }
     }
-    xbt_free(parse_host);
   }
   current_property_set = NULL;
 }
@@ -105,23 +104,29 @@ static void parse_process_finalize(void)
  */
 void SIMIX_launch_application(const char *file)
 {
-  int parse_status;
+  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.");
 
-  // Reset callbacks
   surf_parse_reset_callbacks();
 
   surfxml_add_callback(STag_surfxml_process_cb_list, parse_process_init);
   surfxml_add_callback(ETag_surfxml_argument_cb_list, parse_argument);
-  surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties_XML);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties);
   surfxml_add_callback(ETag_surfxml_process_cb_list,
                        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);
+  }
 }
 
 /**
@@ -170,7 +175,7 @@ xbt_main_func_t SIMIX_get_registered_function(const char *name)
   xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_get_registered_function.");
 
-  res = xbt_dict_get_or_null(simix_global->registered_functions, name);
+  res = (xbt_main_func_t)xbt_dict_get_or_null(simix_global->registered_functions, name);
   return res ? res : default_function;
 }
 
@@ -189,26 +194,25 @@ void SIMIX_process_set_function(const char *process_host,
   char *arg;
 
   /* init process */
-  parse_host = xbt_strdup(process_host);
-  xbt_assert(SIMIX_host_get_by_name(parse_host),
-              "Host '%s' unknown", parse_host);
+  smx_host_t host = SIMIX_host_get_by_name(process_host);
+  if (!host)
+    THROWF(arg_error, 0, "Host '%s' unknown", process_host);
+  parse_host = host->name;
   parse_code = SIMIX_get_registered_function(process_function);
   xbt_assert(parse_code, "Function '%s' unknown", process_function);
 
-  parse_argc = 0;
-  parse_argv = NULL;
-  parse_argc++;
-  parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *));
-  parse_argv[(parse_argc) - 1] = xbt_strdup(process_function);
-  start_time = process_start_time;
-  kill_time = process_kill_time;
+  parse_argc = 1 + xbt_dynar_length(arguments);
+  parse_argv = xbt_new(char *, parse_argc + 1);
+  parse_argv[0] = xbt_strdup(process_function);
 
   /* add arguments */
   xbt_dynar_foreach(arguments, i, arg) {
-    parse_argc++;
-    parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *));
-    parse_argv[(parse_argc) - 1] = xbt_strdup(arg);
+    parse_argv[parse_argc++] = xbt_strdup(arg);
   }
+  parse_argv[parse_argc] = NULL;
+
+  start_time = process_start_time;
+  kill_time = process_kill_time;
 
   /* finalize */
   parse_process_finalize();