Use new style logging macros.

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

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index e97d574..62815cf 100644 (file)
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -4,7 +4,6 @@
 /* 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 "xbt/sysdep.h"
 #include "xbt/log.h"
@@ -49,7 +48,7 @@ static void parse_argument(void)
 static void parse_process_finalize(void)
 {
   smx_process_arg_t arg = NULL;
-  void *process = NULL;
+  smx_process_t process = NULL;
   if (start_time > SIMIX_get_clock()) {
     arg = xbt_new0(s_smx_process_arg_t, 1);
     arg->name = parse_argv[0];
@@ -61,30 +60,22 @@ static void parse_process_finalize(void)
     arg->kill_time = kill_time;
     arg->properties = current_property_set;
 
-    DEBUG3("Process %s(%s) will be started at time %f", arg->name,
+    XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name,
            arg->hostname, start_time);
-    if (simix_global->create_process_function)
-      surf_timer_model->extension.timer.set(start_time, (void *)
-                                            simix_global->create_process_function,
-                                            arg);
-    else
-      surf_timer_model->extension.timer.set(start_time, (void *)
-                                            &SIMIX_process_create, arg);
-
+    SIMIX_timer_set(start_time, &SIMIX_process_create_from_wrapper, arg);
   } else {                      // start_time <= SIMIX_get_clock()
-    DEBUG2("Starting Process %s(%s) right now", parse_argv[0], parse_host);
+    XBT_DEBUG("Starting Process %s(%s) right now", parse_argv[0], parse_host);
 
     if (simix_global->create_process_function)
-      process =
-          (*simix_global->create_process_function) (parse_argv[0],
-                                                    parse_code, NULL,
-                                                    parse_host, parse_argc,
-                                                    parse_argv,
-                                                    /*the props */
-                                                    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
-      process = SIMIX_process_create(parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv,       /*the props */
-                                     current_property_set);
+      SIMIX_req_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);
@@ -92,13 +83,9 @@ static void parse_process_finalize(void)
     }
     if (kill_time > SIMIX_get_clock()) {
       if (simix_global->kill_process_function)
-        surf_timer_model->extension.timer.set(start_time, (void *)
-                                              simix_global->kill_process_function,
-                                              process);
+        SIMIX_timer_set(start_time, simix_global->kill_process_function, process);
       else
-        surf_timer_model->extension.timer.set(kill_time, (void *)
-                                              &SIMIX_process_kill,
-                                              (void *) process);
+        SIMIX_timer_set(start_time, &SIMIX_process_kill, process);
     }
     xbt_free(parse_host);
   }
@@ -123,7 +110,10 @@ void SIMIX_launch_application(const char *file)
   int parse_status;
   xbt_assert0(simix_global,
               "SIMIX_global_init has to be called before SIMIX_launch_application.");
-  surf_parse_reset_parser();
+
+  // 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);
@@ -223,7 +213,6 @@ void SIMIX_process_set_function(const char *process_host,
     parse_argv[(parse_argc) - 1] = xbt_strdup(arg);
   }
 
-  /*finalize */
+  /* finalize */
   parse_process_finalize();
-
 }