static xbt_dict_t rdv_points = NULL;
unsigned long int smx_total_comms = 0;
-static XBT_INLINE void SIMIX_comm_start(smx_action_t action);
-static void SIMIX_comm_finish(smx_action_t action);
static void SIMIX_waitany_req_remove_from_actions(smx_req_t req);
static void SIMIX_comm_copy_data(smx_action_t comm);
static smx_action_t SIMIX_comm_new(e_smx_comm_type_t type);
comm->comm.rdv = NULL;
}
+/**
+ * \brief Wrapper to SIMIX_rdv_get_request
+ */
+smx_action_t SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data) {
+ return SIMIX_rdv_get_request(rdv, SIMIX_COMM_SEND, match_fun, data);
+}
+
/**
* \brief Checks if there is a communication action queued in a rendez-vous matching our needs
* \param type The type of communication we are looking for (comm_send, comm_recv)
smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
int (*match_fun)(void *, void *), void *data)
{
+ // FIXME rewrite this function by using SIMIX_rdv_has_send/recv_match
smx_action_t action;
xbt_fifo_item_t item;
void* req_data = NULL;
req_data = action->comm.dst_data;
}
if (action->comm.type == type && (!match_fun || match_fun(data, req_data))) {
- DEBUG1("Found a matching communication action %p", action);
+ XBT_DEBUG("Found a matching communication action %p", action);
xbt_fifo_remove_item(rdv->comm_fifo, item);
xbt_fifo_free_item(item);
action->comm.refcount++;
action->comm.rdv = NULL;
return action;
}
- DEBUG3("Sorry, communication action %p does not match our needs:"
+ XBT_DEBUG("Sorry, communication action %p does not match our needs:"
" its type is %d but we are looking for a comm of type %d",
action, action->comm.type, type);
}
- DEBUG0("No matching communication action found");
+ XBT_DEBUG("No matching communication action found");
return NULL;
}
+/**
+ * \brief Checks if there is a send communication action
+ * queued in a rendez-vous matching our needs.
+ * \return 1 if found, 0 otherwise
+ */
+int SIMIX_comm_has_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data) {
+
+ smx_action_t action;
+ xbt_fifo_item_t item;
+
+ xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t){
+ if (action->comm.type == SIMIX_COMM_SEND
+ && (!match_fun || match_fun(data, action->comm.src_data))) {
+ XBT_DEBUG("Found a matching communication action %p", action);
+ return 1;
+ }
+ }
+ XBT_DEBUG("No matching communication action found");
+ return 0;
+}
+
+/**
+ * \brief Checks if there is a recv communication action
+ * queued in a rendez-vous matching our needs.
+ * \return 1 if found, 0 otherwise
+ */
+int SIMIX_comm_has_recv_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data) {
+
+ smx_action_t action;
+ xbt_fifo_item_t item;
+
+ xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t){
+ if (action->comm.type == SIMIX_COMM_RECEIVE
+ && (!match_fun || match_fun(data, action->comm.dst_data))) {
+ XBT_DEBUG("Found a matching communication action %p", action);
+ return 1;
+ }
+ }
+ XBT_DEBUG("No matching communication action found");
+ return 0;
+}
+
/******************************************************************************/
/* Comunication Actions */
/******************************************************************************/
act->category = NULL;
#endif
- DEBUG1("Create communicate action %p", act);
+ XBT_DEBUG("Create communicate action %p", act);
++smx_total_comms;
return act;
*/
void SIMIX_comm_destroy(smx_action_t action)
{
- DEBUG2("Destroy action %p (refcount:%d)", action, action->comm.refcount);
+ XBT_DEBUG("Destroy action %p (refcount:%d)", action, action->comm.refcount);
if (action->comm.refcount <= 0)
- xbt_die(bprintf("the refcount of comm %p is already 0 before decreasing it. That's a bug!",action));
+ xbt_die("the refcount of comm %p is already 0 before decreasing it. "
+ "That's a bug!", action);
action->comm.refcount--;
if (action->comm.refcount > 0)
return;
- DEBUG2("Really free communication %p; refcount is now %d", action,
+ XBT_DEBUG("Really free communication %p; refcount is now %d", action,
action->comm.refcount);
#ifdef HAVE_LATENCY_BOUND_TRACKING
* \brief Start the simulation of a communication request
* \param action The communication action
*/
-static XBT_INLINE void SIMIX_comm_start(smx_action_t action)
+
+XBT_INLINE void SIMIX_comm_start(smx_action_t action)
{
/* If both the sender and the receiver are already there, start the communication */
if (action->state == SIMIX_READY) {
smx_host_t sender = action->comm.src_proc->smx_host;
smx_host_t receiver = action->comm.dst_proc->smx_host;
- DEBUG3("Starting communication %p from '%s' to '%s'", action,
+ XBT_DEBUG("Starting communication %p from '%s' to '%s'", action,
SIMIX_host_get_name(sender), SIMIX_host_get_name(receiver));
action->comm.surf_comm = surf_workstation_model->extension.workstation.
/* If a link is failed, detect it immediately */
if (surf_workstation_model->action_state_get(action->comm.surf_comm) == SURF_ACTION_FAILED) {
- DEBUG2("Communication from '%s' to '%s' failed to start because of a link failure",
+ XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure",
SIMIX_host_get_name(sender), SIMIX_host_get_name(receiver));
action->state = SIMIX_LINK_FAILURE;
SIMIX_comm_destroy_internal_actions(action);
if (action->comm.rdv)
SIMIX_rdv_remove(action->comm.rdv, action);
- DEBUG1("SIMIX_comm_finish: action state = %d", action->state);
+ XBT_DEBUG("SIMIX_comm_finish: action state = %d", action->state);
/* Check out for errors */
switch (action->state) {
case SIMIX_DONE:
- DEBUG1("Communication %p complete!", action);
+ XBT_DEBUG("Communication %p complete!", action);
SIMIX_comm_copy_data(action);
break;
case SIMIX_SRC_TIMEOUT:
TRY {
- THROW0(timeout_error, 0, "Communication timeouted because of sender");
+ THROWF(timeout_error, 0, "Communication timeouted because of sender");
}
CATCH(req->issuer->running_ctx->exception) {
req->issuer->doexception = 1;
case SIMIX_DST_TIMEOUT:
TRY {
- THROW0(timeout_error, 0, "Communication timeouted because of receiver");
+ THROWF(timeout_error, 0, "Communication timeouted because of receiver");
}
CATCH(req->issuer->running_ctx->exception) {
req->issuer->doexception = 1;
case SIMIX_SRC_HOST_FAILURE:
TRY {
if (req->issuer == action->comm.src_proc)
- THROW0(host_error, 0, "Host failed");
+ THROWF(host_error, 0, "Host failed");
else
- THROW0(network_error, 0, "Remote peer failed");
+ THROWF(network_error, 0, "Remote peer failed");
}
CATCH(req->issuer->running_ctx->exception) {
req->issuer->doexception = 1;
case SIMIX_DST_HOST_FAILURE:
TRY {
if (req->issuer == action->comm.dst_proc)
- THROW0(host_error, 0, "Host failed");
+ THROWF(host_error, 0, "Host failed");
else
- THROW0(network_error, 0, "Remote peer failed");
+ THROWF(network_error, 0, "Remote peer failed");
}
CATCH(req->issuer->running_ctx->exception) {
req->issuer->doexception = 1;
case SIMIX_LINK_FAILURE:
TRY {
- DEBUG5("Link failure in action %p between '%s' and '%s': posting an exception to the issuer: %s (%p)",
+ XBT_DEBUG("Link failure in action %p between '%s' and '%s': posting an exception to the issuer: %s (%p)",
action, action->comm.src_proc->smx_host->name, action->comm.dst_proc->smx_host->name,
req->issuer->name, req->issuer);
- THROW0(network_error, 0, "Link failure");
+ THROWF(network_error, 0, "Link failure");
}
CATCH(req->issuer->running_ctx->exception) {
req->issuer->doexception = 1;
else
action->state = SIMIX_DONE;
- DEBUG1("SIMIX_post_comm: action state = %d", action->state);
+ XBT_DEBUG("SIMIX_post_comm: action state = %d", action->state);
/* After this point the surf actions associated with the simix communicate
action are no longer needed, thus we delete them. */
XBT_INLINE int SIMIX_comm_is_latency_bounded(smx_action_t action)
{
if (action->comm.surf_comm){
- DEBUG1("Getting latency limited for surf_action (%p)", action->comm.surf_comm);
+ XBT_DEBUG("Getting latency limited for surf_action (%p)", action->comm.surf_comm);
action->latency_limited = surf_workstation_model->get_latency_limited(action->comm.surf_comm);
- DEBUG1("Action limited is %d", action->latency_limited);
+ XBT_DEBUG("Action limited is %d", action->latency_limited);
}
return action->latency_limited;
}
void SIMIX_comm_copy_pointer_callback(smx_action_t comm, size_t buff_size)
{
- xbt_assert1((buff_size == sizeof(void *)),
+ xbt_assert((buff_size == sizeof(void *)),
"Cannot copy %zu bytes: must be sizeof(void*)", buff_size);
*(void **) (comm->comm.dst_buff) = comm->comm.src_buff;
}
if (!comm->comm.src_buff || !comm->comm.dst_buff || comm->comm.copied == 1)
return;
- DEBUG6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
+ XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
comm,
comm->comm.src_proc->smx_host->name, comm->comm.src_buff,
comm->comm.dst_proc->smx_host->name, comm->comm.dst_buff, buff_size);