Debug the cloud API, it should work as expected now.

[simgrid.git] / src / msg / msg_process.c

diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c
index 8f73cbb..4ec3efa 100644 (file)
--- a/src/msg/msg_process.c
+++ b/src/msg/msg_process.c
@@ -33,38 +33,49 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
 
   // get the MSG process from the SIMIX process
   if (smx_proc == SIMIX_process_self()) {
-    /* avoid a SIMIX request if this function is called by the process itself */
+       /* avoid a SIMIX request if this function is called by the process itself */
     msg_proc = SIMIX_process_self_get_data(smx_proc);
+
     SIMIX_process_self_set_data(smx_proc, NULL);
   }
   else {
     msg_proc = simcall_process_get_data(smx_proc);
     simcall_process_set_data(smx_proc, NULL);
   }
-
 #ifdef HAVE_TRACING
   TRACE_msg_process_end(smx_proc);
 #endif
 
-  // free the data if a function was provided
-  if (msg_proc->data && msg_global->process_data_cleanup) {
-    msg_global->process_data_cleanup(msg_proc->data);
+  msg_process_data_t process_data = (msg_process_data_t)msg_proc->data;
+  //free the process data
+  if (process_data) {
+       //Remove the process from its vm
+       if (process_data->current_vm) {
+         int pos = xbt_dynar_search(process_data->current_vm->processes,&smx_proc);
+         xbt_dynar_remove_at(process_data->current_vm->processes,pos, NULL);
+       }
+       //Free the data if a function was provided
+    if (process_data->data && msg_global->process_data_cleanup) {
+      msg_global->process_data_cleanup(process_data->data);
+    }
+    xbt_free(process_data);
   }
 
-  // free the MSG process
+  //free the MSG process
   xbt_free(msg_proc);
 }
 
 /* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
 void MSG_process_create_from_SIMIX(smx_process_t* process, const char *name,
                                     xbt_main_func_t code, void *data,
-                                    const char *hostname, int argc, char **argv,
+                                    const char *hostname, double kill_time, int argc, char **argv,
                                     xbt_dict_t properties)
 {
   m_host_t host = MSG_get_host_by_name(hostname);
   m_process_t p = MSG_process_create_with_environment(name, code, data,
                                                       host, argc, argv,
                                                       properties);
+  MSG_process_set_kill_time(p,kill_time);
   *((m_process_t*) process) = p;
 }
 
@@ -174,7 +185,7 @@ m_process_t MSG_process_create_with_environment(const char *name,
 
   /* Let's create the process: SIMIX may decide to start it right now,
    * even before returning the flow control to us */
-  simcall_process_create(&process, name, code, simdata, host->name,
+  simcall_process_create(&process, name, code, simdata, SIMIX_host_get_name(host->smx_host), -1,
                            argc, argv, properties);
 
   if (!process) {
@@ -206,11 +217,11 @@ void MSG_process_kill(m_process_t process)
   TRACE_msg_process_kill(process);
 #endif
 
-  /* FIXME: why do we only cancel communication actions? is this useful? */
-  simdata_process_t p_simdata = simcall_process_get_data(process);
-  if (p_simdata->waiting_task && p_simdata->waiting_task->simdata->comm) {
-    simcall_comm_cancel(p_simdata->waiting_task->simdata->comm);
-  }
+//  /* FIXME: why do we only cancel communication actions? is this useful? */
+//  simdata_process_t p_simdata = simcall_process_get_data(process);
+//  if (p_simdata->waiting_task && p_simdata->waiting_task->simdata->comm) {
+//    simcall_comm_cancel(p_simdata->waiting_task->simdata->comm);
+//  }
  
   simcall_process_kill(process);
 
@@ -231,7 +242,7 @@ MSG_error_t MSG_process_migrate(m_process_t process, m_host_t host)
   m_host_t now = simdata->m_host;
   TRACE_msg_process_change_host(process, now, host);
 #endif
-  simcall_process_change_host(process, host->simdata->smx_host);
+  simcall_process_change_host(process, host->smx_host);
   return MSG_OK;
 }
 
@@ -247,7 +258,10 @@ void* MSG_process_get_data(m_process_t process)
 
   /* get from SIMIX the MSG process data, and then the user data */
   simdata_process_t simdata = simcall_process_get_data(process);
-  return simdata->data;
+  if (!simdata->data) {
+       return NULL;
+  }
+  return ((msg_process_data_t)simdata->data)->data;
 }
 
 /** \ingroup m_process_management
@@ -261,8 +275,10 @@ MSG_error_t MSG_process_set_data(m_process_t process, void *data)
   xbt_assert(process != NULL, "Invalid parameter");
 
   simdata_process_t simdata = simcall_process_get_data(process);
-  simdata->data = data;
-
+  if (!simdata->data) {
+       simdata->data = xbt_new0(s_msg_process_data_t, 1);
+  }
+       ((msg_process_data_t)simdata->data)->data = data;
   return MSG_OK;
 }
 
@@ -313,6 +329,18 @@ xbt_dynar_t MSG_processes_as_dynar(void) {
   return SIMIX_processes_as_dynar();
 }
 
+/** \ingroup m_process_management
+ * \brief Set the kill time of a process.
+ *
+ * \param process a process
+ * \param kill_time the time when the process is killed.
+ */
+MSG_error_t MSG_process_set_kill_time(m_process_t process, double kill_time)
+{
+  simcall_process_set_kill_time(process,kill_time);
+  return MSG_OK;
+}
+
 /** \ingroup m_process_management
  * \brief Returns the process ID of \a process.
  *