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
Distinguish access to sender-side and receiver-side user data in smx_action_t.
[simgrid.git]
/
src
/
simix
/
smx_smurf.c
diff --git
a/src/simix/smx_smurf.c
b/src/simix/smx_smurf.c
index
b01ce7b
..
3d6bbf0
100644
(file)
--- a/
src/simix/smx_smurf.c
+++ b/
src/simix/smx_smurf.c
@@
-24,9
+24,11
@@
void SIMIX_request_push(smx_req_t req)
{
req->issuer = SIMIX_process_self();
if (req->issuer != simix_global->maestro_process){
- xbt_os_mutex_acquire(sync_req_vector);
+ if (_surf_parallel_contexts)
+ xbt_os_mutex_acquire(sync_req_vector);
xbt_dynar_set_as(req_vector, req->issuer->pid, smx_req_t, req);
- xbt_os_mutex_release(sync_req_vector);
+ if (_surf_parallel_contexts)
+ xbt_os_mutex_release(sync_req_vector);
req->issuer->request = req;
DEBUG2("Yield process '%s' on request of type %d", req->issuer->name, req->call);
SIMIX_process_yield();
@@
-38,13
+40,12
@@
void SIMIX_request_push(smx_req_t req)
smx_req_t SIMIX_request_pop(void)
{
smx_req_t request = NULL;
- xbt_os_mutex_acquire(sync_req_vector);
while (xbt_dynar_length(req_vector)){
request = xbt_dynar_pop_as(req_vector, smx_req_t);
if (request)
break;
}
- xbt_os_mutex_release(sync_req_vector);
+
return request;
}
@@
-365,8
+366,13
@@
void SIMIX_request_pre(smx_req_t req)
SIMIX_request_answer(req);
break;
- case REQ_COMM_GET_DATA:
- req->comm_get_data.result = SIMIX_comm_get_data(req->comm_get_data.comm);
+ case REQ_COMM_GET_SRC_DATA:
+ req->comm_get_src_data.result = SIMIX_comm_get_src_data(req->comm_get_src_data.comm);
+ SIMIX_request_answer(req);
+ break;
+
+ case REQ_COMM_GET_DST_DATA:
+ req->comm_get_dst_data.result = SIMIX_comm_get_dst_data(req->comm_get_dst_data.comm);
SIMIX_request_answer(req);
break;