X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/940de22d7f2af82d58be3e886e6bc22608b4d8ec..aab9761d35114bb58504304214cdf4d11d9a325e:/src/kernel/activity/ActivityImpl.hpp

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index dba9a7af7f..8fdd778157 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 {
@@ -20,24 +21,35 @@ namespace kernel {
 namespace activity {
 
 class XBT_PUBLIC ActivityImpl {
+  std::atomic_int_fast32_t refcount_{0};
+  std::string name_; /* Activity name if any */
 public:
-  ActivityImpl();
   virtual ~ActivityImpl();
-  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 */
-
-  virtual void suspend() = 0;
-  virtual void resume()  = 0;
-  virtual void post()    = 0; // What to do when a simcall terminates
+  ActivityImpl() = default;
+  explicit ActivityImpl(const std::string& name) : name_(name) {}
+  e_smx_state_t state_ = SIMIX_WAITING; /* State of the activity */
+  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(); }
+  void set_name(const std::string& name) { name_ = name; }
+  void set_category(const std::string& category);
+
+  virtual void suspend();
+  virtual void resume();
+  virtual void post()   = 0; // What to do when a simcall terminates
+  virtual void finish() = 0;
 
   // boost::intrusive_ptr<ActivityImpl> support:
   friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
   friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);
 
-private:
-  std::atomic_int_fast32_t refcount_{0};
+  static xbt::signal<void(ActivityImpl const&)> on_suspended;
+  static xbt::signal<void(ActivityImpl const&)> on_resumed;
 };
-}}} // namespace simgrid::kernel::activity
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
 
 #endif /* SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP */