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
Use a raw array instead of a dynar to store the requests
[simgrid.git]
/
src
/
simix
/
smx_smurf.c
diff --git
a/src/simix/smx_smurf.c
b/src/simix/smx_smurf.c
index
0dd362a
..
889543f
100644
(file)
--- a/
src/simix/smx_smurf.c
+++ b/
src/simix/smx_smurf.c
@@
-5,30
+5,24
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_smurf, simix,
"Logging specific to SIMIX (SMURF)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_smurf, simix,
"Logging specific to SIMIX (SMURF)");
-static xbt_dynar_t req_vector;
-static xbt_os_mutex_t sync_req_vector;
+static smx_req_t* req_vector=NULL;
void SIMIX_request_init(void)
{
void SIMIX_request_init(void)
{
- sync_req_vector = xbt_os_mutex_init();
- req_vector = xbt_dynar_new(sizeof(void *), NULL);
+ req_vector = xbt_new0(smx_req_t,1);/* enough room for maestro's requests */
}
void SIMIX_request_destroy(void)
{
}
void SIMIX_request_destroy(void)
{
-
xbt_os_mutex_destroy(sync_
req_vector);
-
xbt_dynar_free(&req_vector)
;
+
free(
req_vector);
+
req_vector = NULL
;
}
void SIMIX_request_push(smx_req_t req)
{
req->issuer = SIMIX_process_self();
if (req->issuer != simix_global->maestro_process){
}
void SIMIX_request_push(smx_req_t req)
{
req->issuer = SIMIX_process_self();
if (req->issuer != simix_global->maestro_process){
- if (_surf_parallel_contexts)
- xbt_os_mutex_acquire(sync_req_vector);
- xbt_dynar_set_as(req_vector, req->issuer->pid, smx_req_t, req);
- if (_surf_parallel_contexts)
- xbt_os_mutex_release(sync_req_vector);
+ req_vector[req->issuer->pid] = req;
req->issuer->request = req;
DEBUG2("Yield process '%s' on request of type %d", req->issuer->name, req->call);
SIMIX_process_yield();
req->issuer->request = req;
DEBUG2("Yield process '%s' on request of type %d", req->issuer->name, req->call);
SIMIX_process_yield();
@@
-40,11
+34,13
@@
void SIMIX_request_push(smx_req_t req)
smx_req_t SIMIX_request_pop(void)
{
smx_req_t request = NULL;
smx_req_t SIMIX_request_pop(void)
{
smx_req_t request = NULL;
- while (xbt_dynar_length(req_vector)){
- request = xbt_dynar_pop_as(req_vector, smx_req_t);
- if (request)
+ int i;
+ for (i=1;i<SIMIX_process_get_maxpid();i++)
+ if (req_vector[i]) {
+ request = req_vector[i];
+ req_vector[i]=NULL;
break;
break;
- }
+
}
return request;
}
return request;
}
@@
-199,6
+195,7
@@
void SIMIX_request_pre(smx_req_t req)
break;
case REQ_PROCESS_CREATE:
break;
case REQ_PROCESS_CREATE:
+ req_vector = xbt_realloc(req_vector,sizeof(smx_req_t)*(SIMIX_process_get_maxpid()+2));
req->process_create.result = SIMIX_process_create(
req->process_create.name,
req->process_create.code,
req->process_create.result = SIMIX_process_create(
req->process_create.name,
req->process_create.code,
@@
-366,8
+363,13
@@
void SIMIX_request_pre(smx_req_t req)
SIMIX_request_answer(req);
break;
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;
SIMIX_request_answer(req);
break;