X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da9e3460f9f8e4eb2ad4c523a19a8ddb79807e60..431765cb8198579ac316fa0875b5c8988a501675:/src/msg/msg_gos.cpp diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index 0d633050ea..feb95778ff 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -1,15 +1,18 @@ -/* 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/kernel/activity/ExecImpl.hpp" #include "src/msg/msg_private.h" #include "src/simix/smx_private.h" /* 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() + /** \ingroup msg_task_usage * \brief Executes a task and waits for its termination. * @@ -45,17 +48,17 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) 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 = static_cast(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((not simdata->compute) && not 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.0 && !simdata->host_nb) { + if (simdata->flops_amount <= 0.0 && not simdata->host_nb) { TRACE_msg_task_execute_end(task); return MSG_OK; } @@ -64,19 +67,18 @@ 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( + simdata->compute = boost::static_pointer_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); @@ -123,20 +125,17 @@ 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, I'm lost."); + 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. // 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; - break; - default: + } else throw; - } } TRACE_msg_process_sleep_out(MSG_process_self()); @@ -270,8 +269,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(), mailbox->getImpl(), task, nullptr, nullptr, nullptr, nullptr, timeout, rate); - XBT_DEBUG("Got task %s from %s",(*task)->name,mailbox->name()); + 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->getName()); (*task)->simdata->setNotUsed(); } catch (xbt_ex& e) { @@ -298,35 +297,32 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d } /* 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) +static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* alias, + int (*match_fun)(void*, void*, void*), void* match_data, + void_f_pvoid_t cleanup, int detached) { simdata_task_t t_simdata = nullptr; - msg_process_t myself = SIMIX_process_self(); + 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 = myself; - t_simdata->source = (static_cast(SIMIX_process_self_get_data()))->m_host; + 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_activity_t act = simcall_comm_isend(myself, 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*), (simix_match_func_t)match_fun, cleanup, nullptr, match_data, detached); + t_simdata->comm = boost::static_pointer_cast(act); msg_comm_t comm = nullptr; - if (! 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; + if (not detached) { + comm = new simgrid::msg::Comm(task, nullptr, act); } if (TRACE_is_enabled()) @@ -382,8 +378,8 @@ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double max * \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) +msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char* alias, int (*match_fun)(void*, void*, void*), + void* match_data) { return MSG_task_isend_internal(task, alias, match_fun, match_data, nullptr, 0); } @@ -466,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(MSG_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; } @@ -524,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; @@ -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 @@ -635,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; @@ -709,14 +706,15 @@ 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::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_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 = static_cast(buff); - msg_global->task_copy_callback(task, comm->src_proc, comm->dst_proc); + msg_global->task_copy_callback(task, comm->src_proc->ciface(), comm->dst_proc->ciface()); } } @@ -775,23 +773,20 @@ 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 = static_cast(SIMIX_process_self_get_data()); simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(alias); - int call_end = TRACE_msg_task_put_start(task); //must be after CHECK_HOST() + 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 = (static_cast(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_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simix call */ @@ -799,8 +794,8 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl 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); - simcall_comm_wait(comm, timeout); + t_simdata->comm = boost::static_pointer_cast(comm); + simcall_comm_wait(comm, timeout); } catch (xbt_ex& e) { switch (e.category) { @@ -821,7 +816,6 @@ 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(); return ret; @@ -856,8 +850,7 @@ msg_error_t MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alia int MSG_task_listen(const char *alias) { simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(alias); - return !mbox->empty() || - (mbox->getImpl()->permanent_receiver && !mbox->getImpl()->done_comm_queue.empty()); + return mbox->listen() ? 1 : 0; } /** \ingroup msg_task_usage @@ -871,12 +864,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::Comm* comm = static_cast(mbox->front()); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(mbox->front()); - if (!comm) + 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 @@ -913,3 +907,5 @@ const char *MSG_task_get_category (msg_task_t task) { return task->category; } + +SG_END_DECL()