// 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);
}
{
m_host_t host = MSG_get_host_by_name(hostname);
m_process_t p = MSG_process_create_with_environment(name, code, data,
- host, kill_time, argc, argv,
+ host, argc, argv,
properties);
+ MSG_process_set_kill_time(p,kill_time);
*((m_process_t*) process) = p;
}
xbt_main_func_t code, void *data,
m_host_t host)
{
- return MSG_process_create_with_environment(name, code, data, host, -1, -1,
+ return MSG_process_create_with_environment(name, code, data, host, -1,
NULL, NULL);
}
void *data, m_host_t host,
int argc, char **argv)
{
- return MSG_process_create_with_environment(name, code, data, host, -1.0,
+ return MSG_process_create_with_environment(name, code, data, host,
argc, argv, NULL);
}
object. It is for user-level information and can be NULL. It can
be retrieved with the function \ref MSG_process_get_data.
* \param host the location where the new process is executed.
- * \param kill_time the time when the process is killed.
* \param argc first argument passed to \a code
* \param argv second argument passed to \a code
* \param properties list a properties defined for this process
m_process_t MSG_process_create_with_environment(const char *name,
xbt_main_func_t code,
void *data, m_host_t host,
- double kill_time,
int argc, char **argv,
xbt_dict_t properties)
{
/* 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, kill_time,
+ simcall_process_create(&process, name, code, simdata, SIMIX_host_get_name(host->smx_host), -1,
argc, argv, properties);
if (!process) {
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;
}
/* 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
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;
}
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.
*