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
Revert "We never use the name of the mailbox"
[simgrid.git]
/
src
/
simix
/
BoostContext.cpp
diff --git
a/src/simix/BoostContext.cpp
b/src/simix/BoostContext.cpp
index
3b4e63f
..
241ecc3
100644
(file)
--- a/
src/simix/BoostContext.cpp
+++ b/
src/simix/BoostContext.cpp
@@
-38,7
+38,7
@@
public:
void resume();
};
void resume();
};
-#if
def
HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
class BoostParallelContext : public BoostContext {
public:
BoostParallelContext(std::function<void()> code,
class BoostParallelContext : public BoostContext {
public:
BoostParallelContext(std::function<void()> code,
@@
-55,7
+55,7
@@
public:
bool BoostContext::parallel_ = false;
xbt_parmap_t BoostContext::parmap_ = nullptr;
bool BoostContext::parallel_ = false;
xbt_parmap_t BoostContext::parmap_ = nullptr;
-u
nsigned long
BoostContext::threads_working_ = 0;
+u
intptr_t
BoostContext::threads_working_ = 0;
xbt_os_thread_key_t BoostContext::worker_id_key_;
unsigned long BoostContext::process_index_ = 0;
BoostContext* BoostContext::maestro_context_ = nullptr;
xbt_os_thread_key_t BoostContext::worker_id_key_;
unsigned long BoostContext::process_index_ = 0;
BoostContext* BoostContext::maestro_context_ = nullptr;
@@
-66,7
+66,7
@@
BoostContextFactory::BoostContextFactory()
{
BoostContext::parallel_ = SIMIX_context_is_parallel();
if (BoostContext::parallel_) {
{
BoostContext::parallel_ = SIMIX_context_is_parallel();
if (BoostContext::parallel_) {
-#if
ndef
HAVE_THREAD_CONTEXTS
+#if
!
HAVE_THREAD_CONTEXTS
xbt_die("No thread support for parallel context execution");
#else
int nthreads = SIMIX_context_get_nthreads();
xbt_die("No thread support for parallel context execution");
#else
int nthreads = SIMIX_context_get_nthreads();
@@
-81,7
+81,7
@@
BoostContextFactory::BoostContextFactory()
BoostContextFactory::~BoostContextFactory()
{
BoostContextFactory::~BoostContextFactory()
{
-#if
def
HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
if (BoostContext::parmap_) {
xbt_parmap_destroy(BoostContext::parmap_);
BoostContext::parmap_ = nullptr;
if (BoostContext::parmap_) {
xbt_parmap_destroy(BoostContext::parmap_);
BoostContext::parmap_ = nullptr;
@@
-95,7
+95,7
@@
smx_context_t BoostContextFactory::create_context(std::function<void()> code,
{
BoostContext* context = nullptr;
if (BoostContext::parallel_)
{
BoostContext* context = nullptr;
if (BoostContext::parallel_)
-#if
def
HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
context = this->new_context<BoostParallelContext>(
std::move(code), cleanup_func, process);
#else
context = this->new_context<BoostParallelContext>(
std::move(code), cleanup_func, process);
#else
@@
-109,7
+109,7
@@
smx_context_t BoostContextFactory::create_context(std::function<void()> code,
void BoostContextFactory::run_all()
{
void BoostContextFactory::run_all()
{
-#if
def
HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
if (BoostContext::parallel_) {
BoostContext::threads_working_ = 0;
xbt_parmap_apply(BoostContext::parmap_,
if (BoostContext::parallel_) {
BoostContext::threads_working_ = 0;
xbt_parmap_apply(BoostContext::parmap_,
@@
-232,7
+232,7
@@
void BoostSerialContext::stop()
// BoostParallelContext
// BoostParallelContext
-#if
def
HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
void BoostParallelContext::suspend()
{
void BoostParallelContext::suspend()
{
@@
-245,8
+245,8
@@
void BoostParallelContext::suspend()
}
else {
XBT_DEBUG("No more processes to run");
}
else {
XBT_DEBUG("No more processes to run");
- u
nsigned long
worker_id =
- (u
nsigned long
) xbt_os_thread_get_specific(worker_id_key_);
+ u
intptr_t
worker_id =
+ (u
intptr_t
) xbt_os_thread_get_specific(worker_id_key_);
next_context = static_cast<BoostParallelContext*>(
workers_context_[worker_id]);
}
next_context = static_cast<BoostParallelContext*>(
workers_context_[worker_id]);
}
@@
-269,7
+269,7
@@
void BoostParallelContext::stop()
void BoostParallelContext::resume()
{
void BoostParallelContext::resume()
{
- u
nsigned long
worker_id = __sync_fetch_and_add(&threads_working_, 1);
+ u
intptr_t
worker_id = __sync_fetch_and_add(&threads_working_, 1);
xbt_os_thread_set_specific(worker_id_key_, (void*) worker_id);
BoostParallelContext* worker_context =
xbt_os_thread_set_specific(worker_id_key_, (void*) worker_id);
BoostParallelContext* worker_context =
@@
-290,6
+290,7
@@
void BoostParallelContext::resume()
XBT_PRIVATE ContextFactory* boost_factory()
{
XBT_PRIVATE ContextFactory* boost_factory()
{
+ XBT_VERB("Using Boost contexts. Welcome to the 21th century.");
return new BoostContextFactory();
}
return new BoostContextFactory();
}