From f311cfc67e8d79bdb3307fb7e4775b94c69cb292 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 21 Feb 2019 21:36:20 +0100 Subject: [PATCH] remove useless code this is handled by callbacks in instr-platform now --- src/msg/instr_msg_task.cpp | 17 ----------------- src/msg/msg_gos.cpp | 2 -- src/msg/msg_private.hpp | 2 -- 3 files changed, 21 deletions(-) diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp index ef23c1c780..5a5df88bf8 100644 --- a/src/msg/instr_msg_task.cpp +++ b/src/msg/instr_msg_task.cpp @@ -29,21 +29,12 @@ void TRACE_msg_set_task_category(msg_task_t task, const char *category) } } -void TRACE_msg_task_get_start() -{ - XBT_DEBUG("GET,in"); - - if (TRACE_actor_is_enabled()) - simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->push_event("receive"); -} - void TRACE_msg_task_get_end(msg_task_t task) { XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category); if (TRACE_actor_is_enabled()) { container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self())); - process_container->get_state("ACTOR_STATE")->pop_event(); std::string key = std::string("p") + std::to_string(task->counter); simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->end_event(process_container, "SR", key); @@ -61,11 +52,3 @@ void TRACE_msg_task_put_start(msg_task_t task) simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key); } } - -void TRACE_msg_task_put_end() -{ - XBT_DEBUG("PUT,out"); - - if (TRACE_actor_is_enabled()) - simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->pop_event(); -} diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index 7a80ef3539..04a9e01f09 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -306,8 +306,6 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* al if (TRACE_is_enabled() && task->category != nullptr) simgrid::simix::simcall([comm, task] { comm->get_impl()->set_category(task->category); }); - TRACE_msg_task_put_end(); - return msg_comm; } diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index 31734b6010..e12dacb295 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -85,9 +85,7 @@ XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommIm /* declaration of instrumentation functions from msg_task_instr.c */ XBT_PRIVATE void TRACE_msg_set_task_category(msg_task_t task, const char* category); XBT_PRIVATE void TRACE_msg_task_get_end(msg_task_t task); -XBT_PRIVATE void TRACE_msg_task_get_start(); XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task); -XBT_PRIVATE void TRACE_msg_task_put_end(); inline void s_simdata_task_t::setUsed() -- 2.20.1