X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ac8eac49ab6fe99c58ace8411b9c378d70bb4915..09fdf0c11557632305d1bc263278dd2e95296378:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index 18cb6bc8a6..a9e2a3c01a 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -10,8 +10,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)"); -extern "C" { - /** @addtogroup m_process_management * * Processes (#msg_process_t) are independent agents that can do stuff on their own. They are in charge of executing @@ -141,7 +139,6 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun xbt_free(argv); return res; } -} msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, msg_host_t host, std::map* properties) @@ -160,8 +157,6 @@ msg_process_t MSG_process_create_from_stdfunc(const char* name, std::functionciface(); } -extern "C" { - /* Become a process in the simulation * * Currently this can only be called by the main thread (once) and only work with some thread factories @@ -199,27 +194,6 @@ void MSG_process_detach() SIMIX_process_detach(); } -/** \ingroup m_process_management - * \param process poor victim - * - * This function simply kills a \a process... scary isn't it ? :) - */ -void MSG_process_kill(msg_process_t process) -{ - process->kill(); -} - -/** -* \brief Wait for the completion of a #msg_process_t. -* -* \param process the process to wait for -* \param timeout wait until the process is over, or the timeout occurs -*/ -msg_error_t MSG_process_join(msg_process_t process, double timeout){ - process->join(timeout); - return MSG_OK; -} - /** Yield the current actor; let the other actors execute first */ void MSG_process_yield() { @@ -295,19 +269,6 @@ int MSG_process_get_number() return SIMIX_process_count(); } -/** \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(msg_process_t process, double kill_time) -{ - process->setKillTime(kill_time); - return MSG_OK; -} - - /** \ingroup m_process_management * \brief Return the PID of the current process. * @@ -347,7 +308,7 @@ msg_process_t MSG_process_self() return SIMIX_process_self()->ciface(); } -smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { +smx_context_t MSG_process_get_smx_ctx(msg_process_t process) { // deprecated -- smx_context_t should die afterward return process->getImpl()->context; } /** @@ -383,4 +344,3 @@ XBT_PUBLIC void MSG_process_unref(msg_process_t process) { intrusive_ptr_release(process); } -}