X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5001c11df4c0d47229ce8c6293ee2fbbb61f802e..712483e35680742d6f63d087484e3abc0cf9a90e:/src/msg/msg_gos.cpp diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index 0a36f018c0..295ba5f308 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -11,8 +11,7 @@ #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)"); /** \ingroup msg_task_usage * \brief Executes a task and waits for its termination. @@ -45,18 +44,17 @@ msg_error_t MSG_task_execute(msg_task_t task) msg_error_t MSG_parallel_task_execute(msg_task_t task) { simdata_task_t simdata = task->simdata; - simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data(); + 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((!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; } @@ -71,15 +69,8 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) 1.0, -1.0)); 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; @@ -122,7 +113,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()); @@ -132,7 +122,7 @@ msg_error_t MSG_process_sleep(double 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 ?"); + 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. @@ -260,7 +250,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); - msg_mailbox_t mailbox = simgrid::s4u::Mailbox::byName(alias); + 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) @@ -283,6 +273,7 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d } catch (xbt_ex& e) { switch (e.category) { + case host_error: case cancel_error: ret = MSG_HOST_FAILURE; break; @@ -292,9 +283,6 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d case timeout_error: ret = MSG_TIMEOUT; break; - case host_error: - ret = MSG_HOST_FAILURE; - break; default: throw; } @@ -308,24 +296,24 @@ 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_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 myself = SIMIX_process_self(); - msg_mailbox_t mailbox = simgrid::s4u::Mailbox::byName(alias); + 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 = ((simdata_process_t) SIMIX_process_self_get_data())->m_host; + t_simdata->source = (static_cast(SIMIX_process_self_get_data()))->m_host; 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(myself, mailbox->getImpl(), t_simdata->bytes_amount, t_simdata->rate, + 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); @@ -392,7 +380,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); } @@ -465,7 +453,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) { - msg_mailbox_t mbox = simgrid::s4u::Mailbox::byName(name); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(name); /* FIXME: these functions are not traceable */ /* Sanity check */ @@ -533,7 +521,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; @@ -646,7 +634,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) { @@ -718,7 +706,7 @@ msg_task_t MSG_comm_get_task(msg_comm_t 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::kernel::activity::Comm *comm = static_cast(synchro); @@ -726,7 +714,7 @@ void MSG_comm_copy_data_from_SIMIX(smx_synchro_t synchro, void* buff, size_t buf // notify the user callback if any if (msg_global->task_copy_callback) { - msg_task_t task = (msg_task_t) buff; + msg_task_t task = static_cast(buff); msg_global->task_copy_callback(task, comm->src_proc, comm->dst_proc); } } @@ -786,15 +774,15 @@ 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 = simgrid::s4u::Mailbox::byName(alias); + 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() /* 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 = (static_cast(SIMIX_process_self_get_data())) ->m_host; t_simdata->setUsed(); @@ -805,7 +793,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_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simix call */ + 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()) @@ -866,7 +854,7 @@ msg_error_t MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alia */ int MSG_task_listen(const char *alias) { - msg_mailbox_t mbox = simgrid::s4u::Mailbox::byName(alias); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(alias); return !mbox->empty() || (mbox->getImpl()->permanent_receiver && !mbox->getImpl()->done_comm_queue.empty()); } @@ -881,7 +869,7 @@ int MSG_task_listen(const char *alias) */ int MSG_task_listen_from(const char *alias) { - msg_mailbox_t mbox = simgrid::s4u::Mailbox::byName(alias); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(alias); simgrid::kernel::activity::Comm* comm = static_cast(mbox->front()); if (!comm) @@ -934,7 +922,7 @@ const char *MSG_task_get_category (msg_task_t task) */ 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); + return static_cast(xbt_dict_get_or_null(MSG_as_router_get_properties(asr), name)); } /**