From a06e616da86a22a21a02fcc9ddaf192cecdef2bc Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 3 Mar 2010 16:15:08 +0000 Subject: [PATCH 1/1] bummer: I increased the amount of displayed info to track down an issue in ruby, but forgot to revert those changes, resulting in broken testsuites for others. Sorry git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7175 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/msg/task.c | 8 +++++++- src/simix/smx_network.c | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/msg/task.c b/src/msg/task.c index b14d7c8cab..8dd6016b3e 100644 --- a/src/msg/task.c +++ b/src/msg/task.c @@ -26,6 +26,10 @@ * message size and some private data. */ +#ifdef HAVE_RUBY /* FIXME: KILLME */ +XBT_LOG_EXTERNAL_CATEGORY(ruby); +#endif + /********************************* Task **************************************/ /** \ingroup m_task_management * \brief Creates a new #m_task_t. @@ -73,7 +77,9 @@ m_task_t MSG_task_create(const char *name, double compute_duration, simdata->comp_amount = NULL; simdata->comm_amount = NULL; - CINFO2(root,"Created task %p: %s",task,name); +#ifdef HAVE_RUBY /* FIXME: KILLME */ + CINFO2(ruby,"Created task %p: %s",task,name); +#endif return task; } diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index 1089d17dae..de7af8c0d9 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -339,11 +339,19 @@ void SIMIX_network_copy_data(smx_comm_t comm) if(buff_size == 0) return; +#ifdef HAVE_RUBY /* FIXME: KILLME */ INFO6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", - comm, - comm->src_proc->smx_host->name, comm->src_buff, - comm->dst_proc->smx_host->name, comm->dst_buff, - buff_size); + comm, + comm->src_proc->smx_host->name, comm->src_buff, + comm->dst_proc->smx_host->name, comm->dst_buff, + buff_size); +#else + DEBUG6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", + comm, + comm->src_proc->smx_host->name, comm->src_buff, + comm->dst_proc->smx_host->name, comm->dst_buff, + buff_size); +#endif memcpy(comm->dst_buff, comm->src_buff, buff_size); } -- 2.20.1