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

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 1757126256..dba9a7af7f 100644
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
@@ -19,43 +19,25 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
-  XBT_PUBLIC_CLASS ActivityImpl {
-  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
-
-    // boost::intrusive_ptr<Activity> support:
-    friend void intrusive_ptr_add_ref(ActivityImpl * activity)
-    {
-      // Atomic operation! Do not split in two instructions!
-      XBT_ATTRIB_UNUSED auto previous = (activity->refcount_)++;
-      xbt_assert(previous != 0);
-    }
-
-    friend void intrusive_ptr_release(ActivityImpl * activity)
-    {
-      // Atomic operation! Do not split in two instructions!
-      auto count = --(activity->refcount_);
-      if (count == 0)
-        delete activity;
-    }
-
-    /** @brief Increase the refcount */
-    void ref();
-    /** @brief Reduce the refcount; returns true if the object was destroyed */
-    bool unref();
-
-  private:
-    std::atomic_int_fast32_t refcount_{1};
-    int refcount = 1;
-  };
+class XBT_PUBLIC ActivityImpl {
+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
+
+  // 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};
+};
 }}} // namespace simgrid::kernel::activity
 
 #endif /* SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP */