Merge branch 'master' of https://framagit.org/simgrid/simgrid

diff --git a/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh b/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh
index de1dec3..0c3ab46 100644 (file)
--- a/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh
+++ b/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh
@@ -262,7 +262,6 @@ $ tail -n +3 procmig.trace
 > 13 2.025708 7 33
 > 15 2.025708 14 0 SR 33 p1
 > 12 2.025708 7 33 11
-> 13 2.025708 7 32
 > 16 2.025708 14 0 SR 32 p0
 > 15 2.025708 13 0 M 32 0
 > 7 2.025708 6 32
@@ -274,7 +273,6 @@ $ tail -n +3 procmig.trace
 > 13 4.025903 7 33
 > 15 4.025903 14 0 SR 33 p2
 > 12 4.025903 7 33 11
-> 13 4.025903 7 34
 > 16 4.025903 14 0 SR 34 p1
 > 15 4.025903 13 0 M 34 1
 > 7 4.025903 6 34
@@ -286,7 +284,6 @@ $ tail -n +3 procmig.trace
 > 13 6.044918 7 33
 > 15 6.044918 14 0 SR 33 p3
 > 12 6.044918 7 33 11
-> 13 6.044918 7 35
 > 16 6.044918 14 0 SR 35 p2
 > 15 6.044918 13 0 M 35 2
 > 7 6.044918 6 35
@@ -298,7 +295,6 @@ $ tail -n +3 procmig.trace
 > 13 8.070626 7 33
 > 15 8.070626 14 0 SR 33 p4
 > 12 8.070626 7 33 11
-> 13 8.070626 7 36
 > 16 8.070626 14 0 SR 36 p3
 > 15 8.070626 13 0 M 36 3
 > 7 8.070626 6 36
@@ -310,7 +306,6 @@ $ tail -n +3 procmig.trace
 > 13 10.087178 7 33
 > 15 10.087178 14 0 SR 33 p5
 > 12 10.087178 7 33 11
-> 13 10.087178 7 37
 > 16 10.087178 14 0 SR 37 p4
 > 15 10.087178 13 0 M 37 4
 > 7 10.087178 6 37
@@ -322,7 +317,6 @@ $ tail -n +3 procmig.trace
 > 13 12.112617 7 33
 > 15 12.112617 14 0 SR 33 p6
 > 12 12.112617 7 33 11
-> 13 12.112617 7 38
 > 16 12.112617 14 0 SR 38 p5
 > 15 12.112617 13 0 M 38 5
 > 7 12.112617 6 38
@@ -334,7 +328,6 @@ $ tail -n +3 procmig.trace
 > 13 14.138325 7 33
 > 15 14.138325 14 0 SR 33 p7
 > 12 14.138325 7 33 11
-> 13 14.138325 7 39
 > 16 14.138325 14 0 SR 39 p6
 > 15 14.138325 13 0 M 39 6
 > 7 14.138325 6 39
@@ -346,7 +339,6 @@ $ tail -n +3 procmig.trace
 > 13 16.138521 7 33
 > 15 16.138521 14 0 SR 33 p8
 > 12 16.138521 7 33 11
-> 13 16.138521 7 40
 > 16 16.138521 14 0 SR 40 p7
 > 15 16.138521 13 0 M 40 7
 > 7 16.138521 6 40
@@ -356,7 +348,6 @@ $ tail -n +3 procmig.trace
 > 13 18.138521 7 41
 > 12 18.138521 7 41 10
 > 13 18.155073 7 33
-> 13 18.155073 7 41
 > 16 18.155073 14 0 SR 41 p8
 > 7 18.155073 6 33
 > 7 18.155073 6 41

diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp
index ef23c1c..5a5df88 100644 (file)
--- 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 883360f..9573554 100644 (file)
--- 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 31734b6..e12dacb 100644 (file)
--- 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()