From 1b47d369792c9dcc53eb1212353fe944cb697201 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 27 Dec 2011 00:30:51 +0100 Subject: [PATCH] cleanup the debug messages --- examples/smpi/dsend.c | 4 +++- src/simix/smx_network.c | 6 ++---- src/smpi/smpi_base.c | 10 ++-------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/examples/smpi/dsend.c b/examples/smpi/dsend.c index f7bc825cb3..674aa819fe 100644 --- a/examples/smpi/dsend.c +++ b/examples/smpi/dsend.c @@ -8,6 +8,8 @@ #include #include +XBT_LOG_NEW_DEFAULT_CATEGORY(dsend,"the dsend test"); + int main(int argc, char *argv[]) { int rank; int data=11; @@ -27,7 +29,7 @@ int main(int argc, char *argv[]) { } } - printf("rank %d: data exchanged\n", rank); + XBT_INFO("rank %d: data exchanged", rank); MPI_Finalize(); return 0; } diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index c359576d6f..e10c1cdd10 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -407,15 +407,12 @@ void SIMIX_pre_comm_wait(smx_req_t req, smx_action_t action, double timeout, int SIMIX_comm_finish(action); return; } - XBT_INFO("Comm_wait. state:%d; I'm %s",action->state, - req->issuer == action->comm.src_proc?"sender":"receiver"); /* If the action has already finish perform the error handling, */ /* otherwise set up a waiting timeout on the right side */ 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 */ - XBT_INFO("Not done, we need a sleep action"); sleep = surf_workstation_model->extension.workstation.sleep(req->issuer->smx_host->host, timeout); surf_workstation_model->action_data_set(sleep, action); @@ -877,12 +874,13 @@ void SIMIX_comm_copy_pointer_callback(smx_action_t comm, size_t buff_size) void SIMIX_comm_copy_buffer_callback(smx_action_t comm, size_t buff_size) { + XBT_DEBUG("Copy the data over"); memcpy(comm->comm.dst_buff, comm->comm.src_buff, buff_size); } void smpi_comm_copy_data_callback(smx_action_t comm, size_t buff_size) { - XBT_INFO("Copy the data over"); + XBT_DEBUG("Copy the data over"); memcpy(comm->comm.dst_buff, comm->comm.src_buff, buff_size); if (comm->comm.detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the original buffer available to the application ASAP comm->comm.clean_fun(comm->comm.src_buff); diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c index 51b0d9afff..8a02def723 100644 --- a/src/smpi/smpi_base.c +++ b/src/smpi/smpi_base.c @@ -84,12 +84,6 @@ MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, return request; } -static void myfree(void *d) { - xbt_backtrace_display_current(); - XBT_INFO("myfree called on %p",d); - free(d); -} - void smpi_mpi_start(MPI_Request request) { smx_rdv_t mailbox; @@ -113,14 +107,14 @@ void smpi_mpi_start(MPI_Request request) detached = 1; request->buf = malloc(request->size); memcpy(request->buf,oldbuf,request->size); - XBT_INFO("Send request %p is detached; buf %p copied into %p",request,oldbuf,request->buf); + XBT_DEBUG("Send request %p is detached; buf %p copied into %p",request,oldbuf,request->buf); } else { XBT_DEBUG("Send request %p is not detached (buf: %p)",request,request->buf); } request->action = SIMIX_req_comm_isend(mailbox, request->size, -1.0, request->buf, request->size, - &match_send,myfree, // cleanup using a simple free() FIXME: that may not be sufficient + &match_send,free, // a simple free is used to free the buffer request, // detach if msg size < eager/rdv switch limit detached); -- 2.20.1