Keeping up with the new surf model description.

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

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index 6df3376..055172d 100644 (file)
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -16,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
                                "Logging specific to SIMIX (deployment)");
 static int parse_argc = -1 ;
 static char **parse_argv = NULL;
-static smx_process_code_t parse_code = NULL;
+static xbt_main_func_t parse_code = NULL;
 static char * parse_host = NULL;
 static double start_time = 0.0;
 static double kill_time = -1.0;
@@ -45,10 +45,10 @@ static void parse_argument(void)
 
 static void parse_process_finalize(void)
 {
-  process_arg_t arg = NULL;
+  smx_process_arg_t arg = NULL;
   void * process = NULL;
   if(start_time>SIMIX_get_clock()) {
-    arg = xbt_new0(s_process_arg_t,1);
+    arg = xbt_new0(s_smx_process_arg_t,1);
     arg->name = parse_argv[0];
     arg->code = parse_code;
     arg->data = NULL;
@@ -62,27 +62,28 @@ static void parse_process_finalize(void)
                 if (simix_global->create_process_function)
                         surf_timer_resource->extension_public->set(start_time, (void*) simix_global->create_process_function, arg);
                 else
-                        surf_timer_resource->extension_public->set(start_time, (void*) &SIMIX_process_create_with_arguments, arg);
+                        surf_timer_resource->extension_public->set(start_time, (void*) &SIMIX_process_create, arg);
 
   }
   if((start_time<0) || (start_time==SIMIX_get_clock())) {
-    DEBUG2("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);
-                else
-                        process = SIMIX_process_create_with_arguments(parse_argv[0], parse_code, NULL, parse_host,     parse_argc,parse_argv, NULL);
-
-    if(kill_time > SIMIX_get_clock()) {
-                if (simix_global->kill_process_function)
-                        surf_timer_resource->extension_public->set(start_time, (void*) simix_global->kill_process_function, arg);
-                else
-      surf_timer_resource->extension_public->set(kill_time, (void*) &SIMIX_process_kill, (void*) process);
-    }
+    DEBUG2("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);
+               else
+                       process = SIMIX_process_create(parse_argv[0], parse_code, NULL, parse_host,     parse_argc,parse_argv);
+
+               if(kill_time > SIMIX_get_clock()) {
+                       if (simix_global->kill_process_function)
+                               surf_timer_resource->extension_public->set(start_time, (void*) simix_global->kill_process_function, arg);
+                       else
+                               surf_timer_resource->extension_public->set(kill_time, (void*) &SIMIX_process_kill, (void*) process);
+               }
+               xbt_free(parse_host);
   }
 }
 
-/** \ingroup msg_easier_life
+/** 
  * \brief An application deployer.
  *
  * Creates the process described in \a file.
@@ -95,11 +96,10 @@ static void parse_process_finalize(void)
  *
  *     \include small_deployment.xml
  *
- * Have a look in the directory examples/msg/ to have a bigger example.
  */
 void SIMIX_launch_application(const char *file) 
 {
-  xbt_assert0(simix_global,"SIMIX_global_init_args has to be called before SIMIX_launch_application.");
+  xbt_assert0(simix_global,"SIMIX_global_init has to be called before SIMIX_launch_application.");
   STag_surfxml_process_fun = parse_process_init;
   ETag_surfxml_argument_fun = parse_argument;
   ETag_surfxml_process_fun = parse_process_finalize;
@@ -108,36 +108,33 @@ void SIMIX_launch_application(const char *file)
   surf_parse_close();
 }
 
-/** \ingroup msg_easier_life
- * \brief Registers a #m_process_code_t code in a global table.
+/**
+ * \brief Registers a #smx_process_code_t code in a global table.
  *
  * Registers a code function in a global table. 
- * This table is then used by #MSG_launch_application. 
+ * This table is then used by #SIMIX_launch_application. 
  * \param name the reference name of the function.
  * \param code the function
  */
-void SIMIX_function_register(const char *name,smx_process_code_t code)
+void SIMIX_function_register(const char *name,xbt_main_func_t code)
 {
   xbt_assert0(simix_global,"SIMIX_global_init has to be called before SIMIX_function_register.");
 
   xbt_dict_set(simix_global->registered_functions,name,code,NULL);
 }
 
-/** \ingroup msg_easier_life
- * \brief Registers a #m_process_t code in a global table.
+/**
+ * \brief Gets a #smx_process_t code from the global table.
  *
- * Registers a code function in a global table. 
- * This table is then used by #MSG_launch_application. 
+ * Gets a code function from the global table. Returns NULL if there are no function registered with the name.
+ * This table is then used by #SIMIX_launch_application. 
  * \param name the reference name of the function.
+ * \return The #smx_process_t or NULL.
  */
-smx_process_code_t SIMIX_get_registered_function(const char *name)
+xbt_main_func_t SIMIX_get_registered_function(const char *name)
 {
-  smx_process_code_t code = NULL;
-
   xbt_assert0(simix_global,"SIMIX_global_init has to be called before SIMIX_get_registered_function.");
 
-  code = xbt_dict_get_or_null(simix_global->registered_functions,name);
-
-  return code;
+  return xbt_dict_get_or_null(simix_global->registered_functions,name);
 }