X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1128245fc5ccac68ce1f696aab780e15ff9f735a..a45d028524d1b21fbe820ce93e87867963b7239b:/src/simix/smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 8c08f25690..76e288c4ce 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -29,6 +29,7 @@ SIMCALL_LIST
 };
 
 /**
+ * \ingroup simix_host_management
  * \brief Returns a host given its name.
  *
  * \param name The name of the host to get
@@ -45,6 +46,7 @@ smx_host_t simcall_host_get_by_name(const char *name)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Returns the name of a host.
  *
  * \param host A SIMIX host
@@ -61,6 +63,7 @@ const char* simcall_host_get_name(smx_host_t host)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Returns a dict of the properties assigned to a host.
  *
  * \param host A host
@@ -77,6 +80,7 @@ xbt_dict_t simcall_host_get_properties(smx_host_t host)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Returns the speed of the processor.
  *
  * The speed returned does not take into account the current load on the machine.
@@ -94,6 +98,7 @@ double simcall_host_get_speed(smx_host_t host)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Returns the available speed of the processor.
  *
  * \return Speed currently available (in Mflop/s)
@@ -109,6 +114,7 @@ double simcall_host_get_available_speed(smx_host_t host)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Returns the state of a host.
  *
  * Two states are possible: 1 if the host is active or 0 if it has crashed.
@@ -126,6 +132,7 @@ int simcall_host_get_state(smx_host_t host)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Returns the user data associated to a host.
  *
  * \param host SIMIX host
@@ -142,10 +149,11 @@ void* simcall_host_get_data(smx_host_t host)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Sets the user data associated to a host.
  *
  * The host must not have previous user data associated to it.
- * \param A host SIMIX host
+ * \param host A SIMIX host
  * \param data The user data to set
  */
 void simcall_host_set_data(smx_host_t host, void *data)
@@ -158,14 +166,17 @@ void simcall_host_set_data(smx_host_t host, void *data)
   SIMIX_simcall_push(simcall->issuer);
 }
 
-/** \brief Creates an action that executes some computation of an host.
+/**
+ * \ingroup simix_host_management
+ * \brief Creates an action that executes some computation of an host.
  *
  * This function creates a SURF action and allocates the data necessary
  * to create the SIMIX action. It can raise a host_error exception if the host crashed.
  *
  * \param name Name of the execution action to create
  * \param host SIMIX host where the action will be executed
- * \param amount Computation amount (in bytes)
+ * \param computation_amount amount Computation amount (in bytes)
+ * \param priority computation priority
  * \return A new SIMIX execution action
  */
 smx_action_t simcall_host_execute(const char *name, smx_host_t host,
@@ -187,7 +198,9 @@ smx_action_t simcall_host_execute(const char *name, smx_host_t host,
   return simcall->host_execute.result;
 }
 
-/** \brief Creates an action that may involve parallel computation on
+/**
+ * \ingroup simix_host_management
+ * \brief Creates an action that may involve parallel computation on
  * several hosts and communication between them.
  *
  * \param name Name of the execution action to create
@@ -214,7 +227,7 @@ smx_action_t simcall_host_parallel_execute(const char *name,
      xbt_assert(isfinite(computation_amount[i]), "computation_amount[%d] is not finite!", i);
      for (j = 0 ; j < host_nb ; ++j) {
         xbt_assert(isfinite(communication_amount[i + host_nb * j]), 
-	           "communication_amount[%d+%d*%d] is not finite!", i, host_nb, j);
+             "communication_amount[%d+%d*%d] is not finite!", i, host_nb, j);
      }   
   }   
  
@@ -236,10 +249,11 @@ smx_action_t simcall_host_parallel_execute(const char *name,
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Destroys an execution action.
  *
  * Destroys an action, freing its memory. This function cannot be called if there are a conditional waiting for it.
- * \param action The execution action to destroy
+ * \param execution The execution action to destroy
  */
 void simcall_host_execution_destroy(smx_action_t execution)
 {
@@ -251,10 +265,11 @@ void simcall_host_execution_destroy(smx_action_t execution)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Cancels an execution action.
  *
  * This functions stops the execution. It calls a surf function.
- * \param action The execution action to cancel
+ * \param execution The execution action to cancel
  */
 void simcall_host_execution_cancel(smx_action_t execution)
 {
@@ -266,9 +281,10 @@ void simcall_host_execution_cancel(smx_action_t execution)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Returns how much of an execution action remains to be done.
  *
- * \param Action The execution action
+ * \param execution The execution action
  * \return The remaining amount
  */
 double simcall_host_execution_get_remains(smx_action_t execution)
@@ -282,6 +298,7 @@ double simcall_host_execution_get_remains(smx_action_t execution)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Returns the state of an execution action.
  *
  * \param execution The execution action
@@ -298,6 +315,7 @@ e_smx_state_t simcall_host_execution_get_state(smx_action_t execution)
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Changes the priority of an execution action.
  *
  * This functions changes the priority only. It calls a surf function.
@@ -318,6 +336,7 @@ void simcall_host_execution_set_priority(smx_action_t execution, double priority
 }
 
 /**
+ * \ingroup simix_host_management
  * \brief Waits for the completion of an execution action and destroy it.
  *
  * \param execution The execution action
@@ -333,6 +352,7 @@ e_smx_state_t simcall_host_execution_wait(smx_action_t execution)
 }
 
 /**
+ * \ingroup simix_process_management
  * \brief Creates and runs a new SIMIX process.
  *
  * The structure and the corresponding thread are created and put in the list of ready processes.
@@ -343,16 +363,20 @@ e_smx_state_t simcall_host_execution_wait(smx_action_t execution)
  * \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can be NULL.
  * It can be retrieved with the function \ref simcall_process_get_data.
  * \param hostname name of the host where the new agent is executed.
+ * \param kill_time time when the process is killed
  * \param argc first argument passed to \a code
  * \param argv second argument passed to \a code
  * \param properties the properties of the process
+ * \param auto_restart either it is autorestarting or not.
  */
 void simcall_process_create(smx_process_t *process, const char *name,
                               xbt_main_func_t code,
                               void *data,
                               const char *hostname,
+                              double kill_time,
                               int argc, char **argv,
-                              xbt_dict_t properties)
+                              xbt_dict_t properties,
+                              int auto_restart)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
 
@@ -362,13 +386,17 @@ void simcall_process_create(smx_process_t *process, const char *name,
   simcall->process_create.code = code;
   simcall->process_create.data = data;
   simcall->process_create.hostname = hostname;
+  simcall->process_create.kill_time = kill_time;
   simcall->process_create.argc = argc;
   simcall->process_create.argv = argv;
   simcall->process_create.properties = properties;
+  simcall->process_create.auto_restart = auto_restart;
   SIMIX_simcall_push(simcall->issuer);
 }
 
-/** \brief Kills a SIMIX process.
+/**
+ * \ingroup simix_process_management
+ * \brief Kills a SIMIX process.
  *
  * This function simply kills a  process.
  *
@@ -383,7 +411,9 @@ void simcall_process_kill(smx_process_t process)
   SIMIX_simcall_push(simcall->issuer);
 }
 
-/** \brief Kills all SIMIX processes.
+/**
+ * \ingroup simix_process_management
+ * \brief Kills all SIMIX processes.
  */
 void simcall_process_killall(void)
 {
@@ -393,7 +423,9 @@ void simcall_process_killall(void)
   SIMIX_simcall_push(simcall->issuer);
 }
 
-/** \brief Cleans up a SIMIX process.
+/**
+ * \ingroup simix_process_management
+ * \brief Cleans up a SIMIX process.
  * \param process poor victim (must have already been killed)
  */
 void simcall_process_cleanup(smx_process_t process)
@@ -406,12 +438,12 @@ void simcall_process_cleanup(smx_process_t process)
 }
 
 /**
+ * \ingroup simix_process_management
  * \brief Migrates an agent to another location.
  *
  * This function changes the value of the host on which \a process is running.
  *
  * \param process the process to migrate
- * \param source name of the previous host
  * \param dest name of the new host
  */
 void simcall_process_change_host(smx_process_t process, smx_host_t dest)
@@ -425,6 +457,7 @@ void simcall_process_change_host(smx_process_t process, smx_host_t dest)
 }
 
 /**
+ * \ingroup simix_process_management
  * \brief Suspends a process.
  *
  * This function suspends the process by suspending the action
@@ -444,6 +477,7 @@ void simcall_process_suspend(smx_process_t process)
 }
 
 /**
+ * \ingroup simix_process_management
  * \brief Resumes a suspended process.
  *
  * This function resumes a suspended process by resuming the action
@@ -461,6 +495,7 @@ void simcall_process_resume(smx_process_t process)
 }
 
 /**
+ * \ingroup simix_process_management
  * \brief Returns the amount of SIMIX processes in the system
  *
  * Maestro internal process is not counted, only user code processes are
@@ -475,6 +510,7 @@ int simcall_process_count(void)
 }
 
 /**
+ * \ingroup simix_process_management
  * \brief Return the user data of a #smx_process_t.
  * \param process a SIMIX process
  * \return the user data of this process
@@ -495,9 +531,10 @@ void* simcall_process_get_data(smx_process_t process)
 }
 
 /**
- * \brief Set the user data of a #m_process_t.
+ * \ingroup simix_process_management
+ * \brief Set the user data of a #smx_process_t.
  *
- * This functions checks whether \a process is a valid pointer or not and set the user data associated to \a process if it is possible.
+ * This functions sets the user data associated to \a process.
  * \param process SIMIX process
  * \param data User data
  */
@@ -519,9 +556,29 @@ void simcall_process_set_data(smx_process_t process, void *data)
 }
 
 /**
+ * \ingroup simix_process_management
+ * \brief Set the kill time of a process.
+ * \param process a process
+ * \param kill_time a double
+ */
+void simcall_process_set_kill_time(smx_process_t process, double kill_time)
+{
+
+  if (kill_time > SIMIX_get_clock()) {
+    if (simix_global->kill_process_function) {
+      XBT_DEBUG("Set kill time %f for process %s(%s)",kill_time, process->name,
+          process->smx_host->name);
+      SIMIX_timer_set(kill_time, simix_global->kill_process_function, process);
+    }
+  }
+}
+
+/**
+ * \ingroup simix_process_management
  * \brief Return the location on which an agent is running.
  *
- * This functions checks whether \a process is a valid pointer or not and return the m_host_t corresponding to the location on which \a process is running.
+ * This functions returns the smx_host_t corresponding to the location on which
+ * \a process is running.
  * \param process SIMIX process
  * \return SIMIX host
  */
@@ -536,6 +593,7 @@ smx_host_t simcall_process_get_host(smx_process_t process)
 }
 
 /**
+ * \ingroup simix_process_management
  * \brief Return the name of an agent.
  *
  * This functions checks whether \a process is a valid pointer or not and return its name.
@@ -558,6 +616,7 @@ const char* simcall_process_get_name(smx_process_t process)
 }
 
 /**
+ * \ingroup simix_process_management
  * \brief Returns true if the process is suspended .
  *
  * This checks whether a process is suspended or not by inspecting the task on which it was waiting for the completion.
@@ -574,7 +633,8 @@ int simcall_process_is_suspended(smx_process_t process)
   return simcall->process_is_suspended.result;
 }
 
-/** \ingroup m_process_management
+/**
+ * \ingroup simix_process_management
  * \brief Return the properties
  *
  * This functions returns the properties associated with this process
@@ -588,15 +648,63 @@ xbt_dict_t simcall_process_get_properties(smx_process_t process)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->process_get_properties.result;
 }
+/**
+ * \ingroup simix_process_management
+ * \brief Add an on_exit function
+ * Add an on_exit function which will be executed when the process exits/is killed.
+ */
+XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_t fun, void *data)
+{
+  smx_simcall_t simcall = SIMIX_simcall_mine();
+
+  simcall->call = SIMCALL_PROCESS_ON_EXIT;
+  simcall->process_on_exit.process = process;
+  simcall->process_on_exit.fun = fun;
+  simcall->process_on_exit.data = data;
+
+  SIMIX_simcall_push(simcall->issuer);
+}
+/**
+ * \ingroup simix_process_management
+ * \brief Sets the process to be auto-restarted or not by SIMIX when its host comes back up.
+ * Will restart the process when the host comes back up if auto_restart is set to 1.
+ */
+
+XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int auto_restart)
+{
+  smx_simcall_t simcall = SIMIX_simcall_mine();
+
+  simcall->call = SIMCALL_PROCESS_AUTO_RESTART_SET;
+  simcall->process_auto_restart.process = process;
+  simcall->process_auto_restart.auto_restart = auto_restart;
+
+  SIMIX_simcall_push(simcall->issuer);
+}
+/**
+ * \ingroup simix_process_management
+ * \brief Restarts the process, killing it and starting it again from scratch.
+ */
+XBT_PUBLIC(smx_process_t) simcall_process_restart(smx_process_t process)
+{
+  smx_simcall_t simcall = SIMIX_simcall_mine();
 
-/** \brief Creates a new sleep SIMIX action.
+  simcall->call = SIMCALL_PROCESS_RESTART;
+  simcall->process_restart.process = process;
+
+  SIMIX_simcall_push(simcall->issuer);
+
+  return simcall->process_restart.result;
+}
+/**
+ * \ingroup simix_process_management
+ * \brief Creates a new sleep SIMIX action.
  *
  * This function creates a SURF action and allocates the data necessary
  * to create the SIMIX action. It can raise a host_error exception if the
  * host crashed. The default SIMIX name of the action is "sleep".
  *
- * 	\param duration Time duration of the sleep.
- * 	\return A result telling whether the sleep was successful
+ *   \param duration Time duration of the sleep.
+ *   \return A result telling whether the sleep was successful
  */
 e_smx_state_t simcall_process_sleep(double duration)
 {
@@ -612,6 +720,7 @@ e_smx_state_t simcall_process_sleep(double duration)
 }
 
 /**
+ *  \ingroup simix_rdv_management
  *  \brief Creates a new rendez-vous point
  *  \param name The name of the rendez-vous point
  *  \return The created rendez-vous point
@@ -629,8 +738,9 @@ smx_rdv_t simcall_rdv_create(const char *name)
 
 
 /**
+ *  \ingroup simix_rdv_management
  *  \brief Destroy a rendez-vous point
- *  \param name The rendez-vous point to destroy
+ *  \param rdv The rendez-vous point to destroy
  */
 void simcall_rdv_destroy(smx_rdv_t rdv)
 {
@@ -641,7 +751,10 @@ void simcall_rdv_destroy(smx_rdv_t rdv)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ *  \ingroup simix_rdv_management
+ *  \brief Returns a rendez-vous point knowing its name
+ */
 smx_rdv_t simcall_rdv_get_by_name(const char *name)
 {
   xbt_assert(name != NULL, "Invalid parameter for simcall_rdv_get_by_name (name is NULL)");
@@ -661,6 +774,7 @@ smx_rdv_t simcall_rdv_get_by_name(const char *name)
 }
 
 /**
+ *  \ingroup simix_rdv_management
  *  \brief Counts the number of communication actions of a given host pending
  *         on a rendez-vous point.
  *  \param rdv The rendez-vous point
@@ -680,6 +794,7 @@ int simcall_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host)
 }
 
 /**
+ *  \ingroup simix_rdv_management
  *  \brief returns the communication at the head of the rendez-vous
  *  \param rdv The rendez-vous point
  *  \return The communication or NULL if empty
@@ -695,9 +810,34 @@ smx_action_t simcall_rdv_get_head(smx_rdv_t rdv)
   return simcall->rdv_get_head.result;
 }
 
+void simcall_rdv_set_receiver(smx_rdv_t rdv , smx_process_t process)
+{
+  smx_simcall_t simcall = SIMIX_simcall_mine();
+
+  simcall->call = SIMCALL_RDV_SET_RECV;
+  simcall->rdv_set_rcv_proc.rdv = rdv;
+  simcall->rdv_set_rcv_proc.receiver = process;
+
+  SIMIX_simcall_push(simcall->issuer);
+}
+
+smx_process_t simcall_rdv_get_receiver(smx_rdv_t rdv)
+{
+  smx_simcall_t simcall = SIMIX_simcall_mine();
+
+  simcall->call = SIMCALL_RDV_GET_RECV;
+  simcall->rdv_get_rcv_proc.rdv = rdv;
+
+  SIMIX_simcall_push(simcall->issuer);
+  return simcall->rdv_get_rcv_proc.result;
+}
+
+/**
+ * \ingroup simix_comm_management
+ */
 void simcall_comm_send(smx_rdv_t rdv, double task_size, double rate,
                          void *src_buff, size_t src_buff_size,
-                         int (*match_fun)(void *, void *), void *data,
+                         int (*match_fun)(void *, void *, smx_action_t), void *data,
                          double timeout)
 {
   /* checking for infinite values */
@@ -729,10 +869,12 @@ void simcall_comm_send(smx_rdv_t rdv, double task_size, double rate,
     SIMIX_simcall_push(simcall->issuer);
   }
 }
-
+/**
+ * \ingroup simix_comm_management
+ */
 smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate,
                               void *src_buff, size_t src_buff_size,
-                              int (*match_fun)(void *, void *),
+                              int (*match_fun)(void *, void *, smx_action_t),
                               void (*clean_fun)(void *),
                               void *data,
                               int detached)
@@ -759,9 +901,11 @@ smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate,
   SIMIX_simcall_push(simcall->issuer);
   return simcall->comm_isend.result;
 }
-
+/**
+ * \ingroup simix_comm_management
+ */
 void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
-                         int (*match_fun)(void *, void *), void *data, double timeout)
+                         int (*match_fun)(void *, void *, smx_action_t), void *data, double timeout)
 {
   xbt_assert(isfinite(timeout), "timeout is not finite!");
   xbt_assert(rdv, "No rendez-vous point defined for recv");
@@ -786,9 +930,11 @@ void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
     SIMIX_simcall_push(simcall->issuer);
   }
 }
-
+/**
+ * \ingroup simix_comm_management
+ */
 smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
-                                  int (*match_fun)(void *, void *), void *data)
+                                  int (*match_fun)(void *, void *, smx_action_t), void *data)
 {
   xbt_assert(rdv, "No rendez-vous point defined for irecv");
 
@@ -804,7 +950,6 @@ smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff
   SIMIX_simcall_push(simcall->issuer);
   return simcall->comm_irecv.result;
 }
-
 void simcall_comm_destroy(smx_action_t comm)
 {
   xbt_assert(comm, "Invalid parameter");
@@ -820,7 +965,9 @@ void simcall_comm_destroy(smx_action_t comm)
   SIMIX_simcall_push(simcall->issuer);
   */
 }
-
+/**
+ * \ingroup simix_comm_management
+ */
 void simcall_comm_cancel(smx_action_t comm)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -830,7 +977,9 @@ void simcall_comm_cancel(smx_action_t comm)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_comm_management
+ */
 unsigned int simcall_comm_waitany(xbt_dynar_t comms)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -841,7 +990,9 @@ unsigned int simcall_comm_waitany(xbt_dynar_t comms)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->comm_waitany.result;
 }
-
+/**
+ * \ingroup simix_comm_management
+ */
 int simcall_comm_testany(xbt_dynar_t comms)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -854,7 +1005,9 @@ int simcall_comm_testany(xbt_dynar_t comms)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->comm_testany.result;
 }
-
+/**
+ * \ingroup simix_comm_management
+ */
 void simcall_comm_wait(smx_action_t comm, double timeout)
 {
   xbt_assert(isfinite(timeout), "timeout is not finite!");
@@ -891,7 +1044,10 @@ void simcall_set_category(smx_action_t action, const char *category)
   SIMIX_simcall_push(simcall->issuer);
 }
 #endif
-
+/**
+ * \ingroup simix_comm_management
+ *
+ */
 int simcall_comm_test(smx_action_t comm)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -902,7 +1058,10 @@ int simcall_comm_test(smx_action_t comm)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->comm_test.result;
 }
-
+/**
+ * \ingroup simix_comm_management
+ *
+ */
 double simcall_comm_get_remains(smx_action_t comm)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -913,7 +1072,10 @@ double simcall_comm_get_remains(smx_action_t comm)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->comm_get_remains.result;
 }
-
+/**
+ * \ingroup simix_comm_management
+ *
+ */
 e_smx_state_t simcall_comm_get_state(smx_action_t comm)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -924,7 +1086,10 @@ e_smx_state_t simcall_comm_get_state(smx_action_t comm)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->comm_get_state.result;
 }
-
+/**
+ * \ingroup simix_comm_management
+ *
+ */
 void *simcall_comm_get_src_data(smx_action_t comm)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -935,7 +1100,10 @@ void *simcall_comm_get_src_data(smx_action_t comm)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->comm_get_src_data.result;
 }
-
+/**
+ * \ingroup simix_comm_management
+ *
+ */
 void *simcall_comm_get_dst_data(smx_action_t comm)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -946,7 +1114,10 @@ void *simcall_comm_get_dst_data(smx_action_t comm)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->comm_get_dst_data.result;
 }
-
+/**
+ * \ingroup simix_comm_management
+ *
+ */
 smx_process_t simcall_comm_get_src_proc(smx_action_t comm)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -957,7 +1128,10 @@ smx_process_t simcall_comm_get_src_proc(smx_action_t comm)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->comm_get_src_proc.result;
 }
-
+/**
+ * \ingroup simix_comm_management
+ *
+ */
 smx_process_t simcall_comm_get_dst_proc(smx_action_t comm)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -981,9 +1155,16 @@ int simcall_comm_is_latency_bounded(smx_action_t comm)
   return simcall->comm_is_latency_bounded.result;
 }
 #endif
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 smx_mutex_t simcall_mutex_init(void)
 {
+  if(!simix_global) {
+    fprintf(stderr,"You must run MSG_init or gras_init before using MSG or GRAS\n"); // I would have loved using xbt_die but I can't since it is not initialized yet... :)
+    abort();
+  }
   smx_simcall_t simcall = SIMIX_simcall_mine();
 
   simcall->call = SIMCALL_MUTEX_INIT;
@@ -991,7 +1172,10 @@ smx_mutex_t simcall_mutex_init(void)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->mutex_init.result;
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_mutex_destroy(smx_mutex_t mutex)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1001,7 +1185,10 @@ void simcall_mutex_destroy(smx_mutex_t mutex)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_mutex_lock(smx_mutex_t mutex)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1011,7 +1198,10 @@ void simcall_mutex_lock(smx_mutex_t mutex)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 int simcall_mutex_trylock(smx_mutex_t mutex)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1022,7 +1212,10 @@ int simcall_mutex_trylock(smx_mutex_t mutex)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->mutex_trylock.result;
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_mutex_unlock(smx_mutex_t mutex)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1032,8 +1225,10 @@ void simcall_mutex_unlock(smx_mutex_t mutex)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 smx_cond_t simcall_cond_init(void)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1043,7 +1238,10 @@ smx_cond_t simcall_cond_init(void)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->cond_init.result;
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_cond_destroy(smx_cond_t cond)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1053,7 +1251,10 @@ void simcall_cond_destroy(smx_cond_t cond)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_cond_signal(smx_cond_t cond)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1063,7 +1264,10 @@ void simcall_cond_signal(smx_cond_t cond)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1074,7 +1278,10 @@ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_cond_wait_timeout(smx_cond_t cond,
                                  smx_mutex_t mutex,
                                  double timeout)
@@ -1090,7 +1297,10 @@ void simcall_cond_wait_timeout(smx_cond_t cond,
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_cond_broadcast(smx_cond_t cond)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1100,8 +1310,10 @@ void simcall_cond_broadcast(smx_cond_t cond)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 smx_sem_t simcall_sem_init(int capacity)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1112,7 +1324,10 @@ smx_sem_t simcall_sem_init(int capacity)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->sem_init.result;
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_sem_destroy(smx_sem_t sem)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1122,7 +1337,10 @@ void simcall_sem_destroy(smx_sem_t sem)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_sem_release(smx_sem_t sem)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1132,7 +1350,10 @@ void simcall_sem_release(smx_sem_t sem)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 int simcall_sem_would_block(smx_sem_t sem)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1143,7 +1364,10 @@ int simcall_sem_would_block(smx_sem_t sem)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->sem_would_block.result;
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_sem_acquire(smx_sem_t sem)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1153,7 +1377,10 @@ void simcall_sem_acquire(smx_sem_t sem)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
 {
   xbt_assert(isfinite(timeout), "timeout is not finite!");
@@ -1166,7 +1393,10 @@ void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
 
   SIMIX_simcall_push(simcall->issuer);
 }
-
+/**
+ * \ingroup simix_synchro_management
+ *
+ */
 int simcall_sem_get_capacity(smx_sem_t sem)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
@@ -1177,13 +1407,15 @@ int simcall_sem_get_capacity(smx_sem_t sem)
   SIMIX_simcall_push(simcall->issuer);
   return simcall->sem_get_capacity.result;
 }
-
-size_t simcall_file_read(const char* storage, void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+/**
+ * \ingroup simix_file_management
+ *
+ */
+double simcall_file_read(void* ptr, size_t size, size_t nmemb, smx_file_t stream)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
 
   simcall->call = SIMCALL_FILE_READ;
-  simcall->file_read.storage = storage;
   simcall->file_read.ptr = ptr;
   simcall->file_read.size = size;
   simcall->file_read.nmemb = nmemb;
@@ -1192,13 +1424,15 @@ size_t simcall_file_read(const char* storage, void* ptr, size_t size, size_t nme
 
   return simcall->file_read.result;
 }
-
-size_t simcall_file_write(const char* storage, const void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+/**
+ * \ingroup simix_file_management
+ *
+ */
+size_t simcall_file_write(const void* ptr, size_t size, size_t nmemb, smx_file_t stream)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
 
   simcall->call = SIMCALL_FILE_WRITE;
-  simcall->file_write.storage = storage;
   simcall->file_write.ptr = ptr;
   simcall->file_write.size = size;
   simcall->file_write.nmemb = nmemb;
@@ -1207,37 +1441,44 @@ size_t simcall_file_write(const char* storage, const void* ptr, size_t size, siz
 
   return simcall->file_write.result;
 }
-
-smx_file_t simcall_file_open(const char* storage, const char* path, const char* mode)
+/**
+ * \ingroup simix_file_management
+ * \brief
+ */
+smx_file_t simcall_file_open(const char* mount, const char* path, const char* mode)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
 
   simcall->call = SIMCALL_FILE_OPEN;
-  simcall->file_open.storage = storage;
+  simcall->file_open.mount = mount;
   simcall->file_open.path = path;
   simcall->file_open.mode = mode;
   SIMIX_simcall_push(simcall->issuer);
 
   return simcall->file_open.result;
 }
-
-int simcall_file_close(const char* storage, smx_file_t fp)
+/**
+ * \ingroup simix_file_management
+ *
+ */
+int simcall_file_close(smx_file_t fp)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
 
   simcall->call = SIMCALL_FILE_CLOSE;
-  simcall->file_close.storage = storage;
   simcall->file_close.fp = fp;
   SIMIX_simcall_push(simcall->issuer);
 
   return simcall->file_close.result;
 }
-
-int simcall_file_stat(const char* storage, smx_file_t fd, s_file_stat_t *buf)
+/**
+ * \ingroup simix_file_management
+ *
+ */
+int simcall_file_stat(smx_file_t fd, s_file_stat_t *buf)
 {
   smx_simcall_t simcall = SIMIX_simcall_mine();
   simcall->call = SIMCALL_FILE_STAT;
-  simcall->file_stat.storage = storage;
   simcall->file_stat.fd = fd;
 
   SIMIX_simcall_push(simcall->issuer);
@@ -1247,6 +1488,21 @@ int simcall_file_stat(const char* storage, smx_file_t fd, s_file_stat_t *buf)
   return simcall->file_stat.result;
 }
 
+/**
+ * \ingroup simix_file_management
+ *
+ */
+int simcall_file_unlink(smx_file_t fd)
+{
+  smx_simcall_t simcall = SIMIX_simcall_mine();
+  simcall->call = SIMCALL_FILE_UNLINK;
+  simcall->file_unlink.fd = fd;
+
+  SIMIX_simcall_push(simcall->issuer);
+
+  return simcall->file_unlink.result;
+}
+
 /* ************************************************************************** */
 
 /** @brief returns a printable string representing a simcall */