rdv->name = name ? xbt_strdup(name) : NULL;
rdv->comm_fifo = xbt_fifo_new();
- if (name)
- xbt_dict_set(rdv_points, name, rdv, SIMIX_rdv_free);
+ if (rdv->name)
+ xbt_dict_set(rdv_points, rdv->name, rdv, SIMIX_rdv_free);
}
return rdv;
}
void SIMIX_rdv_destroy(smx_rdv_t rdv)
{
if (rdv->name)
- xbt_dict_remove(rdv_points, rdv->name);
+ xbt_dict_remove(rdv_points, rdv->name);
}
void SIMIX_rdv_free(void *data)
}
/**
- * \brief Checks if there is a communication request queued in a rendez-vous matching our needs
+ * \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)
- * \return The communication request if found, NULL otherwise
+ * \return The communication action if found, NULL otherwise
*/
smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
- int (*match_fun)(void *, void *), void *data)
+ int (*match_fun)(void *, void *), void *data)
{
- smx_action_t req;
+ smx_action_t action;
xbt_fifo_item_t item;
void* req_data = NULL;
- xbt_fifo_foreach(rdv->comm_fifo, item, req, smx_action_t){
- if(req->comm.type == SIMIX_COMM_SEND) {
- req_data = req->comm.src_data;
- } else if(req->comm.type == SIMIX_COMM_RECEIVE) {
- req_data = req->comm.dst_data;
+ xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t){
+ if (action->comm.type == SIMIX_COMM_SEND) {
+ req_data = action->comm.src_data;
+ } else if (action->comm.type == SIMIX_COMM_RECEIVE) {
+ req_data = action->comm.dst_data;
}
- if (req->comm.type == type && (!match_fun || match_fun(data, req_data))) {
+ if (action->comm.type == type && (!match_fun || match_fun(data, req_data))) {
+ DEBUG1("Found a matching communication action %p", action);
xbt_fifo_remove_item(rdv->comm_fifo, item);
xbt_fifo_free_item(item);
- req->comm.refcount++;
- req->comm.rdv = NULL;
- return req;
+ action->comm.refcount++;
+ action->comm.rdv = NULL;
+ return action;
}
+ DEBUG3("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("Communication request not found");
+ DEBUG0("No matching communication action found");
return NULL;
}
act->comm.type = type;
act->comm.refcount = 1;
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+ //initialize with unknown value
+ act->latency_limited = -1;
+#endif
+
#ifdef HAVE_TRACING
act->category = NULL;
#endif
*/
void SIMIX_comm_destroy(smx_action_t action)
{
- DEBUG1("Destroy action %p", action);
+ DEBUG2("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));
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- //save is latency limited flag to use afterwards
- if (action->comm.surf_comm) {
- DEBUG2("adding key %p with latency limited value %d to the dict", action,
- SIMIX_comm_is_latency_bounded(action));
- xbt_dicti_set(simix_global->latency_limited_dict, (uintptr_t) action,
- SIMIX_comm_is_latency_bounded(action));
- }
-#endif
-
action->comm.refcount--;
if (action->comm.refcount > 0)
return;
DEBUG2("Really free communication %p; refcount is now %d", action,
action->comm.refcount);
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+ action->latency_limited = SIMIX_comm_is_latency_bounded( action ) ;
+#endif
+
#ifdef HAVE_TRACING
TRACE_smx_action_destroy(action);
#endif
void SIMIX_comm_destroy_internal_actions(smx_action_t action)
{
if (action->comm.surf_comm){
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+ action->latency_limited = SIMIX_comm_is_latency_bounded(action);
+#endif
action->comm.surf_comm->model_type->action_unref(action->comm.surf_comm);
action->comm.surf_comm = NULL;
}
req->issuer->waiting_action = action;
if (MC_IS_ENABLED){
- action->state = SIMIX_DONE;
+ if(action->comm.src_proc && action->comm.dst_proc){
+ action->state = SIMIX_DONE;
+ }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)
+ THROW_IMPOSSIBLE;
+
+ if(action->comm.src_proc == req->issuer)
+ action->state = SIMIX_SRC_TIMEOUT;
+ else
+ action->state = SIMIX_DST_TIMEOUT;
+ }
+
SIMIX_comm_finish(action);
return;
}
}
}
-void SIMIX_pre_comm_testany(smx_req_t req)
+void SIMIX_pre_comm_testany(smx_req_t req, int idx)
{
unsigned int cursor;
smx_action_t action;
+ xbt_dynar_t actions = req->comm_testany.comms;
req->comm_testany.result = -1;
+
+ if (MC_IS_ENABLED){
+ if(idx == -1){
+ SIMIX_request_answer(req);
+ }else{
+ action = xbt_dynar_get_as(actions, idx, smx_action_t);
+ xbt_fifo_push(action->request_list, req);
+ action->state = SIMIX_DONE;
+ SIMIX_comm_finish(action);
+ }
+ return;
+ }
+
xbt_dynar_foreach(req->comm_testany.comms,cursor,action) {
if (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING) {
req->comm_testany.result = cursor;
SIMIX_request_answer(req);
}
-void SIMIX_pre_comm_waitany(smx_req_t req)
+void SIMIX_pre_comm_waitany(smx_req_t req, int idx)
{
smx_action_t action;
unsigned int cursor = 0;
xbt_dynar_t actions = req->comm_waitany.comms;
+
+ if (MC_IS_ENABLED){
+ action = xbt_dynar_get_as(actions, idx, smx_action_t);
+ xbt_fifo_push(action->request_list, req);
+ req->comm_waitany.result = idx;
+ action->state = SIMIX_DONE;
+ SIMIX_comm_finish(action);
+ return;
+ }
+
xbt_dynar_foreach(actions, cursor, action){
/* Associate this request to the action */
xbt_fifo_push(action->request_list, req);
return it as the result of the call */
if (req->call == REQ_COMM_WAITANY) {
SIMIX_waitany_req_remove_from_actions(req);
- req->comm_waitany.result = xbt_dynar_search(req->comm_waitany.comms, &action);
+ if(!MC_IS_ENABLED)
+ req->comm_waitany.result = xbt_dynar_search(req->comm_waitany.comms, &action);
}
/* If the action is still in a rendez-vous point then remove from it */
default:
THROW_IMPOSSIBLE;
}
+
+ /* if there is an exception during a waitany or a testany, indicate the position of the failed communication */
+ if (req->issuer->doexception) {
+ if (req->call == REQ_COMM_WAITANY) {
+ req->issuer->running_ctx->exception.value = xbt_dynar_search(req->comm_waitany.comms, &action);
+ }
+ else if (req->call == REQ_COMM_TESTANY) {
+ req->issuer->running_ctx->exception.value = xbt_dynar_search(req->comm_testany.comms, &action);
+ }
+ }
+
req->issuer->waiting_action = NULL;
SIMIX_request_answer(req);
}
SIMIX_rdv_remove(action->comm.rdv, action);
action->state = SIMIX_FAILED;
} else {
- surf_workstation_model->action_cancel(action->comm.surf_comm);
+ /* When running the MC there are no surf actions */
+ if(!MC_IS_ENABLED)
+ surf_workstation_model->action_cancel(action->comm.surf_comm);
}
}
*/
XBT_INLINE int SIMIX_comm_is_latency_bounded(smx_action_t action)
{
- //try to find comm on the list of finished flows
- uintptr_t key = 0;
- uintptr_t data = 0;
- xbt_dict_cursor_t cursor;
- xbt_dict_foreach(simix_global->latency_limited_dict, cursor, key, data) {
- DEBUG2("comparing key=%p with comm=%p", (void *) key, (void *) action);
- if ((void *) action == (void *) key) {
- DEBUG2("key %p found, return value latency limited value %d",
- (void *) key, (int) data);
- xbt_dict_cursor_free(&cursor);
- return (int) data;
- }
+ if (action->comm.surf_comm){
+ DEBUG1("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);
}
-
- return surf_workstation_model->get_latency_limited(action->comm.surf_comm);
+ return action->latency_limited;
}
#endif
