make more sense

[simgrid.git] / src / kernel / activity / ActivityImpl.cpp

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index 6a9b6e8..5454050 100644 (file)
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -1,39 +1,76 @@
-/* Copyright (c) 2007-2017. 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"
 
-XBT_LOG_EXTERNAL_CATEGORY(simix_process);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-ActivityImpl::ActivityImpl()  = default;
-ActivityImpl::~ActivityImpl() = default;
+ActivityImpl::~ActivityImpl()
+{
+  clean_action();
+  XBT_DEBUG("Destroy activity %p", this);
+}
+
+void ActivityImpl::clean_action()
+{
+  if (surf_action_) {
+    surf_action_->unref();
+    surf_action_ = nullptr;
+  }
+}
+
+double ActivityImpl::get_remaining() const
+{
+  return surf_action_ ? surf_action_->get_remains() : 0;
+}
+
+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 ActivityImpl::resume()
+{
+  if (surf_action_ == nullptr)
+    return;
+  XBT_VERB("This activity is resumed (remain: %f)", surf_action_->get_remains());
+  surf_action_->resume();
+  on_resumed(*this);
+}
+
+void ActivityImpl::cancel()
+{
+  XBT_VERB("Activity %p is canceled", this);
+  if (surf_action_ != nullptr)
+    surf_action_->cancel();
+  state_ = SIMIX_CANCELED;
+}
 
 // boost::intrusive_ptr<Activity> support:
 void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
 {
-  xbt_assert(activity->refcount_ >= 0);
-  activity->refcount_++;
-  XBT_CDEBUG(simix_process, "%p->refcount++ ~> %d", activity, (int)activity->refcount_);
-  if (XBT_LOG_ISENABLED(simix_process, xbt_log_priority_trace))
-    xbt_backtrace_display_current();
+  activity->refcount_.fetch_add(1, std::memory_order_relaxed);
 }
 
 void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity)
 {
-  XBT_CDEBUG(simix_process, "%p->refcount-- ~> %d", activity, ((int)activity->refcount_) - 1);
-  xbt_assert(activity->refcount_ >= 0);
-  activity->refcount_--;
-  if (XBT_LOG_ISENABLED(simix_process, xbt_log_priority_trace))
-    xbt_backtrace_display_current();
-  if (activity->refcount_ <= 0)
+  if (activity->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
+    std::atomic_thread_fence(std::memory_order_acquire);
     delete activity;
+  }
 }
+xbt::signal<void(ActivityImpl const&)> ActivityImpl::on_resumed;
+xbt::signal<void(ActivityImpl const&)> ActivityImpl::on_suspended;
 }
 }
 } // namespace simgrid::kernel::activity::