X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/138e6f86566611611b1115c957cae0a1c6a85a4b..65c6bc68a9a3287d76c740862da8f65a1a3121ab:/src/msg/msg_gos.cpp diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index c9cd6f41a2..971170ce68 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -1,16 +1,16 @@ -/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2017. 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 "msg_private.h" -#include "mc/mc.h" -#include "xbt/log.h" -#include "xbt/sysdep.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, - "Logging specific to MSG (gos)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, "Logging specific to MSG (gos)"); + +SG_BEGIN_DECL() /** \ingroup msg_task_usage * \brief Executes a task and waits for its termination. @@ -28,7 +28,6 @@ msg_error_t MSG_task_execute(msg_task_t task) msg_error_t ret = MSG_parallel_task_execute(task); MSG_host_del_task(host, task); - return ret; } @@ -41,20 +40,23 @@ msg_error_t MSG_task_execute(msg_task_t task) * or #MSG_HOST_FAILURE otherwise */ msg_error_t MSG_parallel_task_execute(msg_task_t task) +{ + return MSG_parallel_task_execute_with_timeout(task, -1); +} + +msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeout) { simdata_task_t simdata = task->simdata; - simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data(); e_smx_state_t comp_state; msg_error_t status = MSG_OK; TRACE_msg_task_execute_start(task); - xbt_assert((!simdata->compute) && !task->simdata->isused, - "This task is executed somewhere else. Go fix your code!"); + xbt_assert((!simdata->compute) && !task->simdata->isused, "This task is executed somewhere else. Go fix your code!"); XBT_DEBUG("Computing on %s", MSG_process_get_name(MSG_process_self())); - if (simdata->flops_amount == 0 && !simdata->host_nb) { + if (simdata->flops_amount <= 0.0 && !simdata->host_nb) { TRACE_msg_task_execute_end(task); return MSG_OK; } @@ -63,27 +65,17 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) 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)); + 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); } else { - unsigned long affinity_mask = - (unsigned long)(uintptr_t) xbt_dict_get_or_null_ext(simdata->affinity_mask_db, (char *) p_simdata->m_host, - sizeof(msg_host_t)); - XBT_DEBUG("execute %s@%s with affinity(0x%04lx)", - MSG_task_get_name(task), MSG_host_get_name(p_simdata->m_host), affinity_mask); - - simdata->compute = static_cast( - simcall_execution_start(task->name, simdata->flops_amount, simdata->priority, - simdata->bound, affinity_mask)); + simdata->compute = static_cast( + simcall_execution_start(task->name, simdata->flops_amount, simdata->priority, simdata->bound)); } simcall_set_category(simdata->compute, task->category); - p_simdata->waiting_action = simdata->compute; comp_state = simcall_execution_wait(simdata->compute); - p_simdata->waiting_action = nullptr; simdata->setNotUsed(); XBT_DEBUG("Execution task '%s' finished in state %d", task->name, (int)comp_state); @@ -96,6 +88,9 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) case host_error: status = MSG_HOST_FAILURE; break; + case timeout_error: + status = MSG_TIMEOUT; + break; default: throw; } @@ -107,7 +102,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) simdata->compute = nullptr; TRACE_msg_task_execute_end(task); - MSG_RETURN(status); + return status; } /** \ingroup msg_task_usage @@ -120,7 +115,6 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) msg_error_t MSG_process_sleep(double nb_sec) { msg_error_t status = MSG_OK; - /*msg_process_t proc = MSG_process_self();*/ TRACE_msg_process_sleep_in(MSG_process_self()); @@ -128,9 +122,8 @@ msg_error_t MSG_process_sleep(double nb_sec) simcall_process_sleep(nb_sec); } catch(xbt_ex& e) { - switch (e.category) { - case cancel_error: - XBT_DEBUG("According to the JAVA API, a sleep call should only deal with HostFailureException, WTF here ?"); + if (e.category == cancel_error) { + 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. @@ -138,14 +131,12 @@ msg_error_t MSG_process_sleep(double nb_sec) // 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) status = MSG_TASK_CANCELED; - break; - default: + } else throw; - } } TRACE_msg_process_sleep_out(MSG_process_self()); - MSG_RETURN(status); + return status; } /** \ingroup msg_task_usage @@ -237,21 +228,8 @@ msg_error_t MSG_task_receive_with_timeout_bounded(msg_task_t * task, const char */ msg_error_t MSG_task_receive_ext(msg_task_t * task, const char *alias, double timeout, msg_host_t host) { - msg_error_t ret = MSG_OK; XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias); - try { - ret = MSG_mailbox_get_task_ext(MSG_mailbox_get_by_alias(alias), task, host, timeout); - } - catch(xbt_ex& e) { - switch (e.category) { - case cancel_error: /* may be thrown by MSG_mailbox_get_by_alias */ - ret = MSG_HOST_FAILURE; - break; - default: - throw; - } - } - return ret; + return MSG_task_receive_ext_bounded(task, alias, timeout, host, -1.0); } /** \ingroup msg_task_usage @@ -265,42 +243,81 @@ msg_error_t MSG_task_receive_ext(msg_task_t * task, const char *alias, double ti * * \return Returns * #MSG_OK if the task was successfully received, -* #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE, or #MSG_TIMEOUT otherwise. + * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE, or #MSG_TIMEOUT otherwise. */ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, double timeout, msg_host_t host, double rate) { XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias); - return MSG_mailbox_get_task_ext_bounded(MSG_mailbox_get_by_alias(alias), task, host, timeout, rate); + simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(alias); + msg_error_t ret = MSG_OK; + /* We no longer support getting a task from a specific host */ + if (host) + THROW_UNIMPLEMENTED; + + TRACE_msg_task_get_start(); + double start_time = MSG_get_clock(); + + /* Sanity check */ + xbt_assert(task, "Null pointer for the task storage"); + + if (*task) + XBT_WARN("Asked to write the received task in a non empty struct -- proceeding."); + + /* 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()); + (*task)->simdata->setNotUsed(); + } + catch (xbt_ex& e) { + switch (e.category) { + case host_error: + case cancel_error: + ret = MSG_HOST_FAILURE; + break; + case network_error: + ret = MSG_TRANSFER_FAILURE; + break; + case timeout_error: + ret = MSG_TIMEOUT; + break; + default: + throw; + } + } + + if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) { + TRACE_msg_task_get_end(start_time, *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_synchro_t), + int (*match_fun)(void*,void*, smx_activity_t), void *match_data, void_f_pvoid_t cleanup, int detached) { simdata_task_t t_simdata = nullptr; - msg_process_t process = MSG_process_self(); - msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias); + 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); /* Prepare the task to send */ t_simdata = task->simdata; - t_simdata->sender = process; - t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data())->m_host; + t_simdata->sender = myself; + t_simdata->source = MSG_host_self(); t_simdata->setUsed(); t_simdata->comm = nullptr; msg_global->sent_msg++; /* Send it by calling SIMIX network layer */ - smx_synchro_t act = simcall_comm_isend(SIMIX_process_self(), mailbox, t_simdata->bytes_amount, t_simdata->rate, + 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); /* FIXME: is the field t_simdata->comm still useful? */ + t_simdata->comm = static_cast(act); - msg_comm_t comm; - if (detached) { - comm = nullptr; - } else { + msg_comm_t comm = nullptr; + if (! detached) { comm = xbt_new0(s_msg_comm_t, 1); comm->task_sent = task; comm->task_received = nullptr; @@ -362,7 +379,7 @@ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double max * \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_synchro_t), void *match_data) + int (*match_fun)(void*, void*, smx_activity_t), void *match_data) { return MSG_task_isend_internal(task, alias, match_fun, match_data, nullptr, 0); } @@ -435,7 +452,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) { - smx_mailbox_t rdv = MSG_mailbox_get_by_alias(name); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(name); /* FIXME: these functions are not traceable */ /* Sanity check */ @@ -449,7 +466,7 @@ msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rat comm->task_sent = nullptr; comm->task_received = task; comm->status = MSG_OK; - comm->s_comm = simcall_comm_irecv(MSG_process_self(), rdv, task, nullptr, nullptr, nullptr, nullptr, rate); + comm->s_comm = simcall_comm_irecv(SIMIX_process_self(), mbox->getImpl(), task, nullptr, nullptr, nullptr, nullptr, rate); return comm; } @@ -502,17 +519,18 @@ int MSG_comm_testany(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_synchro_t), nullptr); + /* Create the equivalent array with SIMIX objects: */ + std::vector s_comms; + s_comms.reserve(xbt_dynar_length(comms)); msg_comm_t comm; unsigned int cursor; xbt_dynar_foreach(comms, cursor, comm) { - xbt_dynar_push(s_comms, &comm->s_comm); + s_comms.push_back(comm->s_comm); } msg_error_t status = MSG_OK; try { - finished_index = simcall_comm_testany(s_comms); + finished_index = simcall_comm_testany(s_comms.data(), s_comms.size()); } catch (xbt_ex& e) { switch (e.category) { @@ -528,7 +546,6 @@ int MSG_comm_testany(xbt_dynar_t comms) throw; } } - xbt_dynar_free(&s_comms); if (finished_index != -1) { comm = xbt_dynar_get_as(comms, finished_index, msg_comm_t); @@ -599,10 +616,8 @@ msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout) */ void MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout) { - int i = 0; - for (i = 0; i < nb_elem; i++) { + for (int i = 0; i < nb_elem; i++) MSG_comm_wait(comm[i], timeout); - } } /** \ingroup msg_task_usage @@ -616,7 +631,7 @@ 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_synchro_t), nullptr); + xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_activity_t), nullptr); msg_comm_t comm; unsigned int cursor; xbt_dynar_foreach(comms, cursor, comm) { @@ -625,7 +640,7 @@ int MSG_comm_waitany(xbt_dynar_t comms) msg_error_t status = MSG_OK; try { - finished_index = simcall_comm_waitany(s_comms); + finished_index = simcall_comm_waitany(s_comms, -1); } catch(xbt_ex& e) { switch (e.category) { @@ -684,20 +699,20 @@ msg_task_t MSG_comm_get_task(msg_comm_t comm) /** * \brief This function is called by SIMIX in kernel mode to copy the data of a comm. - * \param comm the comm + * \param synchro the comm * \param buff the data copied * \param buff_size size of the buffer */ -void MSG_comm_copy_data_from_SIMIX(smx_synchro_t synchro, void* buff, size_t buff_size) +void MSG_comm_copy_data_from_SIMIX(smx_activity_t synchro, void* buff, size_t buff_size) { - simgrid::simix::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::Comm *comm = static_cast(synchro); SIMIX_comm_copy_pointer_callback(comm, buff, buff_size); // notify the user callback if any if (msg_global->task_copy_callback) { - msg_task_t task = (msg_task_t) buff; - msg_global->task_copy_callback(task, comm->src_proc, comm->dst_proc); + msg_task_t task = static_cast(buff); + msg_global->task_copy_callback(task, comm->src_proc->ciface(), comm->dst_proc->ciface()); } } @@ -756,31 +771,28 @@ 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(); - simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data(); - msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias); + simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(alias); int call_end = TRACE_msg_task_put_start(task); //must be after CHECK_HOST() /* Prepare the task to send */ t_simdata = task->simdata; t_simdata->sender = process; - t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data())->m_host; + t_simdata->source = MSG_host_self(); t_simdata->setUsed(); t_simdata->comm = nullptr; msg_global->sent_msg++; - p_simdata->waiting_task = task; - /* Try to send it by calling SIMIX network layer */ try { - smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simix call */ - comm = simcall_comm_isend(SIMIX_process_self(), mailbox,t_simdata->bytes_amount, + 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); if (TRACE_is_enabled()) simcall_set_category(comm, task->category); - t_simdata->comm = static_cast(comm); + t_simdata->comm = static_cast(comm); simcall_comm_wait(comm, timeout); } catch (xbt_ex& e) { @@ -802,10 +814,9 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl t_simdata->setNotUsed(); } - p_simdata->waiting_task = nullptr; if (call_end) TRACE_msg_task_put_end(); - MSG_RETURN(ret); + return ret; } /** \ingroup msg_task_usage @@ -836,8 +847,9 @@ msg_error_t MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alia */ int MSG_task_listen(const char *alias) { - smx_mailbox_t mbox = MSG_mailbox_get_by_alias(alias); - return !MSG_mailbox_is_empty(mbox) || (mbox->permanent_receiver && !mbox->done_comm_queue->empty()); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(alias); + return !mbox->empty() || + (mbox->getImpl()->permanent_receiver && !mbox->getImpl()->done_comm_queue.empty()); } /** \ingroup msg_task_usage @@ -850,12 +862,13 @@ int MSG_task_listen(const char *alias) */ int MSG_task_listen_from(const char *alias) { - msg_task_t task; + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(alias); + simgrid::kernel::activity::Comm* comm = static_cast(mbox->front()); - if (nullptr == (task = MSG_mailbox_front(MSG_mailbox_get_by_alias(alias)))) + if (!comm) return -1; - return MSG_process_get_PID(task->simdata->sender); + return MSG_process_get_PID( static_cast(comm->src_data)->simdata->sender ); } /** \ingroup msg_task_usage @@ -893,38 +906,4 @@ const char *MSG_task_get_category (msg_task_t task) return task->category; } -/** - * \brief Returns the value of a given AS or router property - * - * \param asr the name of a router or AS - * \param name a property name - * \return value of a property (or nullptr if property not set) - */ -const char *MSG_as_router_get_property_value(const char* asr, const char *name) -{ - return (char*) xbt_dict_get_or_null(MSG_as_router_get_properties(asr), name); -} - -/** - * \brief Returns a xbt_dict_t consisting of the list of properties assigned to - * a the AS or router - * - * \param asr the name of a router or AS - * \return a dict containing the properties - */ -xbt_dict_t MSG_as_router_get_properties(const char* asr) -{ - return (simcall_asr_get_properties(asr)); -} - -/** - * \brief Change the value of a given AS or router - * - * \param asr the name of a router or AS - * \param name a property name - * \param value what to change the property to - * \param free_ctn the freeing function to use to kill the value on need - */ -void MSG_as_router_set_property_value(const char* asr, const char *name, char *value,void_f_pvoid_t free_ctn) { - xbt_dict_set(MSG_as_router_get_properties(asr), name, value,free_ctn); -} +SG_END_DECL()