first attempt (ongoing WIP)

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

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index e6723849ac1f42694db31771765a855d25567963..c732b28eea9b320f16afb1a976e49744386d1992 100644 (file)
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -1,25 +1,43 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2017. 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() = default;
-simgrid::kernel::activity::ActivityImpl::~ActivityImpl() = default;
+namespace simgrid {
+namespace kernel {
+namespace activity {
 
-void simgrid::kernel::activity::ActivityImpl::ref()
+ActivityImpl::ActivityImpl()  = default;
+ActivityImpl::~ActivityImpl() = default;
+
+void ActivityImpl::ref()
+{
+  // Atomic operation! Do not split in two instructions!
+  xbt_assert(refcount_ != 0);
+  refcount_++;
+}
+
+void ActivityImpl::unref()
 {
-  refcount++;
+  xbt_assert(refcount_ > 0,
+             "This activity has a negative refcount! You can only call test() or wait() once per activity.");
+  refcount_--;
+  if (refcount_ == 0)
+    delete this;
 }
 
-void simgrid::kernel::activity::ActivityImpl::unref()
+// boost::intrusive_ptr<Activity> support:
+void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
 {
-  xbt_assert(refcount > 0,
-      "This activity has a negative refcount! You can only call test() or wait() once per activity.");
+  activity->ref();
+}
 
-  refcount--;
-  if (refcount>0)
-    return;
-  delete this;
+void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity)
+{
+  activity->unref();
+}
+}
 }
+} // namespace simgrid::kernel::activity::