"Logging specific to SIMIX (network)");
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 XBT_INLINE void SIMIX_rdv_push(smx_rdv_t rdv, smx_action_t comm);
static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm);
static smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
- int (*match_fun)(void *, void *), void *);
+ int (*match_fun)(void *, void *), void *);
static void SIMIX_rdv_free(void *data);
void SIMIX_network_init(void)
comm->comm.rdv = NULL;
}
+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)
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;
}
smx_action_t act;
/* alloc structures */
- act = xbt_new0(s_smx_action_t, 1);
+ act = xbt_mallocator_get(simix_global->action_mallocator);
act->type = SIMIX_ACTION_COMMUNICATE;
act->state = SIMIX_WAITING;
- act->request_list = xbt_fifo_new();
/* set communication */
act->comm.type = type;
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
TRACE_smx_action_destroy(action);
#endif
- if (action->name)
- xbt_free(action->name);
-
- xbt_fifo_free(action->request_list);
-
+ xbt_free(action->name);
SIMIX_comm_destroy_internal_actions(action);
- xbt_free(action);
+ if (action->comm.detached && action->state != SIMIX_DONE) {
+ /* the communication has failed and was detached:
+ * we have to free the buffer */
+ ((void_f_pvoid_t) action->comm.src_data)(action->comm.src_buff);
+ }
+
+ xbt_mallocator_release(simix_global->action_mallocator, action);
}
void SIMIX_comm_destroy_internal_actions(smx_action_t action)
smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv,
double task_size, double rate,
void *src_buff, size_t src_buff_size,
- int (*match_fun)(void *, void *), void *data)
+ int (*match_fun)(void *, void *), void *data,
+ int detached)
{
smx_action_t action;
action->comm.type = SIMIX_COMM_READY;
}
+ /* If the communication action is detached then decrease the refcount
+ * by one, so it will be eliminated by the receivers destroy call */
+ if (detached) {
+ action->comm.detached = 1;
+ action->comm.refcount--;
+ }
+
/* Setup the communication request */
action->comm.src_proc = src_proc;
action->comm.task_size = task_size;
return action;
}
-void SIMIX_pre_comm_wait(smx_req_t req, int idx)
+void SIMIX_pre_comm_wait(smx_req_t req, smx_action_t action, double timeout, int idx)
{
- smx_action_t action = req->comm_wait.comm;
- double timeout = req->comm_wait.timeout;
+ /* the request may be a wait, a send or a recv */
surf_action_t sleep;
/* Associate this request to the action */
xbt_fifo_push(action->request_list, req);
req->issuer->waiting_action = action;
- if (MC_IS_ENABLED){
- if(idx == 0){
+ if (MC_IS_ENABLED) {
+ if (idx == 0) {
action->state = SIMIX_DONE;
- }else{
+ } else {
/* If we reached this point, the wait request must have a timeout */
/* Otherwise it shouldn't be enabled and executed by the MC */
- if(timeout == -1)
+ if (timeout == -1)
THROW_IMPOSSIBLE;
- if(action->comm.src_proc == req->issuer)
+ if (action->comm.src_proc == req->issuer)
action->state = SIMIX_SRC_TIMEOUT;
else
action->state = SIMIX_DST_TIMEOUT;
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);
void SIMIX_comm_finish(smx_action_t action)
{
+ unsigned int destroy_count = 0;
smx_req_t req;
while ((req = xbt_fifo_shift(action->request_list))) {
return it as the result of the call */
if (req->call == REQ_COMM_WAITANY) {
SIMIX_waitany_req_remove_from_actions(req);
- if(!MC_IS_ENABLED)
+ if (!MC_IS_ENABLED)
req->comm_waitany.result = xbt_dynar_search(req->comm_waitany.comms, &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_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");
req->issuer->waiting_action = NULL;
SIMIX_request_answer(req);
+ destroy_count++;
}
+
+ while (destroy_count-- > 0)
+ SIMIX_comm_destroy(action);
}
void SIMIX_post_comm(smx_action_t action)
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. */
return action->comm.dst_data;
}
-void* SIMIX_comm_get_src_buff(smx_action_t action)
-{
- return action->comm.src_buff;
-}
-
-void* SIMIX_comm_get_dst_buff(smx_action_t action)
-{
- return action->comm.dst_buff;
-}
-
-size_t SIMIX_comm_get_src_buff_size(smx_action_t action)
-{
- return action->comm.src_buff_size;
-}
-
-size_t SIMIX_comm_get_dst_buff_size(smx_action_t action)
-{
- size_t buff_size;
-
- if (action->comm.dst_buff_size)
- buff_size = *(action->comm.dst_buff_size);
- else
- buff_size = 0;
-
- return buff_size;
-}
-
smx_process_t SIMIX_comm_get_src_proc(smx_action_t action)
{
return action->comm.src_proc;
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;
}
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);
