X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a92d7b716f51a53dea7f59db8524d4add713b910..9fa7e1453457bf349fd0a2fb5941b08b12b77f56:/src/msg/msg_gos.cpp diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index 3f416bc8c6..70cc9d4536 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -1,16 +1,17 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "src/msg/msg_private.h" -#include "src/simix/smx_private.h" /* MSG_task_listen looks inside the rdv directly. Not clean. */ +#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)"); -SG_BEGIN_DECL() +extern "C" { /** \ingroup msg_task_usage * \brief Executes a task and waits for its termination. @@ -21,14 +22,7 @@ SG_BEGIN_DECL() */ msg_error_t MSG_task_execute(msg_task_t task) { - /* TODO: add this to other locations */ - msg_host_t host = MSG_process_get_host(MSG_process_self()); - MSG_host_add_task(host, task); - - msg_error_t ret = MSG_parallel_task_execute(task); - - MSG_host_del_task(host, task); - return ret; + return MSG_parallel_task_execute(task); } /** \ingroup msg_task_usage @@ -66,13 +60,15 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo simdata->setUsed(); if (simdata->host_nb > 0) { - simdata->compute = static_cast(simcall_execution_parallel_start( - task->name, simdata->host_nb, simdata->host_list, simdata->flops_parallel_amount, - simdata->bytes_parallel_amount, 1.0, -1.0, timeout)); - XBT_DEBUG("Parallel execution action created: %p", simdata->compute); + simdata->compute = + boost::static_pointer_cast(simcall_execution_parallel_start( + 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 = static_cast( - simcall_execution_start(task->name, simdata->flops_amount, simdata->priority, simdata->bound)); + simdata->compute = boost::static_pointer_cast( + 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); comp_state = simcall_execution_wait(simdata->compute); @@ -117,26 +113,29 @@ msg_error_t MSG_process_sleep(double nb_sec) { msg_error_t status = MSG_OK; - TRACE_msg_process_sleep_in(MSG_process_self()); + 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); } catch(xbt_ex& e) { if (e.category == cancel_error) { - XBT_DEBUG("According to the JAVA API, a sleep call should only deal with HostFailureException, I'm lost."); + XBT_DEBUG("According to the JAVA API, a sleep call should only deal with HostFailureException, I'm lost."); // adsein: MSG_TASK_CANCELED is assigned when someone kills the process that made the sleep, this is not // correct. For instance, when the node is turned off, the error should be MSG_HOST_FAILURE, which is by the way // and according to the JAVA document, the only exception that can be triggered by MSG_Process_sleep call. // To avoid possible impacts in the code, I just raised a host_failure exception for the moment in the JAVA code // and did not change anythings at the C level. - // See comment in the jmsg_process.c file, function JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos) + // See comment in the jmsg_process.c file, function JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos) status = MSG_TASK_CANCELED; } else throw; } - TRACE_msg_process_sleep_out(MSG_process_self()); + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("ACTOR_STATE")->popEvent(); + return status; } @@ -163,7 +162,12 @@ msg_error_t MSG_task_receive(msg_task_t * task, const char *alias) * * \param task a memory location for storing a #msg_task_t. * \param alias name of the mailbox to receive the task from - * \param rate limit the reception to rate bandwidth + * \param rate limit the reception to rate bandwidth (byte/sec) + * + * The rate parameter can be used to receive a task with a limited + * bandwidth (smaller than the physical available value). Use + * MSG_task_receive() if you don't limit the rate (or pass -1 as a + * rate value do disable this feature). * * \return Returns * #MSG_OK if the task was successfully received, @@ -200,7 +204,12 @@ msg_error_t MSG_task_receive_with_timeout(msg_task_t * task, const char *alias, * \param task a memory location for storing a #msg_task_t. * \param alias name of the mailbox to receive the task from * \param timeout is the maximum wait time for completion (if -1, this call is the same as #MSG_task_receive) - * \param rate limit the reception to rate bandwidth + * \param rate limit the reception to rate bandwidth (byte/sec) + * + * The rate parameter can be used to send a task with a limited + * bandwidth (smaller than the physical available value). Use + * MSG_task_receive() if you don't limit the rate (or pass -1 as a + * rate value do disable this feature). * * \return Returns * #MSG_OK if the task was successfully received, @@ -240,7 +249,12 @@ msg_error_t MSG_task_receive_ext(msg_task_t * task, const char *alias, double ti * \param alias name of the mailbox to receive the task from * \param timeout is the maximum wait time for completion (provide -1 for no timeout) * \param host a #msg_host_t host from where the task was sent - * \param rate limit the reception to rate bandwidth + * \param rate limit the reception to rate bandwidth (byte/sec) + * + * The rate parameter can be used to receive a task with a limited + * bandwidth (smaller than the physical available value). Use + * MSG_task_receive_ext() if you don't limit the rate (or pass -1 as a + * rate value do disable this feature). * * \return Returns * #MSG_OK if the task was successfully received, @@ -257,7 +271,6 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d THROW_UNIMPLEMENTED; TRACE_msg_task_get_start(); - double start_time = MSG_get_clock(); /* Sanity check */ xbt_assert(task, "Null pointer for the task storage"); @@ -268,9 +281,8 @@ 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->name()); + XBT_DEBUG("Got task %s from %s", (*task)->name, mailbox->getCname()); (*task)->simdata->setNotUsed(); - SIMIX_comm_unref((*task)->simdata->comm); } catch (xbt_ex& e) { switch (e.category) { @@ -290,15 +302,14 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d } if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) { - TRACE_msg_task_get_end(start_time, *task); + TRACE_msg_task_get_end(*task); } return ret; } -/* Internal function used to factorize code between MSG_task_isend_with_matching() and MSG_task_dsend(). */ -static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *alias, - int (*match_fun)(void*,void*, smx_activity_t), - void *match_data, void_f_pvoid_t cleanup, int detached) +/* Internal function used to factorize code between MSG_task_isend(), MSG_task_isend_bounded(), and MSG_task_dsend(). */ +static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* alias, + void_f_pvoid_t cleanup, int detached) { simdata_task_t t_simdata = nullptr; msg_process_t myself = MSG_process_self(); @@ -314,17 +325,14 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *al msg_global->sent_msg++; /* 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, sizeof(void *), match_fun, cleanup, nullptr, match_data,detached); - t_simdata->comm = static_cast(act); + smx_activity_t act = + simcall_comm_isend(myself->getImpl(), mailbox->getImpl(), t_simdata->bytes_amount, t_simdata->rate, task, + sizeof(void*), nullptr, cleanup, nullptr, nullptr, detached); + t_simdata->comm = boost::static_pointer_cast(act); msg_comm_t comm = nullptr; if (not detached) { - comm = xbt_new0(s_msg_comm_t, 1); - comm->task_sent = task; - comm->task_received = nullptr; - comm->status = MSG_OK; - comm->s_comm = act; + comm = new simgrid::msg::Comm(task, nullptr, act); } if (TRACE_is_enabled()) @@ -346,7 +354,7 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *al */ msg_comm_t MSG_task_isend(msg_task_t task, const char *alias) { - return MSG_task_isend_internal(task, alias, nullptr, nullptr, nullptr, 0); + return MSG_task_isend_internal(task, alias, nullptr, 0); } /** \ingroup msg_task_usage @@ -357,33 +365,13 @@ msg_comm_t MSG_task_isend(msg_task_t task, const char *alias) * * \param task a #msg_task_t to send on another location. * \param alias name of the mailbox to sent the task to - * \param maxrate the maximum communication rate for sending this task . + * \param maxrate the maximum communication rate for sending this task (byte/sec). * \return the msg_comm_t communication created */ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate) { task->simdata->rate = maxrate; - return MSG_task_isend_internal(task, alias, nullptr, nullptr, nullptr, 0); -} - -/** \ingroup msg_task_usage - * \brief Sends a task on a mailbox, with support for matching requests - * - * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() to end the communication. - * - * \param task a #msg_task_t to send on another location. - * \param alias name of the mailbox to sent the task to - * \param match_fun boolean function which parameters are: - * - match_data_provided_here - * - match_data_provided_by_other_side_if_any - * - the_smx_synchro_describing_the_other_side - * \param match_data user provided data passed to match_fun - * \return the msg_comm_t communication created - */ -msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char *alias, - int (*match_fun)(void*, void*, smx_activity_t), void *match_data) -{ - return MSG_task_isend_internal(task, alias, match_fun, match_data, nullptr, 0); + return MSG_task_isend_internal(task, alias, nullptr, 0); } /** \ingroup msg_task_usage @@ -403,7 +391,7 @@ msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char *alias, */ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup) { - MSG_task_isend_internal(task, alias, nullptr, nullptr, cleanup, 1); + MSG_task_isend_internal(task, alias, cleanup, 1); } /** \ingroup msg_task_usage @@ -416,12 +404,17 @@ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup) * this thread * in the SimGrid-user mailing list archive. * + * The rate parameter can be used to send a task with a limited + * bandwidth (smaller than the physical available value). Use + * MSG_task_dsend() if you don't limit the rate (or pass -1 as a rate + * value do disable this feature). + * * \param task a #msg_task_t to send on another location. * \param alias name of the mailbox to sent the task to * \param cleanup a function to destroy the task if the * communication fails, e.g. MSG_task_destroy * (if nullptr, no function will be called) - * \param maxrate the maximum communication rate for sending this task + * \param maxrate the maximum communication rate for sending this task (byte/sec) * */ void MSG_task_dsend_bounded(msg_task_t task, const char *alias, void_f_pvoid_t cleanup, double maxrate) @@ -447,9 +440,14 @@ msg_comm_t MSG_task_irecv(msg_task_t *task, const char *name) /** \ingroup msg_task_usage * \brief Starts listening for receiving a task from an asynchronous communication at a given rate. * + * The rate parameter can be used to receive a task with a limited + * bandwidth (smaller than the physical available value). Use + * MSG_task_irecv() if you don't limit the rate (or pass -1 as a rate + * value do disable this feature). + * * \param task a memory location for storing a #msg_task_t. has to be valid until the end of the communication. * \param name of the mailbox to receive the task on - * \param rate limit the bandwidth to the given rate + * \param rate limit the bandwidth to the given rate (byte/sec) * \return the msg_comm_t communication created */ msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rate) @@ -464,11 +462,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 = xbt_new0(s_msg_comm_t, 1); - comm->task_sent = nullptr; - comm->task_received = task; - comm->status = MSG_OK; - comm->s_comm = 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->getImpl(), task, nullptr, + nullptr, nullptr, nullptr, rate)); return comm; } @@ -476,32 +472,31 @@ 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); if (finished && comm->task_received != nullptr) { /* I am the receiver */ (*comm->task_received)->simdata->setNotUsed(); - SIMIX_comm_unref(comm->s_comm); } } catch (xbt_ex& e) { 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; @@ -523,7 +518,7 @@ int MSG_comm_testany(xbt_dynar_t comms) int finished_index = -1; /* Create the equivalent array with SIMIX objects: */ - std::vector s_comms; + std::vector s_comms; s_comms.reserve(xbt_dynar_length(comms)); msg_comm_t comm; unsigned int cursor; @@ -558,7 +553,6 @@ int MSG_comm_testany(xbt_dynar_t comms) if (status == MSG_OK && comm->task_received != nullptr) { /* I am the receiver */ (*comm->task_received)->simdata->setNotUsed(); - SIMIX_comm_unref(comm->s_comm); } } @@ -571,7 +565,7 @@ int MSG_comm_testany(xbt_dynar_t comms) */ void MSG_comm_destroy(msg_comm_t comm) { - xbt_free(comm); + delete comm; } /** \ingroup msg_task_usage @@ -587,7 +581,6 @@ msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout) { try { simcall_comm_wait(comm->s_comm, timeout); - SIMIX_comm_unref(comm->s_comm); if (comm->task_received != nullptr) { /* I am the receiver */ @@ -636,11 +629,14 @@ int MSG_comm_waitany(xbt_dynar_t comms) int finished_index = -1; /* create the equivalent dynar with SIMIX objects */ - xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_activity_t), nullptr); + xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_activity_t), [](void*ptr){ + intrusive_ptr_release(*(simgrid::kernel::activity::ActivityImpl**)ptr); + }); msg_comm_t comm; unsigned int cursor; xbt_dynar_foreach(comms, cursor, comm) { - xbt_dynar_push(s_comms, &comm->s_comm); + intrusive_ptr_add_ref(comm->s_comm.get()); + xbt_dynar_push_as(s_comms, simgrid::kernel::activity::ActivityImpl*, comm->s_comm.get()); } msg_error_t status = MSG_OK; @@ -672,7 +668,6 @@ int MSG_comm_waitany(xbt_dynar_t comms) if (comm->task_received != nullptr) { /* I am the receiver */ (*comm->task_received)->simdata->setNotUsed(); - SIMIX_comm_unref(comm->s_comm); } return finished_index; @@ -711,7 +706,8 @@ msg_task_t MSG_comm_get_task(msg_comm_t comm) */ void MSG_comm_copy_data_from_SIMIX(smx_activity_t synchro, void* buff, size_t buff_size) { - simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); SIMIX_comm_copy_pointer_callback(comm, buff, buff_size); @@ -747,9 +743,14 @@ msg_error_t MSG_task_send(msg_task_t task, const char *alias) * This is a blocking function, the execution flow will be blocked until the task is sent. The maxrate parameter allows * the application to limit the bandwidth utilization of network links when sending the task. * + * The maxrate parameter can be used to send a task with a limited + * bandwidth (smaller than the physical available value). Use + * MSG_task_send() if you don't limit the rate (or pass -1 as a rate + * value do disable this feature). + * * \param task the task to be sent * \param alias the mailbox name to where the task is sent - * \param maxrate the maximum communication rate for sending this task + * \param maxrate the maximum communication rate for sending this task (byte/sec) * * \return Returns #MSG_OK if the task was successfully sent, * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE otherwise. @@ -794,13 +795,12 @@ 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, sizeof(void *), nullptr, nullptr, nullptr, task, 0); + comm = simcall_comm_isend(SIMIX_process_self(), mailbox->getImpl(), 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); - t_simdata->comm = static_cast(comm); + t_simdata->comm = boost::static_pointer_cast(comm); simcall_comm_wait(comm, timeout); - SIMIX_comm_unref(comm); } catch (xbt_ex& e) { switch (e.category) { @@ -831,10 +831,15 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl * * This is a blocking function, the execution flow will be blocked until the task is sent or the timeout is achieved. * + * The maxrate parameter can be used to send a task with a limited + * bandwidth (smaller than the physical available value). Use + * MSG_task_send_with_timeout() if you don't limit the rate (or pass -1 as a rate + * value do disable this feature). + * * \param task the task to be sent * \param alias the mailbox name to where the task is sent * \param timeout is the maximum wait time for completion (if -1, this call is the same as #MSG_task_send) - * \param maxrate the maximum communication rate for sending this task + * \param maxrate the maximum communication rate for sending this task (byte/sec) * * \return Returns #MSG_OK if the task was successfully sent, * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE, or #MSG_TIMEOUT otherwise. @@ -869,12 +874,13 @@ 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::kernel::activity::CommImpl* comm = static_cast(mbox->front()); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(mbox->front()); if (not comm) return -1; - return MSG_process_get_PID( static_cast(comm->src_data)->simdata->sender ); + return MSG_process_get_PID(static_cast(comm->src_buff)->simdata->sender); } /** \ingroup msg_task_usage @@ -911,5 +917,4 @@ const char *MSG_task_get_category (msg_task_t task) { return task->category; } - -SG_END_DECL() +}