A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix a bunch of compilation warnings
[simgrid.git]
/
src
/
simix
/
smx_network.c
diff --git
a/src/simix/smx_network.c
b/src/simix/smx_network.c
index
f874dcc
..
fb39f8f
100644
(file)
--- a/
src/simix/smx_network.c
+++ b/
src/simix/smx_network.c
@@
-128,16
+128,22
@@
smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
{
smx_action_t req;
xbt_fifo_item_t item;
+ void* req_data = NULL;
xbt_fifo_foreach(rdv->comm_fifo, item, req, smx_action_t){
- if(req->comm.type == type && (!match_fun || match_fun(data, req->comm.data))){
- xbt_fifo_remove_item(rdv->comm_fifo, item);
- req->comm.refcount++;
- req->comm.rdv = NULL;
- return req;
- }
+ 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;
+ }
+ if (req->comm.type == type && (!match_fun || match_fun(data, req_data))) {
+ xbt_fifo_remove_item(rdv->comm_fifo, item);
+ xbt_fifo_free_item(item);
+ req->comm.refcount++;
+ req->comm.rdv = NULL;
+ return req;
+ }
}
-
DEBUG0("Communication request not found");
return NULL;
}
@@
-198,7
+204,7
@@
void SIMIX_comm_destroy(smx_action_t action)
action->comm.refcount--;
if (action->comm.refcount > 0)
return;
-
VERB
2("Really free communication %p; refcount is now %d", action,
+
DEBUG
2("Really free communication %p; refcount is now %d", action,
action->comm.refcount);
#ifdef HAVE_TRACING
@@
-258,7
+264,7
@@
smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv,
action->comm.rate = rate;
action->comm.src_buff = src_buff;
action->comm.src_buff_size = src_buff_size;
- action->comm.data = data;
+ action->comm.
src_
data = data;
if (MC_IS_ENABLED) {
action->state = SIMIX_RUNNING;
@@
-292,6
+298,7
@@
smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv,
action->comm.dst_proc = dst_proc;
action->comm.dst_buff = dst_buff;
action->comm.dst_buff_size = dst_buff_size;
+ action->comm.dst_data = data;
if (MC_IS_ENABLED) {
action->state = SIMIX_RUNNING;
@@
-315,6
+322,7
@@
void SIMIX_pre_comm_wait(smx_req_t req)
if (MC_IS_ENABLED){
action->state = SIMIX_DONE;
SIMIX_comm_finish(action);
+ return;
}
/* If the action has already finish perform the error handling, */
@@
-340,8
+348,7
@@
void SIMIX_pre_comm_test(smx_req_t req)
if (req->comm_test.result) {
xbt_fifo_push(action->request_list, req);
SIMIX_comm_finish(action);
- }
- else {
+ } else {
SIMIX_request_answer(req);
}
}
@@
-356,7
+363,7
@@
void SIMIX_pre_comm_testany(smx_req_t req)
req->comm_testany.result = cursor;
xbt_fifo_push(action->request_list, req);
SIMIX_comm_finish(action);
-
break
;
+
return
;
}
}
SIMIX_request_answer(req);
@@
-613,13
+620,23
@@
e_smx_state_t SIMIX_comm_get_state(smx_action_t action)
}
/**
- * \brief Return the user data associated to the communication
+ * \brief Return the user data associated to the sender of the communication
+ * \param action The communication
+ * \return the user data
+ */
+void* SIMIX_comm_get_src_data(smx_action_t action)
+{
+ return action->comm.src_data;
+}
+
+/**
+ * \brief Return the user data associated to the receiver of the communication
* \param action The communication
* \return the user data
*/
-void* SIMIX_comm_get_data(smx_action_t action)
+void* SIMIX_comm_get_d
st_d
ata(smx_action_t action)
{
- return action->comm.data;
+ return action->comm.d
st_d
ata;
}
void* SIMIX_comm_get_src_buff(smx_action_t action)