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
new function: remove a given element of the xbt_heap
[simgrid.git]
/
src
/
smpi
/
smpi_base.c
diff --git
a/src/smpi/smpi_base.c
b/src/smpi/smpi_base.c
index
768b13b
..
c75e51d
100644
(file)
--- a/
src/smpi/smpi_base.c
+++ b/
src/smpi/smpi_base.c
@@
-250,10
+250,8
@@
static MPI_Request build_request(void *buf, int count,
else
request->refcount = 0;
request->op = MPI_REPLACE;
else
request->refcount = 0;
request->op = MPI_REPLACE;
-#ifdef HAVE_TRACING
request->send = 0;
request->recv = 0;
request->send = 0;
request->recv = 0;
-#endif
if (flags & SEND) smpi_datatype_unuse(datatype);
return request;
if (flags & SEND) smpi_datatype_unuse(datatype);
return request;
@@
-402,12
+400,10
@@
void smpi_mpi_start(MPI_Request request)
int receiver = request->dst;
int receiver = request->dst;
- #ifdef HAVE_TRACING
- int rank = request->src;
- if (TRACE_smpi_view_internals()) {
- TRACE_smpi_send(rank, rank, receiver,request->size);
- }
- #endif
+ int rank = request->src;
+ if (TRACE_smpi_view_internals()) {
+ TRACE_smpi_send(rank, rank, receiver,request->size);
+ }
print_request("New send", request);
//if we are giving back the control to the user without waiting for completion, we have to inject timings
print_request("New send", request);
//if we are giving back the control to the user without waiting for completion, we have to inject timings
@@
-460,11
+456,11
@@
void smpi_mpi_start(MPI_Request request)
oldbuf = request->buf;
if (!smpi_process_get_replaying() && oldbuf && request->size!=0){
if((smpi_privatize_global_variables)
oldbuf = request->buf;
if (!smpi_process_get_replaying() && oldbuf && request->size!=0){
if((smpi_privatize_global_variables)
-
&& ((char*)request->buf >=
start_data_exe)
-
&& ((char*)request->buf < start_data_exe +
size_data_exe )){
+
&& ((char*) request->buf >= smpi_
start_data_exe)
+
&& ((char*)request->buf < smpi_start_data_exe + smpi_
size_data_exe )){
XBT_DEBUG("Privatization : We are sending from a zone inside global memory. Switch data segment ");
XBT_DEBUG("Privatization : We are sending from a zone inside global memory. Switch data segment ");
-
smpi_switch_data_segment(request->src);
- }
+ smpi_switch_data_segment(request->src);
+
}
buf = xbt_malloc(request->size);
memcpy(buf,oldbuf,request->size);
XBT_DEBUG("buf %p copied into %p",oldbuf,buf);
buf = xbt_malloc(request->size);
memcpy(buf,oldbuf,request->size);
XBT_DEBUG("buf %p copied into %p",oldbuf,buf);
@@
-490,12
+486,10
@@
void smpi_mpi_start(MPI_Request request)
-#ifdef HAVE_TRACING
/* FIXME: detached sends are not traceable (request->action == NULL) */
if (request->action)
/* FIXME: detached sends are not traceable (request->action == NULL) */
if (request->action)
- simcall_set_category(request->action, TRACE_internal_smpi_get_category());
+
simcall_set_category(request->action, TRACE_internal_smpi_get_category());
-#endif
xbt_mutex_release(mut);
}
xbt_mutex_release(mut);
}
@@
-700,8
+694,8
@@
static void finish_wait(MPI_Request * request, MPI_Status * status)
if((req->flags & ACCUMULATE) || (datatype->has_subtype == 1)){
if (!smpi_process_get_replaying()){
if( smpi_privatize_global_variables
if((req->flags & ACCUMULATE) || (datatype->has_subtype == 1)){
if (!smpi_process_get_replaying()){
if( smpi_privatize_global_variables
- && ((char*)req->old_buf >= start_data_exe)
- && ((char*)req->old_buf < s
tart_data_exe +
size_data_exe )
+ && ((char*)req->old_buf >= s
mpi_s
tart_data_exe)
+ && ((char*)req->old_buf < s
mpi_start_data_exe + smpi_
size_data_exe )
){
XBT_VERB("Privatization : We are unserializing to a zone in global memory - Switch data segment ");
smpi_switch_data_segment(smpi_process_index());
){
XBT_VERB("Privatization : We are unserializing to a zone in global memory - Switch data segment ");
smpi_switch_data_segment(smpi_process_index());
@@
-725,7
+719,6
@@
static void finish_wait(MPI_Request * request, MPI_Status * status)
}
}
-#ifdef HAVE_TRACING
if (TRACE_smpi_view_internals()) {
if(req->flags & RECV){
int rank = smpi_process_index();
if (TRACE_smpi_view_internals()) {
if(req->flags & RECV){
int rank = smpi_process_index();
@@
-733,7
+726,6
@@
static void finish_wait(MPI_Request * request, MPI_Status * status)
TRACE_smpi_recv(rank, src_traced, rank);
}
}
TRACE_smpi_recv(rank, src_traced, rank);
}
}
-#endif
if(req->detached_sender!=NULL){
smpi_mpi_request_free(&(req->detached_sender));
if(req->detached_sender!=NULL){
smpi_mpi_request_free(&(req->detached_sender));