remove redundant Link Type

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 319a3e6..772f871 100644 (file)
--- a/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh
+++ b/examples/deprecated/msg/trace-process-migration/trace-process-migration.tesh
@@ -252,17 +252,16 @@ $ tail -n +3 procmig.trace
 > 5 11 7 send "0 0 1"
 > 5 12 7 execute "0 1 1"
 > 4 13 0 6 6 ACTOR_LINK
-> 4 14 0 6 6 ACTOR_TASK_LINK
 > 6 0.000000 33 6 1 "policeman-2"
 > 12 0.000000 7 32 9
-> 15 0.000000 14 0 SR 33 p0
+> 15 0.000000 13 0 SR 33 p0
 > 12 0.000000 7 33 11
 > 13 2.000000 7 32
 > 12 2.000000 7 32 10
 > 13 2.025708 7 33
-> 15 2.025708 14 0 SR 33 p1
+> 15 2.025708 13 0 SR 33 p1
 > 12 2.025708 7 33 11
-> 16 2.025708 14 0 SR 32 p0
+> 16 2.025708 13 0 SR 32 p0
 > 15 2.025708 13 0 M 32 0
 > 7 2.025708 6 32
 > 6 2.025708 34 6 1 "emigrant-1"
@@ -271,9 +270,9 @@ $ tail -n +3 procmig.trace
 > 13 4.025708 7 34
 > 12 4.025708 7 34 10
 > 13 4.025903 7 33
-> 15 4.025903 14 0 SR 33 p2
+> 15 4.025903 13 0 SR 33 p2
 > 12 4.025903 7 33 11
-> 16 4.025903 14 0 SR 34 p1
+> 16 4.025903 13 0 SR 34 p1
 > 15 4.025903 13 0 M 34 1
 > 7 4.025903 6 34
 > 6 4.025903 35 6 2 "emigrant-1"
@@ -282,9 +281,9 @@ $ tail -n +3 procmig.trace
 > 13 6.025903 7 35
 > 12 6.025903 7 35 10
 > 13 6.044918 7 33
-> 15 6.044918 14 0 SR 33 p3
+> 15 6.044918 13 0 SR 33 p3
 > 12 6.044918 7 33 11
-> 16 6.044918 14 0 SR 35 p2
+> 16 6.044918 13 0 SR 35 p2
 > 15 6.044918 13 0 M 35 2
 > 7 6.044918 6 35
 > 6 6.044918 36 6 3 "emigrant-1"
@@ -293,9 +292,9 @@ $ tail -n +3 procmig.trace
 > 13 8.044918 7 36
 > 12 8.044918 7 36 10
 > 13 8.070626 7 33
-> 15 8.070626 14 0 SR 33 p4
+> 15 8.070626 13 0 SR 33 p4
 > 12 8.070626 7 33 11
-> 16 8.070626 14 0 SR 36 p3
+> 16 8.070626 13 0 SR 36 p3
 > 15 8.070626 13 0 M 36 3
 > 7 8.070626 6 36
 > 6 8.070626 37 6 4 "emigrant-1"
@@ -304,9 +303,9 @@ $ tail -n +3 procmig.trace
 > 13 10.070626 7 37
 > 12 10.070626 7 37 10
 > 13 10.087178 7 33
-> 15 10.087178 14 0 SR 33 p5
+> 15 10.087178 13 0 SR 33 p5
 > 12 10.087178 7 33 11
-> 16 10.087178 14 0 SR 37 p4
+> 16 10.087178 13 0 SR 37 p4
 > 15 10.087178 13 0 M 37 4
 > 7 10.087178 6 37
 > 6 10.087178 38 6 5 "emigrant-1"
@@ -315,9 +314,9 @@ $ tail -n +3 procmig.trace
 > 13 12.087178 7 38
 > 12 12.087178 7 38 10
 > 13 12.112617 7 33
-> 15 12.112617 14 0 SR 33 p6
+> 15 12.112617 13 0 SR 33 p6
 > 12 12.112617 7 33 11
-> 16 12.112617 14 0 SR 38 p5
+> 16 12.112617 13 0 SR 38 p5
 > 15 12.112617 13 0 M 38 5
 > 7 12.112617 6 38
 > 6 12.112617 39 6 3 "emigrant-1"
@@ -326,9 +325,9 @@ $ tail -n +3 procmig.trace
 > 13 14.112617 7 39
 > 12 14.112617 7 39 10
 > 13 14.138325 7 33
-> 15 14.138325 14 0 SR 33 p7
+> 15 14.138325 13 0 SR 33 p7
 > 12 14.138325 7 33 11
-> 16 14.138325 14 0 SR 39 p6
+> 16 14.138325 13 0 SR 39 p6
 > 15 14.138325 13 0 M 39 6
 > 7 14.138325 6 39
 > 6 14.138325 40 6 1 "emigrant-1"
@@ -337,9 +336,9 @@ $ tail -n +3 procmig.trace
 > 13 16.138325 7 40
 > 12 16.138325 7 40 10
 > 13 16.138521 7 33
-> 15 16.138521 14 0 SR 33 p8
+> 15 16.138521 13 0 SR 33 p8
 > 12 16.138521 7 33 11
-> 16 16.138521 14 0 SR 40 p7
+> 16 16.138521 13 0 SR 40 p7
 > 15 16.138521 13 0 M 40 7
 > 7 16.138521 6 40
 > 6 16.138521 41 6 4 "emigrant-1"
@@ -348,7 +347,7 @@ $ tail -n +3 procmig.trace
 > 13 18.138521 7 41
 > 12 18.138521 7 41 10
 > 13 18.155073 7 33
-> 16 18.155073 14 0 SR 41 p8
+> 16 18.155073 13 0 SR 41 p8
 > 7 18.155073 6 33
 > 7 18.155073 6 41
 > 7 18.155073 2 16

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index 65b97d4..8885781 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -388,7 +388,6 @@ static void on_actor_creation(s4u::Actor const& actor)
   state->add_entity_value("send", "0 0 1");
   state->add_entity_value("execute", "0 1 1");
   root->type_->by_name_or_create("ACTOR_LINK", actor_type, actor_type);
-  root->type_->by_name_or_create("ACTOR_TASK_LINK", actor_type, actor_type);
 
   actor.on_exit([container_name](bool failed) {
     if (failed)

diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp
index 032624f..b2eefa8 100644 (file)
--- a/src/msg/msg_task.cpp
+++ b/src/msg/msg_task.cpp
@@ -105,7 +105,7 @@ s4u::CommPtr Task::send_async(const std::string& alias, void_f_pvoid_t cleanup,
   if (TRACE_actor_is_enabled()) {
     container_t process_container = instr::Container::by_name(instr_pid(*MSG_process_self()));
     std::string key               = std::string("p") + std::to_string(get_id());
-    instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key);
+    instr::Container::get_root()->get_link("ACTOR_LINK")->start_event(process_container, "SR", key);
   }
 
   /* Prepare the task to send */
@@ -576,7 +576,7 @@ msg_error_t MSG_task_receive_with_timeout_bounded(msg_task_t* task, const char*
     container_t process_container = simgrid::instr::Container::by_name(instr_pid(*MSG_process_self()));
 
     std::string key = std::string("p") + std::to_string((*task)->get_id());
-    simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->end_event(process_container, "SR", key);
+    simgrid::instr::Container::get_root()->get_link("ACTOR_LINK")->end_event(process_container, "SR", key);
   }
   return ret;
 }