A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix (#220) ?
[simgrid.git]
/
src
/
kernel
/
activity
/
ActivityImpl.cpp
diff --git
a/src/kernel/activity/ActivityImpl.cpp
b/src/kernel/activity/ActivityImpl.cpp
index
c732b28
..
1cb313a
100644
(file)
--- a/
src/kernel/activity/ActivityImpl.cpp
+++ b/
src/kernel/activity/ActivityImpl.cpp
@@
-1,43
+1,55
@@
-/* Copyright (c) 2007-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
9
. 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"
/* 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_DEFAULT_CATEGORY(simix_process);
+
namespace simgrid {
namespace kernel {
namespace activity {
namespace simgrid {
namespace kernel {
namespace activity {
-ActivityImpl::ActivityImpl() = default;
-ActivityImpl::~ActivityImpl() = default;
+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::re
f
()
+void ActivityImpl::re
sume
()
{
{
- // Atomic operation! Do not split in two instructions!
- xbt_assert(refcount_ != 0);
- 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 ActivityImpl::
unref(
)
+void ActivityImpl::
set_category(std::string category
)
{
{
- 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;
+ if (surf_action_)
+ surf_action_->set_category(std::move(category));
}
// boost::intrusive_ptr<Activity> support:
void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
{
}
// boost::intrusive_ptr<Activity> support:
void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity)
{
- activity->ref
(
);
+ activity->ref
count_.fetch_add(1, std::memory_order_relaxed
);
}
void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity)
{
}
void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity)
{
- activity->unref();
+ 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::
}
}
} // namespace simgrid::kernel::activity::