X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ac8eac49ab6fe99c58ace8411b9c378d70bb4915..d4c8c79a8d299472d3a775b7670615fdccb0b7ee:/src/msg/msg_gos.cpp diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index 68de1d9dc9..65d91fc4f3 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -5,14 +5,14 @@ #include +#include "simgrid/s4u/Mailbox.hpp" +#include "src/instr/instr_private.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "src/msg/msg_private.hpp" #include "src/simix/smx_private.hpp" /* MSG_task_listen looks inside the rdv directly. Not clean. */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, "Logging specific to MSG (gos)"); -extern "C" { - /** \ingroup msg_task_usage * \brief Executes a task and waits for its termination. * @@ -62,12 +62,12 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo if (simdata->host_nb > 0) { simdata->compute = boost::static_pointer_cast(simcall_execution_parallel_start( - task->name, simdata->host_nb, simdata->host_list, simdata->flops_parallel_amount, + task->name ?: "", simdata->host_nb, simdata->host_list, simdata->flops_parallel_amount, simdata->bytes_parallel_amount, -1.0, timeout)); XBT_DEBUG("Parallel execution action created: %p", simdata->compute.get()); } else { simdata->compute = boost::static_pointer_cast( - simcall_execution_start(task->name, simdata->flops_amount, simdata->priority, simdata->bound, + simcall_execution_start(task->name ?: "", simdata->flops_amount, simdata->priority, simdata->bound, MSG_process_get_host(MSG_process_self()))); } simcall_set_category(simdata->compute, task->category); @@ -113,11 +113,8 @@ msg_error_t MSG_process_sleep(double nb_sec) { msg_error_t status = MSG_OK; - if (TRACE_actor_is_enabled()) - simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("ACTOR_STATE")->pushEvent("sleep"); - try { - simcall_process_sleep(nb_sec); + simgrid::s4u::this_actor::sleep_for(nb_sec); } catch(xbt_ex& e) { if (e.category == cancel_error) { @@ -133,9 +130,6 @@ msg_error_t MSG_process_sleep(double nb_sec) throw; } - if (TRACE_actor_is_enabled()) - simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("ACTOR_STATE")->popEvent(); - return status; } @@ -264,7 +258,7 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d double rate) { XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(alias); + simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(alias); msg_error_t ret = MSG_OK; /* We no longer support getting a task from a specific host */ if (host) @@ -280,8 +274,9 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d /* Try to receive it by calling SIMIX network layer */ try { - simcall_comm_recv(MSG_process_self()->getImpl(), mailbox->getImpl(), task, nullptr, nullptr, nullptr, nullptr, timeout, rate); - XBT_DEBUG("Got task %s from %s", (*task)->name, mailbox->getCname()); + simcall_comm_recv(MSG_process_self()->get_impl(), mailbox->get_impl(), task, nullptr, nullptr, nullptr, nullptr, + timeout, rate); + XBT_DEBUG("Got task %s from %s", (*task)->name, mailbox->get_cname()); (*task)->simdata->setNotUsed(); } catch (xbt_ex& e) { @@ -313,8 +308,8 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* al { simdata_task_t t_simdata = nullptr; msg_process_t myself = MSG_process_self(); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(alias); - int call_end = TRACE_msg_task_put_start(task); + simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(alias); + TRACE_msg_task_put_start(task); /* Prepare the task to send */ t_simdata = task->simdata; @@ -326,7 +321,7 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* al /* Send it by calling SIMIX network layer */ smx_activity_t act = - simcall_comm_isend(myself->getImpl(), mailbox->getImpl(), t_simdata->bytes_amount, t_simdata->rate, task, + simcall_comm_isend(myself->get_impl(), mailbox->get_impl(), t_simdata->bytes_amount, t_simdata->rate, task, sizeof(void*), nullptr, cleanup, nullptr, nullptr, detached); t_simdata->comm = boost::static_pointer_cast(act); @@ -337,8 +332,7 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* al if (TRACE_is_enabled()) simcall_set_category(act, task->category); - if (call_end) - TRACE_msg_task_put_end(); + TRACE_msg_task_put_end(); return comm; } @@ -391,7 +385,8 @@ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double max */ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup) { - MSG_task_isend_internal(task, alias, cleanup, 1); + msg_comm_t XBT_ATTRIB_UNUSED comm = MSG_task_isend_internal(task, alias, cleanup, 1); + xbt_assert(comm == nullptr); } /** \ingroup msg_task_usage @@ -452,7 +447,7 @@ msg_comm_t MSG_task_irecv(msg_task_t *task, const char *name) */ msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rate) { - simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(name); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(name); /* FIXME: these functions are not traceable */ /* Sanity check */ @@ -462,9 +457,9 @@ msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rat XBT_CRITICAL("MSG_task_irecv() was asked to write in a non empty task struct."); /* Try to receive it by calling SIMIX network layer */ - msg_comm_t comm = - new simgrid::msg::Comm(nullptr, task, simcall_comm_irecv(SIMIX_process_self(), mbox->getImpl(), task, nullptr, - nullptr, nullptr, nullptr, rate)); + msg_comm_t comm = new simgrid::msg::Comm( + nullptr, task, + simcall_comm_irecv(SIMIX_process_self(), mbox->get_impl(), task, nullptr, nullptr, nullptr, nullptr, rate)); return comm; } @@ -472,14 +467,14 @@ msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rat /** \ingroup msg_task_usage * \brief Checks whether a communication is done, and if yes, finalizes it. * \param comm the communication to test - * \return TRUE if the communication is finished + * \return 'true' if the communication is finished * (but it may have failed, use MSG_comm_get_status() to know its status) - * or FALSE if the communication is not finished yet - * If the status is FALSE, don't forget to use MSG_process_sleep() after the test. + * or 'false' if the communication is not finished yet + * If the status is 'false', don't forget to use MSG_process_sleep() after the test. */ int MSG_comm_test(msg_comm_t comm) { - int finished = 0; + bool finished = false; try { finished = simcall_comm_test(comm->s_comm); @@ -492,11 +487,11 @@ int MSG_comm_test(msg_comm_t comm) switch (e.category) { case network_error: comm->status = MSG_TRANSFER_FAILURE; - finished = 1; + finished = true; break; case timeout_error: comm->status = MSG_TIMEOUT; - finished = 1; + finished = true; break; default: throw; @@ -778,9 +773,9 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl msg_error_t ret = MSG_OK; simdata_task_t t_simdata = nullptr; msg_process_t process = MSG_process_self(); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(alias); + simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(alias); - int call_end = TRACE_msg_task_put_start(task); + TRACE_msg_task_put_start(task); /* Prepare the task to send */ t_simdata = task->simdata; @@ -795,7 +790,7 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl /* Try to send it by calling SIMIX network layer */ try { smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simix call */ - comm = simcall_comm_isend(SIMIX_process_self(), mailbox->getImpl(), t_simdata->bytes_amount, t_simdata->rate, task, + comm = simcall_comm_isend(SIMIX_process_self(), mailbox->get_impl(), t_simdata->bytes_amount, t_simdata->rate, task, sizeof(void*), nullptr, nullptr, nullptr, nullptr, 0); if (TRACE_is_enabled()) simcall_set_category(comm, task->category); @@ -821,8 +816,7 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl t_simdata->setNotUsed(); } - if (call_end) - TRACE_msg_task_put_end(); + TRACE_msg_task_put_end(); return ret; } @@ -850,19 +844,6 @@ msg_error_t MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alia return MSG_task_send_with_timeout(task, alias, timeout); } -/** \ingroup msg_task_usage - * \brief Check if there is a communication going on in a mailbox. - * - * \param alias the name of the mailbox to be considered - * - * \return Returns 1 if there is a communication, 0 otherwise - */ -int MSG_task_listen(const char *alias) -{ - simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(alias); - return mbox->listen() ? 1 : 0; -} - /** \ingroup msg_task_usage * \brief Look if there is a communication on a mailbox and return the PID of the sender process. * @@ -873,7 +854,7 @@ int MSG_task_listen(const char *alias) */ int MSG_task_listen_from(const char *alias) { - simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(alias); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(alias); simgrid::kernel::activity::CommImplPtr comm = boost::static_pointer_cast(mbox->front()); @@ -917,4 +898,3 @@ const char *MSG_task_get_category (msg_task_t task) { return task->category; } -}