From f120b00046c94743c9cbf8f28edd76da9426e40c Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Sun, 3 Feb 2019 16:42:01 +0100
Subject: [PATCH] allow all activities to set their tracing category

---
 src/kernel/activity/ActivityImpl.cpp | 6 ++++++
 src/kernel/activity/ActivityImpl.hpp | 3 +++
 src/kernel/activity/ExecImpl.cpp     | 6 ------
 src/kernel/activity/ExecImpl.hpp     | 1 -
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index ff1cb4ba9b..a92efa275f 100644
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -9,6 +9,12 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
+void simgrid::kernel::activity::ActivityImpl::set_category(std::string category)
+{
+  if (surf_action_)
+    surf_action_->set_category(category);
+}
+
 // boost::intrusive_ptr<Activity> support:
 void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
 {
diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 5668b7ae0a..7b8f091a81 100644
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -13,6 +13,7 @@
 #include "simgrid/forward.h"
 
 #include <atomic>
+#include <simgrid/kernel/resource/Action.hpp>
 #include <simgrid/simix.hpp>
 
 namespace simgrid {
@@ -33,6 +34,8 @@ public:
   virtual void resume()  = 0;
   virtual void post()    = 0; // What to do when a simcall terminates
 
+  void set_category(std::string category);
+
   // boost::intrusive_ptr<ActivityImpl> support:
   friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
   friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);
diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index 8e5fd996f0..edf9d2e140 100644
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -101,12 +101,6 @@ void simgrid::kernel::activity::ExecImpl::set_priority(double priority)
     surf_action_->set_priority(priority);
 }
 
-void simgrid::kernel::activity::ExecImpl::set_category(std::string category)
-{
-  if (surf_action_)
-    surf_action_->set_category(category);
-}
-
 void simgrid::kernel::activity::ExecImpl::post()
 {
   if (host_ && host_->is_off()) { /* FIXME: handle resource failure for parallel tasks too */
diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index 4ed1ab7e76..0e6b57ef35 100644
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -28,7 +28,6 @@ public:
   double get_remaining_ratio();
   void set_bound(double bound);
   void set_priority(double priority);
-  void set_category(std::string category);
   virtual ActivityImpl* migrate(s4u::Host* to);
 
   /* The host where the execution takes place. nullptr means this is a parallel exec (and only surf knows the hosts) */
-- 
2.20.1