SIMIX_process_create returns nothing.

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

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index da07fba..b71da54 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2012. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -26,7 +26,7 @@ XBT_INLINE smx_process_t SIMIX_process_self(void)
 {
   smx_context_t self_context = SIMIX_context_self();
 
 {
   smx_context_t self_context = SIMIX_context_self();
 

-  return self_context ? SIMIX_context_get_data(self_context) : NULL;
+  return self_context ? SIMIX_context_get_process(self_context) : NULL;

 }
 
 /**
 }
 
 /**


@@ -122,8 +122,8 @@ void SIMIX_process_empty_trash(void)
 
     xbt_dynar_free(&process->on_exit);
 
 
     xbt_dynar_free(&process->on_exit);
 

-    free(process->name);
-    free(process);
+    xbt_free(process->name);
+    xbt_free(process);

   }
 }
 
   }
 }
 


@@ -211,8 +211,8 @@ void SIMIX_pre_process_create(smx_simcall_t simcall,
                           int argc, char **argv,
                           xbt_dict_t properties,
                           int auto_restart){
                           int argc, char **argv,
                           xbt_dict_t properties,
                           int auto_restart){

-  return SIMIX_process_create(process, name, code, data, hostname,
-                              kill_time, argc, argv, properties, auto_restart);
+  SIMIX_process_create(process, name, code, data, hostname,
+                       kill_time, argc, argv, properties, auto_restart);

 }
 /**
  * \brief Internal function to create a process.
 }
 /**
  * \brief Internal function to create a process.


@@ -239,8 +239,12 @@ void SIMIX_process_create(smx_process_t *process,
   XBT_DEBUG("Start process %s on host '%s'", name, hostname);
 
   if (!SIMIX_host_get_state(host)) {
   XBT_DEBUG("Start process %s on host '%s'", name, hostname);
 
   if (!SIMIX_host_get_state(host)) {

+    int i;

     XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
           hostname);
     XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
           hostname);

+    for (i = 0; i < argc; i++)
+      xbt_free(argv[i]);
+    xbt_free(argv);

   }
   else {
     *process = xbt_new0(s_smx_process_t, 1);
   }
   else {
     *process = xbt_new0(s_smx_process_t, 1);


@@ -487,7 +491,8 @@ smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
       return NULL;
     }
   } else {
       return NULL;
     }
   } else {

-    return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0);
+    /* FIXME: computation size is zero. Is it okay that bound is zero ? */
+    return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0, 0.0, 0);

   }
 }
 
   }
 }
 


@@ -718,6 +723,8 @@ void SIMIX_post_process_sleep(smx_action_t action)
   smx_simcall_t simcall;
   e_smx_state_t state;
 
   smx_simcall_t simcall;
   e_smx_state_t state;
 

+  xbt_assert(action->type == SIMIX_ACTION_SLEEP);
+

   while ((simcall = xbt_fifo_shift(action->simcalls))) {
 
     switch(surf_action_get_state(action->sleep.surf_sleep)){
   while ((simcall = xbt_fifo_shift(action->simcalls))) {
 
     switch(surf_action_get_state(action->sleep.surf_sleep)){


@@ -749,6 +756,8 @@ void SIMIX_post_process_sleep(smx_action_t action)
 void SIMIX_process_sleep_destroy(smx_action_t action)
 {
   XBT_DEBUG("Destroy action %p", action);
 void SIMIX_process_sleep_destroy(smx_action_t action)
 {
   XBT_DEBUG("Destroy action %p", action);

+  xbt_assert(action->type == SIMIX_ACTION_SLEEP);
+

   if (action->sleep.surf_sleep)
     surf_action_unref(action->sleep.surf_sleep);
   xbt_mallocator_release(simix_global->action_mallocator, action);
   if (action->sleep.surf_sleep)
     surf_action_unref(action->sleep.surf_sleep);
   xbt_mallocator_release(simix_global->action_mallocator, action);


@@ -756,11 +765,13 @@ void SIMIX_process_sleep_destroy(smx_action_t action)
 
 void SIMIX_process_sleep_suspend(smx_action_t action)
 {
 
 void SIMIX_process_sleep_suspend(smx_action_t action)
 {

+  xbt_assert(action->type == SIMIX_ACTION_SLEEP);

   surf_action_suspend(action->sleep.surf_sleep);
 }
 
 void SIMIX_process_sleep_resume(smx_action_t action)
 {
   surf_action_suspend(action->sleep.surf_sleep);
 }
 
 void SIMIX_process_sleep_resume(smx_action_t action)
 {

+  xbt_assert(action->type == SIMIX_ACTION_SLEEP);

   surf_action_resume(action->sleep.surf_sleep);
 }
 
   surf_action_resume(action->sleep.surf_sleep);
 }