X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a00610e05eab122e23f56b589d5bb240e6ceda7..5fa46b25d81881c427ca3233a43ce12aad4a0242:/src/kernel/activity/ActivityImpl.cpp

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index 986e7c5475..757667bb15 100644
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -1,30 +1,64 @@
-/* Copyright (c) 2007-2016. 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. */
 
 #include "src/kernel/activity/ActivityImpl.hpp"
 
-simgrid::kernel::activity::ActivityImpl::ActivityImpl()
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
+
+namespace simgrid {
+namespace kernel {
+namespace activity {
+
+ActivityImpl::~ActivityImpl()
 {
+  if (surf_action_) {
+    surf_action_->unref();
+    XBT_DEBUG("Destroy activity %p", this);
+    surf_action_ = nullptr;
+  }
 }
 
-simgrid::kernel::activity::ActivityImpl::~ActivityImpl()
+void ActivityImpl::suspend()
 {
+  if (surf_action_ == nullptr)
+    return;
+  XBT_VERB("This activity is suspended (remain: %f)", surf_action_->get_remains());
+  surf_action_->suspend();
+  on_suspended(this);
 }
 
-void simgrid::kernel::activity::ActivityImpl::ref()
+void ActivityImpl::resume()
 {
-  refcount++;
+  if (surf_action_ == nullptr)
+    return;
+  XBT_VERB("This activity is resumed (remain: %f)", surf_action_->get_remains());
+  surf_action_->resume();
+  on_resumed(this);
 }
 
-void simgrid::kernel::activity::ActivityImpl::unref()
+void ActivityImpl::set_category(const std::string& category)
 {
-  xbt_assert(refcount > 0,
-      "This activity has a negative refcount! You can only call test() or wait() once per activity.");
+  if (surf_action_)
+    surf_action_->set_category(category);
+}
 
-  refcount--;
-  if (refcount>0)
-    return;
-  delete this;
+// boost::intrusive_ptr<Activity> support:
+void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
+{
+  activity->refcount_.fetch_add(1, std::memory_order_relaxed);
+}
+
+void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity)
+{
+  if (activity->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
+    std::atomic_thread_fence(std::memory_order_acquire);
+    delete activity;
+  }
+}
+xbt::signal<void(ActivityImplPtr)> ActivityImpl::on_resumed;
+xbt::signal<void(ActivityImplPtr)> ActivityImpl::on_suspended;
+}
 }
+} // namespace simgrid::kernel::activity::