X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37a7930defd21eff283b399671e0801eb8d0d464..f4a258218681d1002c99d4556ba4b21bc6a6adff:/src/msg/deployment.c

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index eacb7fef92..45353ec349 100644
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -8,9 +8,10 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "surf/surf_parse_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(deployment, msg,
-				"Logging specific to MSG (environment)");
+#include "surf/surfxml_parse_private.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_deployment, msg,
+				"Logging specific to MSG (deployment)");
 
 static int parse_argc = -1 ;
 static char **parse_argv = NULL;
@@ -21,24 +22,24 @@ static double kill_time = -1.0;
   
 static void parse_process_init(void)
 {
-  parse_host = MSG_get_host_by_name(A_process_host);
-  xbt_assert1(parse_host, "Unknown host %s",A_process_host);
-  parse_code = MSG_get_registered_function(A_process_function);
-  xbt_assert1(parse_code, "Unknown function %s",A_process_function);
+  parse_host = MSG_get_host_by_name(A_surfxml_process_host);
+  xbt_assert1(parse_host, "Unknown host %s",A_surfxml_process_host);
+  parse_code = MSG_get_registered_function(A_surfxml_process_function);
+  xbt_assert1(parse_code, "Unknown function %s",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_process_function);
-  surf_parse_get_double(&start_time,A_process_start_time);
-  surf_parse_get_double(&kill_time,A_process_kill_time);
+  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);
 }
 
 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_argument_value);
+  parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_argument_value);
 }
 
 static void parse_process_finalize(void)
@@ -55,10 +56,14 @@ static void parse_process_finalize(void)
     arg->argv = parse_argv;
     arg-> kill_time = kill_time;
 
+    DEBUG3("Process %s(%s) will be started at time %f", arg->name, 
+	   arg->host->name,start_time);
     surf_timer_resource->extension_public->set(start_time, (void*) &MSG_process_create_with_arguments,
 					       arg);
   }
   if((start_time<0) || (start_time==MSG_get_clock())) {
+    DEBUG2("Starting Process %s(%s) right now", parse_argv[0],
+	   parse_host->name);
     process = MSG_process_create_with_arguments(parse_argv[0], parse_code, 
 						NULL, parse_host,
 						parse_argc,parse_argv);
@@ -88,9 +93,9 @@ static void parse_process_finalize(void)
 void MSG_launch_application(const char *file) 
 {
   xbt_assert0(msg_global,"MSG_global_init_args has to be called before MSG_launch_application.");
-  STag_process_fun = parse_process_init;
-  ETag_argument_fun = parse_argument;
-  ETag_process_fun = parse_process_finalize;
+  STag_surfxml_process_fun = parse_process_init;
+  ETag_surfxml_argument_fun = parse_argument;
+  ETag_surfxml_process_fun = parse_process_finalize;
   surf_parse_open(file);
   xbt_assert1((!surf_parse()),"Parse error in %s",file);
   surf_parse_close();
@@ -123,8 +128,8 @@ m_process_code_t MSG_get_registered_function(const char *name)
   m_process_code_t code = NULL;
 
   xbt_assert0(msg_global,"MSG_global_init has to be called before MSG_get_registered_function.");
- 
-  code = xbt_dict_get(msg_global->registered_functions,name);
+
+  code = xbt_dict_get_or_null(msg_global->registered_functions,name);
 
   return code;
 }