X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2ef59b0adb027b30c217be9b19ee418841aa7885..60a27a0410114e3ad562913b49aa362643fb2237:/src/kernel/activity/ActivityImpl.hpp

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 31b4b4b843..70e4b5943b 100644
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -13,6 +13,7 @@
 #include "simgrid/forward.h"
 
 #include <atomic>
+#include <simgrid/kernel/resource/Action.hpp>
 #include <simgrid/simix.hpp>
 
 namespace simgrid {
@@ -21,16 +22,21 @@ namespace activity {
 
 class XBT_PUBLIC ActivityImpl {
 public:
-  ActivityImpl();
-  explicit ActivityImpl(std::string name) : name_(name) {}
-  virtual ~ActivityImpl();
+  ActivityImpl() = default;
+  explicit ActivityImpl(std::string name) : name_(std::move(name)) {}
+  virtual ~ActivityImpl() = default;
   e_smx_state_t state_ = SIMIX_WAITING; /* State of the activity */
-  std::string name_;                    /* Activity name if any */
   std::list<smx_simcall_t> simcalls_;   /* List of simcalls waiting for this activity */
+  resource::Action* surf_action_ = nullptr;
+
+  const std::string& get_name() const { return name_; }
+  const char* get_cname() const { return name_.c_str(); }
 
-  virtual void suspend() = 0;
-  virtual void resume()  = 0;
-  virtual void post()    = 0; // What to do when a simcall terminates
+  virtual void suspend();
+  virtual void resume();
+  virtual void post()   = 0; // What to do when a simcall terminates
+  virtual void finish() = 0;
+  void set_category(std::string category);
 
   // boost::intrusive_ptr<ActivityImpl> support:
   friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
@@ -38,6 +44,11 @@ public:
 
 private:
   std::atomic_int_fast32_t refcount_{0};
+  std::string name_;                    /* Activity name if any */
+
+public:
+  static simgrid::xbt::signal<void(ActivityImplPtr)> on_suspended;
+  static simgrid::xbt::signal<void(ActivityImplPtr)> on_resumed;
 };
 }}} // namespace simgrid::kernel::activity