-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
"Logging specific to SIMIX (network)");
static xbt_dict_t rdv_points = NULL;
-unsigned long int smx_total_comms = 0;
+XBT_EXPORT_NO_IMPORT(unsigned long int) smx_total_comms = 0;
static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall);
static void SIMIX_comm_copy_data(smx_action_t comm);
static smx_action_t SIMIX_comm_new(e_smx_comm_type_t type);
static XBT_INLINE void SIMIX_rdv_push(smx_rdv_t rdv, smx_action_t comm);
+static smx_action_t SIMIX_fifo_probe_comm(xbt_fifo_t fifo, e_smx_comm_type_t type,
+ int (*match_fun)(void *, void *,smx_action_t),
+ void *user_data, smx_action_t my_action);
static smx_action_t SIMIX_fifo_get_comm(xbt_fifo_t fifo, e_smx_comm_type_t type,
- int (*match_fun)(void *, void *,smx_action_t),
- void *user_data, smx_action_t my_action);
+ int (*match_fun)(void *, void *,smx_action_t),
+ void *user_data, smx_action_t my_action);
static void SIMIX_rdv_free(void *data);
+static void SIMIX_comm_start(smx_action_t action);
void SIMIX_network_init(void)
{
rdv_points = xbt_dict_new_homogeneous(SIMIX_rdv_free);
+ if(MC_is_active())
+ MC_ignore_global_variable("smx_total_comms");
}
void SIMIX_network_exit(void)
/* Rendez-Vous Points */
/******************************************************************************/
+smx_rdv_t SIMIX_pre_rdv_create(smx_simcall_t simcall, const char *name){
+ return SIMIX_rdv_create(name);
+}
smx_rdv_t SIMIX_rdv_create(const char *name)
{
/* two processes may have pushed the same rdv_create simcall at the same time */
rdv->done_comm_fifo = xbt_fifo_new();
rdv->permanent_receiver=NULL;
- XBT_DEBUG("Creating a mailbox at %p with name %s\n", rdv, name);
+ XBT_DEBUG("Creating a mailbox at %p with name %s\n", rdv, name);
if (rdv->name)
xbt_dict_set(rdv_points, rdv->name, rdv, NULL);
return rdv;
}
+void SIMIX_pre_rdv_destroy(smx_simcall_t simcall, smx_rdv_t rdv){
+ return SIMIX_rdv_destroy(rdv);
+}
void SIMIX_rdv_destroy(smx_rdv_t rdv)
{
if (rdv->name)
return rdv_points;
}
+smx_rdv_t SIMIX_pre_rdv_get_by_name(smx_simcall_t simcall, const char *name){
+ return SIMIX_rdv_get_by_name(name);
+}
smx_rdv_t SIMIX_rdv_get_by_name(const char *name)
{
return xbt_dict_get_or_null(rdv_points, name);
}
+int SIMIX_pre_rdv_comm_count_by_host(smx_simcall_t simcall, smx_rdv_t rdv, smx_host_t host){
+ return SIMIX_rdv_comm_count_by_host(rdv, host);
+}
int SIMIX_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host)
{
smx_action_t comm = NULL;
return count;
}
+smx_action_t SIMIX_pre_rdv_get_head(smx_simcall_t simcall, smx_rdv_t rdv){
+ return SIMIX_rdv_get_head(rdv);
+}
smx_action_t SIMIX_rdv_get_head(smx_rdv_t rdv)
{
return xbt_fifo_get_item_content(xbt_fifo_get_first_item(rdv->comm_fifo));
}
+smx_process_t SIMIX_pre_rdv_get_receiver(smx_simcall_t simcall, smx_rdv_t rdv){
+ return SIMIX_rdv_get_receiver(rdv);
+}
/**
* \brief get the receiver (process associated to the mailbox)
* \param rdv The rendez-vous point
return rdv->permanent_receiver;
}
+void SIMIX_pre_rdv_set_receiver(smx_simcall_t simcall, smx_rdv_t rdv,
+ smx_process_t process){
+ SIMIX_rdv_set_receiver(rdv, process);
+}
/**
* \brief set the receiver of the rendez vous point to allow eager sends
* \param rdv The rendez-vous point
* \param process The receiving process
*/
-void SIMIX_rdv_set_receiver(smx_rdv_t rdv , smx_process_t process)
+void SIMIX_rdv_set_receiver(smx_rdv_t rdv, smx_process_t process)
{
- rdv->permanent_receiver=process;
+ rdv->permanent_receiver=process;
}
/**
* \return The communication action if found, NULL otherwise
*/
smx_action_t SIMIX_fifo_get_comm(xbt_fifo_t fifo, e_smx_comm_type_t type,
- int (*match_fun)(void *, void *,smx_action_t),
- void *this_user_data, smx_action_t my_action)
+ int (*match_fun)(void *, void *,smx_action_t),
+ void *this_user_data, smx_action_t my_action)
{
smx_action_t action;
xbt_fifo_item_t item;
xbt_fifo_remove_item(fifo, item);
xbt_fifo_free_item(item);
action->comm.refcount++;
+#ifdef HAVE_MC
+ action->comm.rdv_cpy = action->comm.rdv;
+#endif
action->comm.rdv = NULL;
return action;
}
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 (or maybe the filtering didn't match)",
- action, (int)action->comm.type, (int)type);
+ " its type is %d but we are looking for a comm of type %d (or maybe the filtering didn't match)",
+ action, (int)action->comm.type, (int)type);
}
XBT_DEBUG("No matching communication action found");
return NULL;
}
+/**
+ * \brief Checks if there is a communication action 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 action if found, NULL otherwise
+ */
+smx_action_t SIMIX_fifo_probe_comm(xbt_fifo_t fifo, e_smx_comm_type_t type,
+ int (*match_fun)(void *, void *,smx_action_t),
+ void *this_user_data, smx_action_t my_action)
+{
+ smx_action_t action;
+ xbt_fifo_item_t item;
+ void* other_user_data = NULL;
+
+ xbt_fifo_foreach(fifo, item, action, smx_action_t) {
+ if (action->comm.type == SIMIX_COMM_SEND) {
+ other_user_data = action->comm.src_data;
+ } else if (action->comm.type == SIMIX_COMM_RECEIVE) {
+ other_user_data = action->comm.dst_data;
+ }
+ if (action->comm.type == type &&
+ (!match_fun || match_fun(this_user_data, other_user_data, action)) &&
+ (!action->comm.match_fun || action->comm.match_fun(other_user_data, this_user_data, my_action))) {
+ XBT_DEBUG("Found a matching communication action %p", action);
+ action->comm.refcount++;
+
+ return action;
+ }
+ 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 (or maybe the filtering didn't match)",
+ action, (int)action->comm.type, (int)type);
+ }
+ XBT_DEBUG("No matching communication action found");
+ return NULL;
+}
/******************************************************************************/
/* Communication Actions */
/******************************************************************************/
/* set communication */
act->comm.type = type;
act->comm.refcount = 1;
+ act->comm.src_data=NULL;
+ act->comm.dst_data=NULL;
+
#ifdef HAVE_LATENCY_BOUND_TRACKING
//initialize with unknown value
return act;
}
+void SIMIX_pre_comm_destroy(smx_simcall_t simcall, smx_action_t action){
+ SIMIX_comm_destroy(action);
+}
/**
* \brief Destroy a communicate action
* \param action The communicate action to be destroyed
}
action->comm.refcount--;
if (action->comm.refcount > 0)
- return;
+ return;
XBT_DEBUG("Really free communication %p; refcount is now %d", action,
- action->comm.refcount);
+ action->comm.refcount);
#ifdef HAVE_LATENCY_BOUND_TRACKING
- action->latency_limited = SIMIX_comm_is_latency_bounded( action ) ;
+ action->latency_limited = SIMIX_comm_is_latency_bounded( action ) ;
#endif
xbt_free(action->name);
action->comm.src_buff = NULL;
}
+ if(action->comm.rdv)
+ SIMIX_rdv_remove(action->comm.rdv, action);
+
xbt_mallocator_release(simix_global->action_mallocator, action);
}
#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);
+ surf_action_unref(action->comm.surf_comm);
action->comm.surf_comm = NULL;
}
if (action->comm.src_timeout){
- action->comm.src_timeout->model_type->action_unref(action->comm.src_timeout);
+ surf_action_unref(action->comm.src_timeout);
action->comm.src_timeout = NULL;
}
if (action->comm.dst_timeout){
- action->comm.dst_timeout->model_type->action_unref(action->comm.dst_timeout);
+ surf_action_unref(action->comm.dst_timeout);
action->comm.dst_timeout = NULL;
}
}
+void SIMIX_pre_comm_send(smx_simcall_t simcall, smx_rdv_t rdv,
+ double task_size, double rate,
+ void *src_buff, size_t src_buff_size,
+ int (*match_fun)(void *, void *,smx_action_t),
+ void *data, double timeout){
+ smx_action_t comm = SIMIX_comm_isend(simcall->issuer, rdv, task_size, rate,
+ src_buff, src_buff_size, match_fun, NULL,
+ data, 0);
+ simcall->mc_value = 0;
+ SIMIX_pre_comm_wait(simcall, comm, timeout);
+}
+smx_action_t SIMIX_pre_comm_isend(smx_simcall_t simcall, smx_rdv_t rdv,
+ double task_size, double rate,
+ void *src_buff, size_t src_buff_size,
+ int (*match_fun)(void *, void *,smx_action_t),
+ void (*clean_fun)(void *),
+ void *data, int detached){
+ return SIMIX_comm_isend(simcall->issuer, rdv, task_size, rate, src_buff,
+ src_buff_size, match_fun, clean_fun, data, detached);
+
+}
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,
other_action = this_action;
if (rdv->permanent_receiver!=NULL){
- //this mailbox is for small messages, which have to be sent right now
- other_action->state = SIMIX_READY;
- other_action->comm.dst_proc=rdv->permanent_receiver;
- other_action->comm.refcount++;
- other_action->comm.rdv = rdv;
- xbt_fifo_push(rdv->done_comm_fifo,other_action);
+ //this mailbox is for small messages, which have to be sent right now
+ other_action->state = SIMIX_READY;
+ other_action->comm.dst_proc=rdv->permanent_receiver;
+ other_action->comm.refcount++;
+ xbt_fifo_push(rdv->done_comm_fifo,other_action);
other_action->comm.rdv=rdv;
- XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p \n", rdv, &(other_action->comm));
+ XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p \n", rdv, &(other_action->comm));
}else{
SIMIX_rdv_push(rdv, this_action);
- }
+ }
} else {
- XBT_DEBUG("Receive already pushed\n");
+ XBT_DEBUG("Receive already pushed\n");
SIMIX_comm_destroy(this_action);
--smx_total_comms; // this creation was a pure waste
other_action->comm.match_fun = match_fun;
- if (MC_IS_ENABLED) {
+ if (MC_is_active()) {
other_action->state = SIMIX_RUNNING;
return other_action;
}
return (detached ? NULL : other_action);
}
+void SIMIX_pre_comm_recv(smx_simcall_t simcall, smx_rdv_t rdv,
+ void *dst_buff, size_t *dst_buff_size,
+ int (*match_fun)(void *, void *, smx_action_t),
+ void *data, double timeout, double rate)
+{
+ smx_action_t comm = SIMIX_comm_irecv(simcall->issuer, rdv, dst_buff,
+ dst_buff_size, match_fun, data, rate);
+ simcall->mc_value = 0;
+ SIMIX_pre_comm_wait(simcall, comm, timeout);
+}
+
+smx_action_t SIMIX_pre_comm_irecv(smx_simcall_t simcall, smx_rdv_t rdv,
+ void *dst_buff, size_t *dst_buff_size,
+ int (*match_fun)(void *, void *, smx_action_t),
+ void *data, double rate)
+{
+ return SIMIX_comm_irecv(simcall->issuer, rdv, dst_buff, dst_buff_size,
+ match_fun, data, rate);
+}
+
smx_action_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_action_t), void *data)
+ void *dst_buff, size_t *dst_buff_size,
+ int (*match_fun)(void *, void *, smx_action_t),
+ void *data, double rate)
{
- XBT_DEBUG("recv from %p %p\n", rdv, rdv->comm_fifo);
- smx_action_t this_action = SIMIX_comm_new(SIMIX_COMM_RECEIVE);
+ XBT_DEBUG("recv from %p %p\n", rdv, rdv->comm_fifo);
+ smx_action_t this_action = SIMIX_comm_new(SIMIX_COMM_RECEIVE);
- smx_action_t other_action;
+ smx_action_t other_action;
//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){
- XBT_DEBUG("We have a comm that has probably already been received, trying to match it, to skip the communication\n");
- //find a match in the already received fifo
- other_action = SIMIX_fifo_get_comm(rdv->done_comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action);
- //if not found, assume the receiver came first, register it to the mailbox in the classical way
- if (!other_action) {
- XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into fifo\n");
- other_action = this_action;
- SIMIX_rdv_push(rdv, this_action);
- }else{
- if(other_action->comm.surf_comm && SIMIX_comm_get_remains(other_action)==0.0)
- {
- XBT_DEBUG("comm %p has been already sent, and is finished, destroy it\n",&(other_action->comm));
- other_action->state = SIMIX_DONE;
- other_action->comm.type = SIMIX_COMM_DONE;
- other_action->comm.rdv = NULL;
- SIMIX_comm_destroy(this_action);
- --smx_total_comms; // this creation was a pure waste
- //already_received=1;
- other_action->comm.refcount--;
- }/*else{
- XBT_DEBUG("Not yet finished, we have to wait %d\n", xbt_fifo_size(rdv->comm_fifo));
- }*/
- other_action->comm.refcount--;
- SIMIX_comm_destroy(this_action);
- --smx_total_comms; // this creation was a pure waste
- }
+ XBT_DEBUG("We have a comm that has probably already been received, trying to match it, to skip the communication\n");
+ //find a match in the already received fifo
+ other_action = SIMIX_fifo_get_comm(rdv->done_comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action);
+ //if not found, assume the receiver came first, register it to the mailbox in the classical way
+ if (!other_action) {
+ XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into fifo\n");
+ other_action = this_action;
+ SIMIX_rdv_push(rdv, this_action);
+ }else{
+ if(other_action->comm.surf_comm && SIMIX_comm_get_remains(other_action)==0.0)
+ {
+ XBT_DEBUG("comm %p has been already sent, and is finished, destroy it\n",&(other_action->comm));
+ other_action->state = SIMIX_DONE;
+ other_action->comm.type = SIMIX_COMM_DONE;
+ other_action->comm.rdv = NULL;
+ //SIMIX_comm_destroy(this_action);
+ //--smx_total_comms; // this creation was a pure waste
+ //already_received=1;
+ //other_action->comm.refcount--;
+ }/*else{
+ XBT_DEBUG("Not yet finished, we have to wait %d\n", xbt_fifo_size(rdv->comm_fifo));
+ }*/
+ other_action->comm.refcount--;
+ SIMIX_comm_destroy(this_action);
+ --smx_total_comms; // this creation was a pure waste
+ }
}else{
- /* Prepare an action describing us, so that it gets passed to the user-provided filter of other side */
-
- /* Look for communication action 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_action = SIMIX_fifo_get_comm(rdv->comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action);
+ /* Prepare an action describing us, so that it gets passed to the user-provided filter of other side */
- if (!other_action) {
- XBT_DEBUG("Receive pushed first %d\n", xbt_fifo_size(rdv->comm_fifo));
- other_action = this_action;
- SIMIX_rdv_push(rdv, this_action);
- } else {
- SIMIX_comm_destroy(this_action);
- --smx_total_comms; // this creation was a pure waste
- other_action->state = SIMIX_READY;
- other_action->comm.type = SIMIX_COMM_READY;
- xbt_fifo_push(dst_proc->comms, other_action);
+ /* Look for communication action 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_action = SIMIX_fifo_get_comm(rdv->comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action);
- }
+ if (!other_action) {
+ XBT_DEBUG("Receive pushed first %d\n", xbt_fifo_size(rdv->comm_fifo));
+ other_action = this_action;
+ SIMIX_rdv_push(rdv, this_action);
+ } else {
+ SIMIX_comm_destroy(this_action);
+ --smx_total_comms; // this creation was a pure waste
+ other_action->state = SIMIX_READY;
+ other_action->comm.type = SIMIX_COMM_READY;
+ //other_action->comm.refcount--;
+ }
+ xbt_fifo_push(dst_proc->comms, other_action);
}
+ /* Setup communication action */
+ other_action->comm.dst_proc = dst_proc;
+ other_action->comm.dst_buff = dst_buff;
+ other_action->comm.dst_buff_size = dst_buff_size;
+ other_action->comm.dst_data = data;
- /* Setup communication action */
- other_action->comm.dst_proc = dst_proc;
- other_action->comm.dst_buff = dst_buff;
- other_action->comm.dst_buff_size = dst_buff_size;
- other_action->comm.dst_data = data;
+ if (rate != -1.0 &&
+ (other_action->comm.rate == -1.0 || rate < other_action->comm.rate))
+ other_action->comm.rate = rate;
- other_action->comm.match_fun = match_fun;
+ other_action->comm.match_fun = match_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_action);*/
+ /*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_action);*/
- if (MC_IS_ENABLED) {
- other_action->state = SIMIX_RUNNING;
- return other_action;
- }
+ if (MC_is_active()) {
+ other_action->state = SIMIX_RUNNING;
+ return other_action;
+ }
- SIMIX_comm_start(other_action);
- // }
+ SIMIX_comm_start(other_action);
+ // }
return other_action;
}
-void SIMIX_pre_comm_wait(smx_simcall_t simcall, smx_action_t action, double timeout, int idx)
+smx_action_t SIMIX_pre_comm_iprobe(smx_simcall_t simcall, smx_rdv_t rdv,
+ int src, int tag,
+ int (*match_fun)(void *, void *, smx_action_t),
+ void *data){
+ return SIMIX_comm_iprobe(simcall->issuer, rdv, src, tag, match_fun, data);
+}
+
+smx_action_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_rdv_t rdv, int src,
+ int tag, int (*match_fun)(void *, void *, smx_action_t), void *data)
{
+ XBT_DEBUG("iprobe from %p %p\n", rdv, rdv->comm_fifo);
+ smx_action_t this_action = SIMIX_comm_new(SIMIX_COMM_RECEIVE);
+
+ smx_action_t other_action=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 \n");
+
+ other_action = SIMIX_fifo_probe_comm(rdv->done_comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action);
+ }
+ // }else{
+ if(!other_action){
+ XBT_DEBUG("second try in the other mailbox");
+ other_action = SIMIX_fifo_probe_comm(rdv->comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action);
+ }
+// }
+ if(other_action)other_action->comm.refcount--;
+
+ SIMIX_comm_destroy(this_action);
+ --smx_total_comms;
+ return other_action;
+}
+void SIMIX_pre_comm_wait(smx_simcall_t simcall, smx_action_t action, double timeout)
+{
/* the simcall may be a wait, a send or a recv */
surf_action_t sleep;
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
- if (MC_IS_ENABLED) {
+ if (MC_is_active()) {
+ int idx = simcall->mc_value;
if (idx == 0) {
action->state = SIMIX_DONE;
} else {
if (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING) {
SIMIX_comm_finish(action);
} else { /* if (timeout >= 0) { we need a surf sleep action even when there is no timeout, otherwise surf won't tell us when the host fails */
- sleep = surf_workstation_model->extension.workstation.sleep(simcall->issuer->smx_host->host, timeout);
- surf_workstation_model->action_data_set(sleep, action);
+ sleep = surf_workstation_sleep(simcall->issuer->smx_host, timeout);
+ surf_action_set_data(sleep, action);
if (simcall->issuer == action->comm.src_proc)
action->comm.src_timeout = sleep;
}
}
-void SIMIX_pre_comm_test(smx_simcall_t simcall)
+void SIMIX_pre_comm_test(smx_simcall_t simcall, smx_action_t action)
{
- smx_action_t action = simcall->comm_test.comm;
-
- if(MC_IS_ENABLED){
- simcall->comm_test.result = action->comm.src_proc && action->comm.dst_proc;
- if(simcall->comm_test.result){
+ if(MC_is_active()){
+ simcall_comm_test__set__result(simcall, action->comm.src_proc && action->comm.dst_proc);
+ if(simcall_comm_test__get__result(simcall)){
action->state = SIMIX_DONE;
xbt_fifo_push(action->simcalls, simcall);
SIMIX_comm_finish(action);
return;
}
- simcall->comm_test.result = (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING);
- if (simcall->comm_test.result) {
+ simcall_comm_test__set__result(simcall, (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING));
+ if (simcall_comm_test__get__result(simcall)) {
xbt_fifo_push(action->simcalls, simcall);
SIMIX_comm_finish(action);
} else {
}
}
-void SIMIX_pre_comm_testany(smx_simcall_t simcall, int idx)
+void SIMIX_pre_comm_testany(smx_simcall_t simcall, xbt_dynar_t actions)
{
unsigned int cursor;
smx_action_t action;
- xbt_dynar_t actions = simcall->comm_testany.comms;
- simcall->comm_testany.result = -1;
+ simcall_comm_testany__set__result(simcall, -1);
- if (MC_IS_ENABLED){
+ if (MC_is_active()){
+ int idx = simcall->mc_value;
if(idx == -1){
SIMIX_simcall_answer(simcall);
}else{
action = xbt_dynar_get_as(actions, idx, smx_action_t);
- simcall->comm_testany.result = idx;
+ simcall_comm_testany__set__result(simcall, idx);
xbt_fifo_push(action->simcalls, simcall);
action->state = SIMIX_DONE;
SIMIX_comm_finish(action);
return;
}
- xbt_dynar_foreach(simcall->comm_testany.comms,cursor,action) {
+ xbt_dynar_foreach(simcall_comm_testany__get__comms(simcall), cursor,action) {
if (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING) {
- simcall->comm_testany.result = cursor;
+ simcall_comm_testany__set__result(simcall, cursor);
xbt_fifo_push(action->simcalls, simcall);
SIMIX_comm_finish(action);
return;
SIMIX_simcall_answer(simcall);
}
-void SIMIX_pre_comm_waitany(smx_simcall_t simcall, int idx)
+void SIMIX_pre_comm_waitany(smx_simcall_t simcall, xbt_dynar_t actions)
{
smx_action_t action;
unsigned int cursor = 0;
- xbt_dynar_t actions = simcall->comm_waitany.comms;
- if (MC_IS_ENABLED){
+ if (MC_is_active()){
+ int idx = simcall->mc_value;
action = xbt_dynar_get_as(actions, idx, smx_action_t);
xbt_fifo_push(action->simcalls, simcall);
- simcall->comm_waitany.result = idx;
+ simcall_comm_waitany__set__result(simcall, idx);
action->state = SIMIX_DONE;
SIMIX_comm_finish(action);
return;
{
smx_action_t action;
unsigned int cursor = 0;
- xbt_dynar_t actions = simcall->comm_waitany.comms;
+ xbt_dynar_t actions = simcall_comm_waitany__get__comms(simcall);
xbt_dynar_foreach(actions, cursor, action) {
xbt_fifo_remove(action->simcalls, simcall);
* \brief Starts the simulation of a communication action.
* \param action the communication action
*/
-XBT_INLINE void SIMIX_comm_start(smx_action_t action)
+static 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 receiver = action->comm.dst_proc->smx_host;
XBT_DEBUG("Starting communication %p from '%s' to '%s'", action,
- SIMIX_host_get_name(sender), SIMIX_host_get_name(receiver));
+ SIMIX_host_get_name(sender), SIMIX_host_get_name(receiver));
- action->comm.surf_comm = surf_workstation_model->extension.workstation.
- communicate(sender->host, receiver->host, action->comm.task_size, action->comm.rate);
+ action->comm.surf_comm = surf_workstation_model_communicate(surf_workstation_model,
+ sender, receiver,
+ action->comm.task_size, action->comm.rate);
- surf_workstation_model->action_data_set(action->comm.surf_comm, action);
+ surf_action_set_data(action->comm.surf_comm, action);
action->state = SIMIX_RUNNING;
/* If a link is failed, detect it immediately */
- if (surf_workstation_model->action_state_get(action->comm.surf_comm) == SURF_ACTION_FAILED) {
+ if (surf_action_get_state(action->comm.surf_comm) == SURF_ACTION_FAILED) {
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));
+ SIMIX_host_get_name(sender), SIMIX_host_get_name(receiver));
action->state = SIMIX_LINK_FAILURE;
SIMIX_comm_destroy_internal_actions(action);
}
if (SIMIX_process_is_suspended(action->comm.src_proc))
XBT_DEBUG("The communication is suspended on startup because src (%s:%s) were suspended since it initiated the communication",
- SIMIX_host_get_name(action->comm.src_proc->smx_host), action->comm.src_proc->name);
+ SIMIX_host_get_name(action->comm.src_proc->smx_host), action->comm.src_proc->name);
else
XBT_DEBUG("The communication is suspended on startup because dst (%s:%s) were suspended since it initiated the communication",
- SIMIX_host_get_name(action->comm.dst_proc->smx_host), action->comm.dst_proc->name);
+ SIMIX_host_get_name(action->comm.dst_proc->smx_host), action->comm.dst_proc->name);
- surf_workstation_model->suspend(action->comm.surf_comm);
+ surf_action_suspend(action->comm.surf_comm);
}
}
unsigned int destroy_count = 0;
smx_simcall_t simcall;
+
while ((simcall = xbt_fifo_shift(action->simcalls))) {
/* If a waitany simcall is waiting for this action to finish, then remove
return it as the result of the simcall */
if (simcall->call == SIMCALL_COMM_WAITANY) {
SIMIX_waitany_remove_simcall_from_actions(simcall);
- if (!MC_IS_ENABLED)
- simcall->comm_waitany.result = xbt_dynar_search(simcall->comm_waitany.comms, &action);
+ if (!MC_is_active())
+ simcall_comm_waitany__set__result(simcall, xbt_dynar_search(simcall_comm_waitany__get__comms(simcall), &action));
}
/* If the action is still in a rendez-vous point then remove from it */
/* Check out for errors */
switch (action->state) {
- case SIMIX_DONE:
- XBT_DEBUG("Communication %p complete!", action);
- SIMIX_comm_copy_data(action);
- break;
+ case SIMIX_DONE:
+ XBT_DEBUG("Communication %p complete!", action);
+ SIMIX_comm_copy_data(action);
+ break;
- case SIMIX_SRC_TIMEOUT:
- SMX_EXCEPTION(simcall->issuer, timeout_error, 0,
- "Communication timeouted because of sender");
- break;
+ case SIMIX_SRC_TIMEOUT:
+ SMX_EXCEPTION(simcall->issuer, timeout_error, 0,
+ "Communication timeouted because of sender");
+ break;
- case SIMIX_DST_TIMEOUT:
- SMX_EXCEPTION(simcall->issuer, timeout_error, 0,
- "Communication timeouted because of receiver");
- break;
+ case SIMIX_DST_TIMEOUT:
+ SMX_EXCEPTION(simcall->issuer, timeout_error, 0,
+ "Communication timeouted because of receiver");
+ break;
- case SIMIX_SRC_HOST_FAILURE:
- if (simcall->issuer == action->comm.src_proc)
- simcall->issuer->context->iwannadie = 1;
+ case SIMIX_SRC_HOST_FAILURE:
+ if (simcall->issuer == action->comm.src_proc)
+ simcall->issuer->context->iwannadie = 1;
// SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
- else
- SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed");
- break;
+ else
+ SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed");
+ break;
- case SIMIX_DST_HOST_FAILURE:
- if (simcall->issuer == action->comm.dst_proc)
- simcall->issuer->context->iwannadie = 1;
+ case SIMIX_DST_HOST_FAILURE:
+ if (simcall->issuer == action->comm.dst_proc)
+ simcall->issuer->context->iwannadie = 1;
// SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
- else
- SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed");
- break;
-
- case SIMIX_LINK_FAILURE:
- XBT_DEBUG("Link failure in action %p between '%s' and '%s': posting an exception to the issuer: %s (%p) detached:%d",
- action,
- action->comm.src_proc ? action->comm.src_proc->smx_host->name : NULL,
- action->comm.dst_proc ? action->comm.dst_proc->smx_host->name : NULL,
- simcall->issuer->name, simcall->issuer, action->comm.detached);
- if (action->comm.src_proc == simcall->issuer) {
- XBT_DEBUG("I'm source");
- } else if (action->comm.dst_proc == simcall->issuer) {
- XBT_DEBUG("I'm dest");
- } else {
- XBT_DEBUG("I'm neither source nor dest");
- }
- SMX_EXCEPTION(simcall->issuer, network_error, 0, "Link failure");
- break;
-
- case SIMIX_CANCELED:
- if (simcall->issuer == action->comm.dst_proc)
- SMX_EXCEPTION(simcall->issuer, cancel_error, 0,
- "Communication canceled by the sender");
- else
- SMX_EXCEPTION(simcall->issuer, cancel_error, 0,
- "Communication canceled by the receiver");
- break;
-
- default:
- xbt_die("Unexpected action state in SIMIX_comm_finish: %d", (int)action->state);
+ else
+ SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed");
+ break;
+
+ case SIMIX_LINK_FAILURE:
+ XBT_DEBUG("Link failure in action %p between '%s' and '%s': posting an exception to the issuer: %s (%p) detached:%d",
+ action,
+ action->comm.src_proc ? sg_host_name(action->comm.src_proc->smx_host) : NULL,
+ action->comm.dst_proc ? sg_host_name(action->comm.dst_proc->smx_host) : NULL,
+ simcall->issuer->name, simcall->issuer, action->comm.detached);
+ if (action->comm.src_proc == simcall->issuer) {
+ XBT_DEBUG("I'm source");
+ } else if (action->comm.dst_proc == simcall->issuer) {
+ XBT_DEBUG("I'm dest");
+ } else {
+ XBT_DEBUG("I'm neither source nor dest");
+ }
+ SMX_EXCEPTION(simcall->issuer, network_error, 0, "Link failure");
+ break;
+
+ case SIMIX_CANCELED:
+ if (simcall->issuer == action->comm.dst_proc)
+ SMX_EXCEPTION(simcall->issuer, cancel_error, 0,
+ "Communication canceled by the sender");
+ else
+ SMX_EXCEPTION(simcall->issuer, cancel_error, 0,
+ "Communication canceled by the receiver");
+ break;
+
+ default:
+ xbt_die("Unexpected action state in SIMIX_comm_finish: %d", (int)action->state);
}
/* if there is an exception during a waitany or a testany, indicate the position of the failed communication */
if (simcall->issuer->doexception) {
if (simcall->call == SIMCALL_COMM_WAITANY) {
- simcall->issuer->running_ctx->exception.value = xbt_dynar_search(simcall->comm_waitany.comms, &action);
+ simcall->issuer->running_ctx->exception.value = xbt_dynar_search(simcall_comm_waitany__get__comms(simcall), &action);
}
else if (simcall->call == SIMCALL_COMM_TESTANY) {
- simcall->issuer->running_ctx->exception.value = xbt_dynar_search(simcall->comm_testany.comms, &action);
+ simcall->issuer->running_ctx->exception.value = xbt_dynar_search(simcall_comm_testany__get__comms(simcall), &action);
}
}
- if (surf_workstation_model->extension.
- workstation.get_state(simcall->issuer->smx_host->host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
simcall->issuer->waiting_action = NULL;
xbt_fifo_remove(simcall->issuer->comms, action);
+ if(action->comm.detached){
+ smx_process_t proc;
+ int still_alive = 0;
+
+ if(simcall->issuer == action->comm.src_proc){
+ if(action->comm.dst_proc){
+ xbt_swag_foreach(proc, simix_global->process_list)
+ {
+ if(proc==action->comm.dst_proc){
+ still_alive=1;
+ break;
+ }
+ }
+ }
+ if(still_alive) xbt_fifo_remove(action->comm.dst_proc->comms, action);
+ }
+ if(simcall->issuer == action->comm.dst_proc){
+ if(action->comm.src_proc)
+ if(action->comm.dst_proc){
+ xbt_swag_foreach(proc, simix_global->process_list)
+ {
+ if(proc==action->comm.src_proc){
+ still_alive=1;
+ break;
+ }
+ }
+ }
+ if(still_alive) xbt_fifo_remove(action->comm.src_proc->comms, action);
+ }
+ }
SIMIX_simcall_answer(simcall);
destroy_count++;
}
{
/* Update action state */
if (action->comm.src_timeout &&
- surf_workstation_model->action_state_get(action->comm.src_timeout) == SURF_ACTION_DONE)
- action->state = SIMIX_SRC_TIMEOUT;
+ surf_action_get_state(action->comm.src_timeout) == SURF_ACTION_DONE)
+ action->state = SIMIX_SRC_TIMEOUT;
else if (action->comm.dst_timeout &&
- surf_workstation_model->action_state_get(action->comm.dst_timeout) == SURF_ACTION_DONE)
- action->state = SIMIX_DST_TIMEOUT;
+ surf_action_get_state(action->comm.dst_timeout) == SURF_ACTION_DONE)
+ action->state = SIMIX_DST_TIMEOUT;
else if (action->comm.src_timeout &&
- surf_workstation_model->action_state_get(action->comm.src_timeout) == SURF_ACTION_FAILED)
- action->state = SIMIX_SRC_HOST_FAILURE;
+ surf_action_get_state(action->comm.src_timeout) == SURF_ACTION_FAILED)
+ action->state = SIMIX_SRC_HOST_FAILURE;
else if (action->comm.dst_timeout &&
- surf_workstation_model->action_state_get(action->comm.dst_timeout) == SURF_ACTION_FAILED)
- action->state = SIMIX_DST_HOST_FAILURE;
+ surf_action_get_state(action->comm.dst_timeout) == SURF_ACTION_FAILED)
+ action->state = SIMIX_DST_HOST_FAILURE;
else if (action->comm.surf_comm &&
- surf_workstation_model->action_state_get(action->comm.surf_comm) == SURF_ACTION_FAILED) {
+ surf_action_get_state(action->comm.surf_comm) == SURF_ACTION_FAILED) {
XBT_DEBUG("Puta madre. Surf says that the link broke");
- action->state = SIMIX_LINK_FAILURE;
+ action->state = SIMIX_LINK_FAILURE;
} else
action->state = SIMIX_DONE;
XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d",
- action, (int)action->state, action->comm.src_proc, action->comm.dst_proc, action->comm.detached);
+ action, (int)action->state, action->comm.src_proc, action->comm.dst_proc, action->comm.detached);
/* destroy the surf actions associated with the Simix communication */
SIMIX_comm_destroy_internal_actions(action);
}
}
+void SIMIX_pre_comm_cancel(smx_simcall_t simcall, smx_action_t action){
+ SIMIX_comm_cancel(action);
+}
void SIMIX_comm_cancel(smx_action_t action)
{
/* if the action is a waiting state means that it is still in a rdv */
SIMIX_rdv_remove(action->comm.rdv, action);
action->state = SIMIX_CANCELED;
}
- else if (!MC_IS_ENABLED /* when running the MC there are no surf actions */
- && (action->state == SIMIX_READY || action->state == SIMIX_RUNNING)) {
+ else if (!MC_is_active() /* when running the MC there are no surf actions */
+ && (action->state == SIMIX_READY || action->state == SIMIX_RUNNING)) {
- surf_workstation_model->action_cancel(action->comm.surf_comm);
+ surf_action_cancel(action->comm.surf_comm);
}
}
{
/*FIXME: shall we suspend also the timeout actions? */
if (action->comm.surf_comm)
- surf_workstation_model->suspend(action->comm.surf_comm);
+ surf_action_suspend(action->comm.surf_comm);
/* in the other case, the action will be suspended on creation, in SIMIX_comm_start() */
}
{
/*FIXME: check what happen with the timeouts */
if (action->comm.surf_comm)
- surf_workstation_model->resume(action->comm.surf_comm);
+ surf_action_resume(action->comm.surf_comm);
/* in the other case, the action were not really suspended yet, see SIMIX_comm_suspend() and SIMIX_comm_start() */
}
/************* Action Getters **************/
+double SIMIX_pre_comm_get_remains(smx_simcall_t simcall, smx_action_t action){
+ return SIMIX_comm_get_remains(action);
+}
/**
* \brief get the amount remaining from the communication
* \param action The communication
double remains;
if(!action){
- return 0;
+ return 0;
}
switch (action->state) {
- case SIMIX_RUNNING:
- remains = surf_workstation_model->get_remains(action->comm.surf_comm);
- break;
+ case SIMIX_RUNNING:
+ remains = surf_action_get_remains(action->comm.surf_comm);
+ break;
- case SIMIX_WAITING:
- case SIMIX_READY:
- remains = 0; /*FIXME: check what should be returned */
- break;
+ case SIMIX_WAITING:
+ case SIMIX_READY:
+ remains = 0; /*FIXME: check what should be returned */
+ break;
- default:
- remains = 0; /*FIXME: is this correct? */
- break;
+ default:
+ remains = 0; /*FIXME: is this correct? */
+ break;
}
return remains;
}
+e_smx_state_t SIMIX_pre_comm_get_state(smx_simcall_t simcall, smx_action_t action){
+ return SIMIX_comm_get_state(action);
+}
e_smx_state_t SIMIX_comm_get_state(smx_action_t action)
{
return action->state;
}
+void* SIMIX_pre_comm_get_src_data(smx_simcall_t simcall, smx_action_t action){
+ return SIMIX_comm_get_src_data(action);
+}
/**
* \brief Return the user data associated to the sender of the communication
* \param action The communication
return action->comm.src_data;
}
+void* SIMIX_pre_comm_get_dst_data(smx_simcall_t simcall, smx_action_t action){
+ return SIMIX_comm_get_dst_data(action);
+}
/**
* \brief Return the user data associated to the receiver of the communication
* \param action The communication
return action->comm.dst_data;
}
+smx_process_t SIMIX_pre_comm_get_src_proc(smx_simcall_t simcall, smx_action_t action){
+ return SIMIX_comm_get_src_proc(action);
+}
smx_process_t SIMIX_comm_get_src_proc(smx_action_t action)
{
return action->comm.src_proc;
}
+smx_process_t SIMIX_pre_comm_get_dst_proc(smx_simcall_t simcall, smx_action_t action){
+ return SIMIX_comm_get_dst_proc(action);
+}
smx_process_t SIMIX_comm_get_dst_proc(smx_action_t action)
{
return action->comm.dst_proc;
}
#ifdef HAVE_LATENCY_BOUND_TRACKING
+int SIMIX_pre_comm_is_latency_bounded(smx_simcall_t simcall, smx_action_t action)
+{
+ return SIMIX_comm_is_latency_bounded(action);
+}
+
/**
* \brief verify if communication is latency bounded
* \param comm The communication
XBT_INLINE int SIMIX_comm_is_latency_bounded(smx_action_t action)
{
if(!action){
- return 0;
+ return 0;
}
if (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);
- XBT_DEBUG("Action limited is %d", action->latency_limited);
+ 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);
+ XBT_DEBUG("Action limited is %d", action->latency_limited);
}
return action->latency_limited;
}
/* SIMIX_comm_copy_data callbacks */
/******************************************************************************/
static void (*SIMIX_comm_copy_data_callback) (smx_action_t, void*, size_t) =
- &SIMIX_comm_copy_pointer_callback;
+ &SIMIX_comm_copy_pointer_callback;
void
SIMIX_comm_set_copy_data_callback(void (*callback) (smx_action_t, void*, size_t))
void SIMIX_comm_copy_pointer_callback(smx_action_t comm, void* buff, size_t buff_size)
{
xbt_assert((buff_size == sizeof(void *)),
- "Cannot copy %zu bytes: must be sizeof(void*)", buff_size);
+ "Cannot copy %zu bytes: must be sizeof(void*)", buff_size);
*(void **) (comm->comm.dst_buff) = buff;
}
void SIMIX_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t buff_size)
-{
- XBT_DEBUG("Copy the data over");
- memcpy(comm->comm.dst_buff, buff, buff_size);
-}
-
-void smpi_comm_copy_data_callback(smx_action_t comm, void* buff, size_t buff_size)
{
XBT_DEBUG("Copy the data over");
memcpy(comm->comm.dst_buff, buff, buff_size);
}
}
+
/**
* \brief Copy the communication data from the sender's buffer to the receiver's one
* \param comm The communication
return;
XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
- comm,
- comm->comm.src_proc ? comm->comm.src_proc->smx_host->name : "a finished process",
- comm->comm.src_buff,
- comm->comm.dst_proc ? comm->comm.dst_proc->smx_host->name : "a finished process",
- comm->comm.dst_buff, buff_size);
+ comm,
+ comm->comm.src_proc ? sg_host_name(comm->comm.src_proc->smx_host) : "a finished process",
+ comm->comm.src_buff,
+ comm->comm.dst_proc ? sg_host_name(comm->comm.dst_proc->smx_host) : "a finished process",
+ comm->comm.dst_buff, buff_size);
/* Copy at most dst_buff_size bytes of the message to receiver's buffer */
if (comm->comm.dst_buff_size)
