From ceafdfd3fade791d6edba5f784685505691a60e6 Mon Sep 17 00:00:00 2001 From: schnorr Date: Mon, 13 Dec 2010 16:45:17 +0000 Subject: [PATCH] [trace] marking tracing/msg/volume:1 as deprecated details: - can be reincorporated if someone needs it git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9206 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/instr/instr_msg_task.c | 8 ++- src/instr/instr_msg_volume.c | 100 ++++++++++++++++++----------------- 2 files changed, 57 insertions(+), 51 deletions(-) diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c index a2d8f6c4e3..a27052c078 100644 --- a/src/instr/instr_msg_task.c +++ b/src/instr/instr_msg_task.c @@ -225,7 +225,9 @@ void TRACE_msg_task_get_end(double start_time, m_task_t task) if (TRACE_msg_task_is_enabled()) pajePopState(MSG_get_clock(), "task-state", name); - TRACE_msg_volume_finish(task); + if (TRACE_msg_volume_is_enabled()){ + TRACE_msg_volume_finish(task); + } TRACE_task_location(task); TRACE_task_location_present(task); @@ -251,7 +253,9 @@ int TRACE_msg_task_put_start(m_task_t task) if (TRACE_msg_task_is_enabled()) pajePushState(MSG_get_clock(), "task-state", name, "communicate"); - TRACE_msg_volume_start(task); + if (TRACE_msg_volume_is_enabled()){ + TRACE_msg_volume_start(task); + } //trace task location grouped by host TRACE_task_location_not_present(task); diff --git a/src/instr/instr_msg_volume.c b/src/instr/instr_msg_volume.c index 8067d86791..c8e1842dde 100644 --- a/src/instr/instr_msg_volume.c +++ b/src/instr/instr_msg_volume.c @@ -10,59 +10,61 @@ void TRACE_msg_volume_start(m_task_t task) { - m_process_t process = NULL; - m_host_t host = NULL; - char process_name[200], process_alias[200]; - char task_name[200]; - double volume = 0; - if (!TRACE_msg_volume_is_enabled()) - return; - - /* check if task is traced */ - if (!task->category) - return; - - /* check if process is traced */ - process = MSG_process_self(); - if (!process->category) - return; - - host = MSG_process_get_host(process); - TRACE_process_container(process, process_name, 200); - TRACE_process_alias_container(process, host, process_alias, 200); - TRACE_task_container(task, task_name, 200); - - volume = MSG_task_get_data_size(task); - - pajeStartLinkWithVolume(MSG_get_clock(), "volume", "0", task->category, - process_alias, task_name, volume); + xbt_die ("tracing/msg/volume:1 is deprecated."); +// m_process_t process = NULL; +// m_host_t host = NULL; +// char process_name[200], process_alias[200]; +// char task_name[200]; +// double volume = 0; +// if (!TRACE_msg_volume_is_enabled()) +// return; +// +// /* check if task is traced */ +// if (!task->category) +// return; +// +// /* check if process is traced */ +// process = MSG_process_self(); +// if (!process->category) +// return; +// +// host = MSG_process_get_host(process); +// TRACE_process_container(process, process_name, 200); +// TRACE_process_alias_container(process, host, process_alias, 200); +// TRACE_task_container(task, task_name, 200); +// +// volume = MSG_task_get_data_size(task); +// +// pajeStartLinkWithVolume(MSG_get_clock(), "volume", "0", task->category, +// process_alias, task_name, volume); } void TRACE_msg_volume_finish(m_task_t task) { - char process_name[200], process_alias[200]; - char task_name[200]; - m_process_t process = NULL; - m_host_t host = NULL; - if (!TRACE_msg_volume_is_enabled()) - return; - - /* check if task is traced */ - if (!task->category) - return; - - /* check if process is traced */ - process = MSG_process_self(); - if (!process->category) - return; - - host = MSG_process_get_host(process); - TRACE_process_container(process, process_name, 200); - TRACE_process_alias_container(process, host, process_alias, 200); - TRACE_task_container(task, task_name, 200); - - pajeEndLink(MSG_get_clock(), "volume", "0", task->category, - process_alias, task_name); + xbt_die ("tracing/msg/volume:1 is deprecated."); +// char process_name[200], process_alias[200]; +// char task_name[200]; +// m_process_t process = NULL; +// m_host_t host = NULL; +// if (!TRACE_msg_volume_is_enabled()) +// return; +// +// /* check if task is traced */ +// if (!task->category) +// return; +// +// /* check if process is traced */ +// process = MSG_process_self(); +// if (!process->category) +// return; +// +// host = MSG_process_get_host(process); +// TRACE_process_container(process, process_name, 200); +// TRACE_process_alias_container(process, host, process_alias, 200); +// TRACE_task_container(task, task_name, 200); +// +// pajeEndLink(MSG_get_clock(), "volume", "0", task->category, +// process_alias, task_name); } #endif /* HAVE_TRACING */ -- 2.20.1