From 91afa8c7dc4dcdb07f4bb1efc0a88c2ffe5dfa23 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 28 Mar 2018 14:07:56 +0200 Subject: [PATCH 1/1] Return value is useless (always 1). --- src/msg/instr_msg_task.cpp | 4 +--- src/msg/msg_gos.cpp | 10 ++++------ src/msg/msg_private.hpp | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp index 4a3cd09bd8..c7d77c1726 100644 --- a/src/msg/instr_msg_task.cpp +++ b/src/msg/instr_msg_task.cpp @@ -95,7 +95,7 @@ void TRACE_msg_task_get_end(msg_task_t task) } /* MSG_task_put related functions */ -int TRACE_msg_task_put_start(msg_task_t task) +void TRACE_msg_task_put_start(msg_task_t task) { XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category); @@ -106,8 +106,6 @@ int TRACE_msg_task_put_start(msg_task_t task) std::string key = std::string("p") + std::to_string(task->counter); simgrid::instr::Container::getRoot()->getLink("ACTOR_TASK_LINK")->startEvent(process_container, "SR", key); } - - return 1; } void TRACE_msg_task_put_end() diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index 70cc9d4536..ed37ad07c4 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -314,7 +314,7 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* al simdata_task_t t_simdata = nullptr; msg_process_t myself = MSG_process_self(); simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(alias); - int call_end = TRACE_msg_task_put_start(task); + TRACE_msg_task_put_start(task); /* Prepare the task to send */ t_simdata = task->simdata; @@ -337,8 +337,7 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* al if (TRACE_is_enabled()) simcall_set_category(act, task->category); - if (call_end) - TRACE_msg_task_put_end(); + TRACE_msg_task_put_end(); return comm; } @@ -780,7 +779,7 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl msg_process_t process = MSG_process_self(); simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(alias); - int call_end = TRACE_msg_task_put_start(task); + TRACE_msg_task_put_start(task); /* Prepare the task to send */ t_simdata = task->simdata; @@ -821,8 +820,7 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl t_simdata->setNotUsed(); } - if (call_end) - TRACE_msg_task_put_end(); + TRACE_msg_task_put_end(); return ret; } diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index 89346d1a58..78865143ee 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -104,7 +104,7 @@ XBT_PRIVATE void TRACE_msg_task_execute_end(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_destroy(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_get_end(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_get_start(); -XBT_PRIVATE int TRACE_msg_task_put_start(msg_task_t task); // returns TRUE if the task_put_end must be called +XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_put_end(); /* declaration of instrumentation functions from msg_process_instr.c */ -- 2.20.1