X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22752d7347b7143b7eeb7de734cad5e469615996..6de9090dd8692387ae343c587b26915f9922d7bd:/src/msg/msg_process.c diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c index d478050cc3..2834674865 100644 --- a/src/msg/msg_process.c +++ b/src/msg/msg_process.c @@ -12,7 +12,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)"); /** @addtogroup m_process_management - * \htmlonly \endhtmlonly + * \htmlonly \endhtmlonly * * We need to simulate many independent scheduling decisions, so * the concept of process is at the heart of the @@ -51,6 +51,12 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc) msg_global->process_data_cleanup(msg_proc->data); } + // remove the process from its virtual machine + if (msg_proc->vm) { + int pos = xbt_dynar_search(msg_proc->vm->processes,&smx_proc); + xbt_dynar_remove_at(msg_proc->vm->processes,pos, NULL); + } + // free the MSG process xbt_free(msg_proc); } @@ -58,13 +64,14 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_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; } @@ -97,7 +104,7 @@ m_process_t MSG_process_create(const char *name, in \ref m_host_management (only the read-only functions i.e. whose name contains the word get), in \ref m_task_management (to create or destroy some #m_task_t for example) and in \ref - msg_gos_functions (to handle file transfers and task processing). + msg_task_usage (to handle file transfers and task processing). * \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 MSG_process_get_data. @@ -131,7 +138,7 @@ m_process_t MSG_process_create_with_arguments(const char *name, in \ref m_host_management (only the read-only functions i.e. whose name contains the word get), in \ref m_task_management (to create or destroy some #m_task_t for example) and in \ref - msg_gos_functions (to handle file transfers and task processing). + msg_task_usage (to handle file transfers and task processing). * \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 MSG_process_get_data. @@ -174,7 +181,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 +213,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 +238,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; } @@ -305,7 +312,7 @@ m_host_t MSG_process_get_host(m_process_t process) */ m_process_t MSG_process_from_PID(int PID) { - return SIMIX_process_from_PID(PID); + return SIMIX_process_from_PID(PID); } /** @brief returns a list of all currently existing processes */ @@ -313,6 +320,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. * @@ -469,3 +488,12 @@ int MSG_process_is_suspended(m_process_t process) smx_context_t MSG_process_get_smx_ctx(m_process_t process) { return SIMIX_process_get_context(process); } +/** + * \ingroup m_process_management + * \brief Add a function to the list of "on_exit" functions for the current process. + * The on_exit functions are the functions executed when your process is killed. + * You should use them to free the data used by your process. + */ +void MSG_process_on_exit_add(int_f_pvoid_t fun, void *data) { + SIMIX_process_on_exit_add(fun,data); +}