-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-2016. 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 "src/surf/surf_interface.hpp"
-#include "smx_private.h"
+#include "src/simix/smx_private.h"
#include "xbt/log.h"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
#include "xbt/dict.h"
+#include "simgrid/s4u/mailbox.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix,
- "SIMIX network-related synchronization");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization");
-static xbt_dict_t rdv_points = NULL;
-XBT_EXPORT_NO_IMPORT(unsigned long int) smx_total_comms = 0;
+static void SIMIX_mbox_free(void *data);
+static xbt_dict_t mailboxes = xbt_dict_new_homogeneous(SIMIX_mbox_free);
static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall);
static void SIMIX_comm_copy_data(smx_synchro_t comm);
static smx_synchro_t SIMIX_comm_new(e_smx_comm_type_t type);
-static inline void SIMIX_rdv_push(smx_rdv_t rdv, smx_synchro_t comm);
-static smx_synchro_t SIMIX_fifo_probe_comm(xbt_fifo_t fifo, e_smx_comm_type_t type,
+static inline void SIMIX_mbox_push(smx_mailbox_t mbox, smx_synchro_t comm);
+static smx_synchro_t _extract_matching_comm(std::deque<smx_synchro_t> *deque, e_smx_comm_type_t type,
int (*match_fun)(void *, void *,smx_synchro_t),
void *user_data, smx_synchro_t my_synchro);
-static smx_synchro_t SIMIX_fifo_get_comm(xbt_fifo_t fifo, e_smx_comm_type_t type,
- int (*match_fun)(void *, void *,smx_synchro_t),
- void *user_data, smx_synchro_t my_synchro);
-static void SIMIX_rdv_free(void *data);
static void SIMIX_comm_start(smx_synchro_t synchro);
-void SIMIX_network_init(void)
-{
- rdv_points = xbt_dict_new_homogeneous(SIMIX_rdv_free);
-}
-
-void SIMIX_network_exit(void)
+void SIMIX_mailbox_exit(void)
{
- xbt_dict_free(&rdv_points);
+ xbt_dict_free(&mailboxes);
}
/******************************************************************************/
/* Rendez-Vous Points */
/******************************************************************************/
-smx_rdv_t SIMIX_rdv_create(const char *name)
+smx_mailbox_t SIMIX_mbox_create(const char *name)
{
- /* two processes may have pushed the same rdv_create simcall at the same time */
- smx_rdv_t rdv = name ? (smx_rdv_t) xbt_dict_get_or_null(rdv_points, name) : NULL;
-
- if (!rdv) {
- rdv = xbt_new0(s_smx_rvpoint_t, 1);
- rdv->name = name ? xbt_strdup(name) : NULL;
- rdv->comm_fifo = xbt_fifo_new();
- rdv->done_comm_fifo = xbt_fifo_new();
- rdv->permanent_receiver=NULL;
+ xbt_assert(name, "Mailboxes must have a name");
+ /* two processes may have pushed the same mbox_create simcall at the same time */
+ smx_mailbox_t mbox = (smx_mailbox_t) xbt_dict_get_or_null(mailboxes, name);
- XBT_DEBUG("Creating a mailbox at %p with name %s", rdv, name);
+ if (!mbox) {
+ mbox = xbt_new0(s_smx_mailbox_t, 1);
+ mbox->name = xbt_strdup(name);
+ mbox->comm_queue = new std::deque<smx_synchro_t>();
+ mbox->done_comm_queue = nullptr; // Allocated on need only
+ mbox->permanent_receiver=NULL;
- if (rdv->name)
- xbt_dict_set(rdv_points, rdv->name, rdv, NULL);
+ XBT_DEBUG("Creating a mailbox at %p with name %s", mbox, name);
+ xbt_dict_set(mailboxes, mbox->name, mbox, NULL);
}
- return rdv;
+ return mbox;
}
-void SIMIX_rdv_destroy(smx_rdv_t rdv)
+void SIMIX_mbox_free(void *data)
{
- if (rdv->name)
- xbt_dict_remove(rdv_points, rdv->name);
-}
-
-void SIMIX_rdv_free(void *data)
-{
- XBT_DEBUG("rdv free %p", data);
- smx_rdv_t rdv = (smx_rdv_t) data;
- xbt_free(rdv->name);
- xbt_fifo_free(rdv->comm_fifo);
- xbt_fifo_free(rdv->done_comm_fifo);
+ XBT_DEBUG("mbox free %p", data);
+ smx_mailbox_t mbox = (smx_mailbox_t) data;
+ xbt_free(mbox->name);
+ delete mbox->comm_queue;
+ delete mbox->done_comm_queue;
- xbt_free(rdv);
+ xbt_free(mbox);
}
-xbt_dict_t SIMIX_get_rdv_points()
+smx_mailbox_t SIMIX_mbox_get_by_name(const char *name)
{
- return rdv_points;
+ return (smx_mailbox_t) xbt_dict_get_or_null(mailboxes, name);
}
-smx_rdv_t SIMIX_rdv_get_by_name(const char *name)
+smx_synchro_t SIMIX_mbox_get_head(smx_mailbox_t mbox)
{
- return (smx_rdv_t) xbt_dict_get_or_null(rdv_points, name);
-}
-
-int SIMIX_rdv_comm_count_by_host(smx_rdv_t rdv, sg_host_t host)
-{
- smx_synchro_t comm = NULL;
- xbt_fifo_item_t item = NULL;
- int count = 0;
-
- xbt_fifo_foreach(rdv->comm_fifo, item, comm, smx_synchro_t) {
- if (comm->comm.src_proc->host == host)
- count++;
- }
-
- return count;
-}
-
-smx_synchro_t SIMIX_rdv_get_head(smx_rdv_t rdv)
-{
- return (smx_synchro_t) xbt_fifo_get_item_content(
- xbt_fifo_get_first_item(rdv->comm_fifo));
+ return mbox->comm_queue->front();
}
/**
* \brief get the receiver (process associated to the mailbox)
- * \param rdv The rendez-vous point
+ * \param mbox The rendez-vous point
* \return process The receiving process (NULL if not set)
*/
-smx_process_t SIMIX_rdv_get_receiver(smx_rdv_t rdv)
+smx_process_t SIMIX_mbox_get_receiver(smx_mailbox_t mbox)
{
- return rdv->permanent_receiver;
+ return mbox->permanent_receiver;
}
/**
* \brief set the receiver of the rendez vous point to allow eager sends
- * \param rdv The rendez-vous point
+ * \param mbox The rendez-vous point
* \param process The receiving process
*/
-void SIMIX_rdv_set_receiver(smx_rdv_t rdv, smx_process_t process)
+void SIMIX_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
{
- rdv->permanent_receiver=process;
+ mbox->permanent_receiver=process;
+ if (mbox->done_comm_queue == nullptr)
+ mbox->done_comm_queue = new std::deque<smx_synchro_t>();
}
/**
* \brief Pushes a communication synchro into a rendez-vous point
- * \param rdv The rendez-vous point
+ * \param mbox The mailbox
* \param comm The communication synchro
*/
-static inline void SIMIX_rdv_push(smx_rdv_t rdv, smx_synchro_t comm)
+static inline void SIMIX_mbox_push(smx_mailbox_t mbox, smx_synchro_t comm)
{
- xbt_fifo_push(rdv->comm_fifo, comm);
- comm->comm.rdv = rdv;
+ mbox->comm_queue->push_back(comm);
+ comm->comm.mbox = mbox;
}
/**
* \brief Removes a communication synchro from a rendez-vous point
- * \param rdv The rendez-vous point
+ * \param mbox The rendez-vous point
* \param comm The communication synchro
*/
-void SIMIX_rdv_remove(smx_rdv_t rdv, smx_synchro_t comm)
+void SIMIX_mbox_remove(smx_mailbox_t mbox, smx_synchro_t comm)
{
- xbt_fifo_remove(rdv->comm_fifo, comm);
- comm->comm.rdv = NULL;
+ comm->comm.mbox = NULL;
+ for (auto it = mbox->comm_queue->begin(); it != mbox->comm_queue->end(); it++)
+ if (*it == comm) {
+ mbox->comm_queue->erase(it);
+ return;
+ }
+ xbt_die("Cannot remove this comm that is not part of the mailbox");
}
/**
- * \brief Checks if there is a communication synchro queued in a fifo matching our needs
+ * \brief Checks if there is a communication synchro queued in a deque matching our needs
* \param type The type of communication we are looking for (comm_send, comm_recv)
* \return The communication synchro if found, NULL otherwise
*/
-smx_synchro_t SIMIX_fifo_get_comm(xbt_fifo_t fifo, e_smx_comm_type_t type,
- int (*match_fun)(void *, void *,smx_synchro_t),
- void *this_user_data, smx_synchro_t my_synchro)
+static smx_synchro_t _extract_matching_comm(std::deque<smx_synchro_t> *deque, e_smx_comm_type_t type,
+ int (*match_fun)(void *, void *,smx_synchro_t), void *this_user_data, smx_synchro_t my_synchro)
{
- smx_synchro_t synchro;
- xbt_fifo_item_t item;
void* other_user_data = NULL;
- xbt_fifo_foreach(fifo, item, synchro, smx_synchro_t) {
+ for(auto it = deque->begin(); it != deque->end(); it++){
+ smx_synchro_t synchro = *it;
if (synchro->comm.type == SIMIX_COMM_SEND) {
other_user_data = synchro->comm.src_data;
} else if (synchro->comm.type == SIMIX_COMM_RECEIVE) {
other_user_data = synchro->comm.dst_data;
}
if (synchro->comm.type == type &&
- (!match_fun || match_fun(this_user_data, other_user_data, synchro)) &&
+ (!match_fun || match_fun(this_user_data, other_user_data, synchro)) &&
(!synchro->comm.match_fun || synchro->comm.match_fun(other_user_data, this_user_data, my_synchro))) {
XBT_DEBUG("Found a matching communication synchro %p", synchro);
- xbt_fifo_remove_item(fifo, item);
- xbt_fifo_free_item(item);
+ deque->erase(it);
synchro->comm.refcount++;
-#ifdef HAVE_MC
- synchro->comm.rdv_cpy = synchro->comm.rdv;
+#if HAVE_MC
+ synchro->comm.mbox_cpy = synchro->comm.mbox;
#endif
- synchro->comm.rdv = NULL;
+ synchro->comm.mbox = NULL;
return synchro;
}
XBT_DEBUG("Sorry, communication synchro %p does not match our needs:"
return NULL;
}
-
-/**
- * \brief Checks if there is a communication synchro queued in a fifo matching our needs, but leave it there
- * \param type The type of communication we are looking for (comm_send, comm_recv)
- * \return The communication synchro if found, NULL otherwise
- */
-smx_synchro_t SIMIX_fifo_probe_comm(xbt_fifo_t fifo, e_smx_comm_type_t type,
- int (*match_fun)(void *, void *,smx_synchro_t),
- void *this_user_data, smx_synchro_t my_synchro)
-{
- smx_synchro_t synchro;
- xbt_fifo_item_t item;
- void* other_user_data = NULL;
-
- xbt_fifo_foreach(fifo, item, synchro, smx_synchro_t) {
- if (synchro->comm.type == SIMIX_COMM_SEND) {
- other_user_data = synchro->comm.src_data;
- } else if (synchro->comm.type == SIMIX_COMM_RECEIVE) {
- other_user_data = synchro->comm.dst_data;
- }
- if (synchro->comm.type == type &&
- (!match_fun || match_fun(this_user_data, other_user_data, synchro)) &&
- (!synchro->comm.match_fun || synchro->comm.match_fun(other_user_data, this_user_data, my_synchro))) {
- XBT_DEBUG("Found a matching communication synchro %p", synchro);
- synchro->comm.refcount++;
-
- return synchro;
- }
- XBT_DEBUG("Sorry, communication synchro %p does not match our needs:"
- " its type is %d but we are looking for a comm of type %d (or maybe the filtering didn't match)",
- synchro, (int)synchro->comm.type, (int)type);
- }
- XBT_DEBUG("No matching communication synchro found");
- return NULL;
-}
/******************************************************************************/
/* Communication synchros */
/******************************************************************************/
synchro->comm.src_data=NULL;
synchro->comm.dst_data=NULL;
-
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- //initialize with unknown value
- synchro->latency_limited = -1;
-#endif
-
synchro->category = NULL;
XBT_DEBUG("Create communicate synchro %p", synchro);
- ++smx_total_comms;
return synchro;
}
XBT_DEBUG("Really free communication %p; refcount is now %d", synchro,
synchro->comm.refcount);
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- synchro->latency_limited = SIMIX_comm_is_latency_bounded( synchro ) ;
-#endif
-
xbt_free(synchro->name);
SIMIX_comm_destroy_internal_actions(synchro);
synchro->comm.src_buff = NULL;
}
- if(synchro->comm.rdv)
- SIMIX_rdv_remove(synchro->comm.rdv, synchro);
+ if(synchro->comm.mbox)
+ SIMIX_mbox_remove(synchro->comm.mbox, synchro);
xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
}
void SIMIX_comm_destroy_internal_actions(smx_synchro_t synchro)
{
if (synchro->comm.surf_comm){
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- synchro->latency_limited = SIMIX_comm_is_latency_bounded(synchro);
-#endif
synchro->comm.surf_comm->unref();
synchro->comm.surf_comm = NULL;
}
}
}
-void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t src, smx_rdv_t rdv,
+void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t src, smx_mailbox_t mbox,
double task_size, double rate,
void *src_buff, size_t src_buff_size,
int (*match_fun)(void *, void *,smx_synchro_t),
void (*copy_data_fun)(smx_synchro_t, void*, size_t),
void *data, double timeout){
- smx_synchro_t comm = simcall_HANDLER_comm_isend(simcall, src, rdv, task_size, rate,
+ smx_synchro_t comm = simcall_HANDLER_comm_isend(simcall, src, mbox, task_size, rate,
src_buff, src_buff_size, match_fun, NULL, copy_data_fun,
data, 0);
SIMCALL_SET_MC_VALUE(simcall, 0);
simcall_HANDLER_comm_wait(simcall, comm, timeout);
}
-smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t src_proc, smx_rdv_t rdv,
+smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t src_proc, smx_mailbox_t mbox,
double task_size, double rate,
void *src_buff, size_t src_buff_size,
int (*match_fun)(void *, void *,smx_synchro_t),
void (*copy_data_fun)(smx_synchro_t, void*, size_t),// used to copy data if not default one
void *data, int detached)
{
- XBT_DEBUG("send from %p", rdv);
+ XBT_DEBUG("send from %p", mbox);
/* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */
smx_synchro_t this_synchro = SIMIX_comm_new(SIMIX_COMM_SEND);
* ourself so that the other side also gets a chance of choosing if it wants to match with us.
*
* If it is not found then push our communication into the rendez-vous point */
- smx_synchro_t other_synchro = SIMIX_fifo_get_comm(rdv->comm_fifo, SIMIX_COMM_RECEIVE, match_fun, data, this_synchro);
+ smx_synchro_t other_synchro = _extract_matching_comm(mbox->comm_queue, SIMIX_COMM_RECEIVE, match_fun, data, this_synchro);
if (!other_synchro) {
other_synchro = this_synchro;
- if (rdv->permanent_receiver!=NULL){
+ if (mbox->permanent_receiver!=NULL){
//this mailbox is for small messages, which have to be sent right now
other_synchro->state = SIMIX_READY;
- other_synchro->comm.dst_proc=rdv->permanent_receiver;
+ other_synchro->comm.dst_proc=mbox->permanent_receiver;
other_synchro->comm.refcount++;
- xbt_fifo_push(rdv->done_comm_fifo,other_synchro);
- other_synchro->comm.rdv=rdv;
- XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p", rdv, &(other_synchro->comm));
+ mbox->done_comm_queue->push_back(other_synchro);
+ other_synchro->comm.mbox=mbox;
+ XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p", mbox, &(other_synchro->comm));
}else{
- SIMIX_rdv_push(rdv, this_synchro);
+ SIMIX_mbox_push(mbox, this_synchro);
}
} else {
XBT_DEBUG("Receive already pushed");
SIMIX_comm_destroy(this_synchro);
- --smx_total_comms; // this creation was a pure waste
other_synchro->state = SIMIX_READY;
other_synchro->comm.type = SIMIX_COMM_READY;
return (detached ? NULL : other_synchro);
}
-void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, smx_rdv_t rdv,
+void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox,
void *dst_buff, size_t *dst_buff_size,
int (*match_fun)(void *, void *, smx_synchro_t),
void (*copy_data_fun)(smx_synchro_t, void*, size_t),
void *data, double timeout, double rate)
{
- smx_synchro_t comm = SIMIX_comm_irecv(receiver, rdv, dst_buff,
+ smx_synchro_t comm = SIMIX_comm_irecv(receiver, mbox, dst_buff,
dst_buff_size, match_fun, copy_data_fun, data, rate);
SIMCALL_SET_MC_VALUE(simcall, 0);
simcall_HANDLER_comm_wait(simcall, comm, timeout);
}
-smx_synchro_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_process_t receiver, smx_rdv_t rdv,
- void *dst_buff, size_t *dst_buff_size,
- int (*match_fun)(void *, void *, smx_synchro_t),
- void (*copy_data_fun)(smx_synchro_t, void*, size_t),
- void *data, double rate)
+smx_synchro_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox,
+ void *dst_buff, size_t *dst_buff_size,
+ int (*match_fun)(void *, void *, smx_synchro_t),
+ void (*copy_data_fun)(smx_synchro_t, void*, size_t),
+ void *data, double rate)
{
- return SIMIX_comm_irecv(receiver, rdv, dst_buff, dst_buff_size,
- match_fun, copy_data_fun, data, rate);
+ return SIMIX_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate);
}
-smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv,
- void *dst_buff, size_t *dst_buff_size,
- int (*match_fun)(void *, void *, smx_synchro_t),
- void (*copy_data_fun)(smx_synchro_t, void*, size_t), // used to copy data if not default one
- void *data, double rate)
+smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size,
+ int (*match_fun)(void *, void *, smx_synchro_t),
+ void (*copy_data_fun)(smx_synchro_t, void*, size_t), // used to copy data if not default one
+ void *data, double rate)
{
- XBT_DEBUG("recv from %p %p", rdv, rdv->comm_fifo);
+ XBT_DEBUG("recv from %p %p", mbox, mbox->comm_queue);
smx_synchro_t this_synchro = SIMIX_comm_new(SIMIX_COMM_RECEIVE);
smx_synchro_t other_synchro;
//communication already done, get it inside the fifo of completed comms
- //permanent receive v1
- //int already_received=0;
- if(rdv->permanent_receiver && xbt_fifo_size(rdv->done_comm_fifo)!=0){
+ if (mbox->permanent_receiver && ! mbox->done_comm_queue->empty()) {
XBT_DEBUG("We have a comm that has probably already been received, trying to match it, to skip the communication");
//find a match in the already received fifo
- other_synchro = SIMIX_fifo_get_comm(rdv->done_comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_synchro);
+ other_synchro = _extract_matching_comm(mbox->done_comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro);
//if not found, assume the receiver came first, register it to the mailbox in the classical way
if (!other_synchro) {
XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into fifo");
other_synchro = this_synchro;
- SIMIX_rdv_push(rdv, this_synchro);
- }else{
- if(other_synchro->comm.surf_comm && SIMIX_comm_get_remains(other_synchro)==0.0)
- {
+ SIMIX_mbox_push(mbox, this_synchro);
+ } else {
+ if(other_synchro->comm.surf_comm && SIMIX_comm_get_remains(other_synchro)==0.0) {
XBT_DEBUG("comm %p has been already sent, and is finished, destroy it",&(other_synchro->comm));
other_synchro->state = SIMIX_DONE;
other_synchro->comm.type = SIMIX_COMM_DONE;
- other_synchro->comm.rdv = NULL;
- }/*else{
- XBT_DEBUG("Not yet finished, we have to wait %d", xbt_fifo_size(rdv->comm_fifo));
- }*/
+ other_synchro->comm.mbox = NULL;
+ }
other_synchro->comm.refcount--;
SIMIX_comm_destroy(this_synchro);
- --smx_total_comms; // this creation was a pure waste
}
- }else{
+ } else {
/* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */
/* Look for communication synchro matching our needs. We also provide a description of
* ourself so that the other side also gets a chance of choosing if it wants to match with us.
*
* If it is not found then push our communication into the rendez-vous point */
- other_synchro = SIMIX_fifo_get_comm(rdv->comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_synchro);
+ other_synchro = _extract_matching_comm(mbox->comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro);
if (!other_synchro) {
- XBT_DEBUG("Receive pushed first %d", xbt_fifo_size(rdv->comm_fifo));
+ XBT_DEBUG("Receive pushed first %zu", mbox->comm_queue->size());
other_synchro = this_synchro;
- SIMIX_rdv_push(rdv, this_synchro);
+ SIMIX_mbox_push(mbox, this_synchro);
} else {
SIMIX_comm_destroy(this_synchro);
- --smx_total_comms; // this creation was a pure waste
other_synchro->state = SIMIX_READY;
other_synchro->comm.type = SIMIX_COMM_READY;
//other_synchro->comm.refcount--;
other_synchro->comm.dst_buff_size = dst_buff_size;
other_synchro->comm.dst_data = data;
- if (rate != -1.0 &&
- (other_synchro->comm.rate == -1.0 || rate < other_synchro->comm.rate))
+ if (rate != -1.0 && (other_synchro->comm.rate == -1.0 || rate < other_synchro->comm.rate))
other_synchro->comm.rate = rate;
other_synchro->comm.match_fun = match_fun;
other_synchro->comm.copy_data_fun = copy_data_fun;
-
- /*if(already_received)//do the actual copy, because the first one after the comm didn't have all the info
- SIMIX_comm_copy_data(other_synchro);*/
-
-
if (MC_is_active() || MC_record_replay_is_active()) {
other_synchro->state = SIMIX_RUNNING;
return other_synchro;
}
SIMIX_comm_start(other_synchro);
- // }
return other_synchro;
}
-smx_synchro_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_rdv_t rdv,
+smx_synchro_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox,
int type, int src, int tag,
int (*match_fun)(void *, void *, smx_synchro_t),
void *data){
- return SIMIX_comm_iprobe(simcall->issuer, rdv, type, src, tag, match_fun, data);
+ return SIMIX_comm_iprobe(simcall->issuer, mbox, type, src, tag, match_fun, data);
}
-smx_synchro_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_rdv_t rdv, int type, int src,
+smx_synchro_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_mailbox_t mbox, int type, int src,
int tag, int (*match_fun)(void *, void *, smx_synchro_t), void *data)
{
- XBT_DEBUG("iprobe from %p %p", rdv, rdv->comm_fifo);
+ XBT_DEBUG("iprobe from %p %p", mbox, mbox->comm_queue);
smx_synchro_t this_synchro;
int smx_type;
if(type == 1){
smx_type = SIMIX_COMM_SEND;
}
smx_synchro_t other_synchro=NULL;
- if(rdv->permanent_receiver && xbt_fifo_size(rdv->done_comm_fifo)!=0){
- //find a match in the already received fifo
- XBT_DEBUG("first try in the perm recv mailbox");
-
- other_synchro = SIMIX_fifo_probe_comm(
- rdv->done_comm_fifo, (e_smx_comm_type_t) smx_type,
- match_fun, data, this_synchro);
+ if(mbox->permanent_receiver && ! mbox->done_comm_queue->empty()){
+ XBT_DEBUG("first check in the permanent recv mailbox, to see if we already got something");
+ other_synchro = _extract_matching_comm(mbox->done_comm_queue, (e_smx_comm_type_t) smx_type, match_fun, data, this_synchro);
}
- // }else{
- if(!other_synchro){
- XBT_DEBUG("try in the normal mailbox");
- other_synchro = SIMIX_fifo_probe_comm(
- rdv->comm_fifo, (e_smx_comm_type_t) smx_type,
- match_fun, data, this_synchro);
- }
-// }
- if(other_synchro)other_synchro->comm.refcount--;
+ if (!other_synchro){
+ XBT_DEBUG("check if we have more luck in the normal mailbox");
+ other_synchro = _extract_matching_comm(mbox->comm_queue, (e_smx_comm_type_t) smx_type, match_fun, data, this_synchro);
+ }
+ if(other_synchro)
+ other_synchro->comm.refcount--;
SIMIX_comm_destroy(this_synchro);
- --smx_total_comms;
return other_synchro;
}
synchro->state = SIMIX_RUNNING;
/* If a link is failed, detect it immediately */
- if (synchro->comm.surf_comm->getState() == SURF_ACTION_FAILED) {
+ if (synchro->comm.surf_comm->getState() == simgrid::surf::Action::State::failed) {
XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure",
sg_host_get_name(sender), sg_host_get_name(receiver));
synchro->state = SIMIX_LINK_FAILURE;
}
/* If the synchro is still in a rendez-vous point then remove from it */
- if (synchro->comm.rdv)
- SIMIX_rdv_remove(synchro->comm.rdv, synchro);
+ if (synchro->comm.mbox)
+ SIMIX_mbox_remove(synchro->comm.mbox, synchro);
XBT_DEBUG("SIMIX_comm_finish: synchro state = %d", (int)synchro->state);
/* Check out for errors */
- if (simcall->issuer->host->is_off()) {
+ if (simcall->issuer->host->isOff()) {
simcall->issuer->context->iwannadie = 1;
SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
} else
}
}
- if (simcall->issuer->host->is_off()) {
+ if (simcall->issuer->host->isOff()) {
simcall->issuer->context->iwannadie = 1;
}
{
/* Update synchro state */
if (synchro->comm.src_timeout &&
- synchro->comm.src_timeout->getState() == SURF_ACTION_DONE)
+ synchro->comm.src_timeout->getState() == simgrid::surf::Action::State::done)
synchro->state = SIMIX_SRC_TIMEOUT;
else if (synchro->comm.dst_timeout &&
- synchro->comm.dst_timeout->getState() == SURF_ACTION_DONE)
+ synchro->comm.dst_timeout->getState() == simgrid::surf::Action::State::done)
synchro->state = SIMIX_DST_TIMEOUT;
else if (synchro->comm.src_timeout &&
- synchro->comm.src_timeout->getState() == SURF_ACTION_FAILED)
+ synchro->comm.src_timeout->getState() == simgrid::surf::Action::State::failed)
synchro->state = SIMIX_SRC_HOST_FAILURE;
else if (synchro->comm.dst_timeout &&
- synchro->comm.dst_timeout->getState() == SURF_ACTION_FAILED)
+ synchro->comm.dst_timeout->getState() == simgrid::surf::Action::State::failed)
synchro->state = SIMIX_DST_HOST_FAILURE;
else if (synchro->comm.surf_comm &&
- synchro->comm.surf_comm->getState() == SURF_ACTION_FAILED) {
+ synchro->comm.surf_comm->getState() == simgrid::surf::Action::State::failed) {
XBT_DEBUG("Puta madre. Surf says that the link broke");
synchro->state = SIMIX_LINK_FAILURE;
} else
void SIMIX_comm_cancel(smx_synchro_t synchro)
{
- /* if the synchro is a waiting state means that it is still in a rdv */
+ /* if the synchro is a waiting state means that it is still in a mbox */
/* so remove from it and delete it */
if (synchro->state == SIMIX_WAITING) {
- SIMIX_rdv_remove(synchro->comm.rdv, synchro);
+ SIMIX_mbox_remove(synchro->comm.mbox, synchro);
synchro->state = SIMIX_CANCELED;
}
else if (!MC_is_active() /* when running the MC there are no surf actions */
*/
double SIMIX_comm_get_remains(smx_synchro_t synchro)
{
- double remains;
-
- if(!synchro){
+ if(!synchro)
return 0;
- }
+ double remains;
switch (synchro->state) {
case SIMIX_RUNNING:
- remains = surf_action_get_remains(synchro->comm.surf_comm);
+ remains = synchro->comm.surf_comm->getRemains();
break;
case SIMIX_WAITING:
return synchro->comm.dst_proc;
}
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-/**
- * \brief verify if communication is latency bounded
- * \param comm The communication
- */
-int SIMIX_comm_is_latency_bounded(smx_synchro_t synchro)
-{
- if(!synchro){
- return 0;
- }
- if (synchro->comm.surf_comm){
- XBT_DEBUG("Getting latency limited for surf_action (%p)", synchro->comm.surf_comm);
- synchro->latency_limited = surf_network_action_get_latency_limited(synchro->comm.surf_comm);
- XBT_DEBUG("synchro limited is %d", synchro->latency_limited);
- }
- return synchro->latency_limited;
-}
-#endif
-
/******************************************************************************/
/* SIMIX_comm_copy_data callbacks */
/******************************************************************************/
void SIMIX_comm_copy_pointer_callback(smx_synchro_t comm, void* buff, size_t buff_size)
{
- xbt_assert((buff_size == sizeof(void *)),
- "Cannot copy %zu bytes: must be sizeof(void*)", buff_size);
+ xbt_assert((buff_size == sizeof(void *)), "Cannot copy %zu bytes: must be sizeof(void*)", buff_size);
*(void **) (comm->comm.dst_buff) = buff;
}
