X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df12bbc75c274351f3b3a628740e0b3270f08e18..d947ff7466b473eeec602007934f8336a9b17f3c:/src/msg/msg_process.c diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c index 6c87550a9e..ddce625a76 100644 --- a/src/msg/msg_process.c +++ b/src/msg/msg_process.c @@ -45,7 +45,6 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc) #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); @@ -106,7 +105,7 @@ msg_process_t MSG_process_create(const char *name, m_process_management (to create a new #msg_process_t for example), 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 + or destroy some #msg_task_t for example) and in \ref 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 @@ -140,7 +139,7 @@ msg_process_t MSG_process_create_with_arguments(const char *name, m_process_management (to create a new #msg_process_t for example), 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 + or destroy some #msg_task_t for example) and in \ref 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 @@ -180,7 +179,7 @@ msg_process_t MSG_process_create_with_environment(const char *name, #ifdef HAVE_TRACING TRACE_msg_process_create(name, simdata->PID, simdata->m_host); - #endif +#endif /* 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, SIMIX_host_get_name(host->smx_host), -1, @@ -224,7 +223,7 @@ void MSG_process_kill(msg_process_t process) * This function checks whether \a process and \a host are valid pointers and change the value of the #msg_host_t on which \a process is running. */ -MSG_error_t MSG_process_migrate(msg_process_t process, msg_host_t host) +msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host) { simdata_process_t simdata = simcall_process_get_data(process); simdata->m_host = host; @@ -257,7 +256,7 @@ void* MSG_process_get_data(msg_process_t process) * This function checks whether \a process is a valid pointer or not and sets the user data associated to this process. */ -MSG_error_t MSG_process_set_data(msg_process_t process, void *data) +msg_error_t MSG_process_set_data(msg_process_t process, void *data) { xbt_assert(process != NULL, "Invalid parameter"); @@ -313,6 +312,12 @@ msg_process_t MSG_process_from_PID(int PID) xbt_dynar_t MSG_processes_as_dynar(void) { return SIMIX_processes_as_dynar(); } +/** @brief Return the current number MSG processes. + */ +int MSG_process_get_number(void) +{ + return SIMIX_process_count(); +} /** \ingroup m_process_management * \brief Set the kill time of a process. @@ -320,7 +325,7 @@ xbt_dynar_t MSG_processes_as_dynar(void) { * \param process a process * \param kill_time the time when the process is killed. */ -MSG_error_t MSG_process_set_kill_time(msg_process_t process, double kill_time) +msg_error_t MSG_process_set_kill_time(msg_process_t process, double kill_time) { simcall_process_set_kill_time(process,kill_time); return MSG_OK; @@ -437,7 +442,7 @@ msg_process_t MSG_process_self(void) * This function suspends the process by suspending the task on which * it was waiting for the completion. */ -MSG_error_t MSG_process_suspend(msg_process_t process) +msg_error_t MSG_process_suspend(msg_process_t process) { xbt_assert(process != NULL, "Invalid parameter"); @@ -455,7 +460,7 @@ MSG_error_t MSG_process_suspend(msg_process_t process) * This function resumes a suspended process by resuming the task on * which it was waiting for the completion. */ -MSG_error_t MSG_process_resume(msg_process_t process) +msg_error_t MSG_process_resume(msg_process_t process) { xbt_assert(process != NULL, "Invalid parameter"); @@ -500,3 +505,10 @@ void MSG_process_on_exit(int_f_pvoid_t fun, void *data) { XBT_PUBLIC(void) MSG_process_auto_restart_set(msg_process_t process, int auto_restart) { simcall_process_auto_restart_set(process,auto_restart); } +/* + * \ingroup m_process_management + * \brief Restarts a process from the beginning. + */ +XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process) { + return simcall_process_restart(process); +}