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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
BoostContext.cpp
diff --git
a/src/simix/BoostContext.cpp
b/src/simix/BoostContext.cpp
index
debd695
..
241ecc3
100644
(file)
--- a/
src/simix/BoostContext.cpp
+++ b/
src/simix/BoostContext.cpp
@@
-38,7
+38,7
@@
public:
void resume();
};
void resume();
};
-#if
def CONTEXT_THREAD
S
+#if
HAVE_THREAD_CONTEXT
S
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 CONTEXT_THREAD
S
+#if
!HAVE_THREAD_CONTEXT
S
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 CONTEXT_THREAD
S
+#if
HAVE_THREAD_CONTEXT
S
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 CONTEXT_THREAD
S
+#if
HAVE_THREAD_CONTEXT
S
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 CONTEXT_THREAD
S
+#if
HAVE_THREAD_CONTEXT
S
if (BoostContext::parallel_) {
BoostContext::threads_working_ = 0;
xbt_parmap_apply(BoostContext::parmap_,
if (BoostContext::parallel_) {
BoostContext::threads_working_ = 0;
xbt_parmap_apply(BoostContext::parmap_,
@@
-161,7
+161,7
@@
BoostContext::BoostContext(std::function<void()> code,
smx_context_usable_stack_size,
smx_ctx_boost_wrapper);
} else {
smx_context_usable_stack_size,
smx_ctx_boost_wrapper);
} else {
- #if HAVE_BOOST_CONTEXT == 1
+ #if HAVE_BOOST_CONTEXT
S
== 1
this->fc_ = new boost::context::fcontext_t();
#endif
if (BoostContext::maestro_context_ == nullptr)
this->fc_ = new boost::context::fcontext_t();
#endif
if (BoostContext::maestro_context_ == nullptr)
@@
-171,7
+171,7
@@
BoostContext::BoostContext(std::function<void()> code,
BoostContext::~BoostContext()
{
BoostContext::~BoostContext()
{
-#if HAVE_BOOST_CONTEXT == 1
+#if HAVE_BOOST_CONTEXT
S
== 1
if (!this->stack_)
delete this->fc_;
#endif
if (!this->stack_)
delete this->fc_;
#endif
@@
-185,7
+185,7
@@
BoostContext::~BoostContext()
void BoostContext::resume()
{
SIMIX_context_set_current(this);
void BoostContext::resume()
{
SIMIX_context_set_current(this);
-#if HAVE_BOOST_CONTEXT == 1
+#if HAVE_BOOST_CONTEXT
S
== 1
boost::context::jump_fcontext(
maestro_context_->fc_, this->fc_,
(intptr_t) this);
boost::context::jump_fcontext(
maestro_context_->fc_, this->fc_,
(intptr_t) this);
@@
-215,7
+215,7
@@
void BoostSerialContext::suspend()
maestro_context_);
}
SIMIX_context_set_current((smx_context_t) next_context);
maestro_context_);
}
SIMIX_context_set_current((smx_context_t) next_context);
- #if HAVE_BOOST_CONTEXT == 1
+ #if HAVE_BOOST_CONTEXT
S
== 1
boost::context::jump_fcontext(
this->fc_, next_context->fc_, (intptr_t) next_context);
#else
boost::context::jump_fcontext(
this->fc_, next_context->fc_, (intptr_t) next_context);
#else
@@
-232,7
+232,7
@@
void BoostSerialContext::stop()
// BoostParallelContext
// BoostParallelContext
-#if
def CONTEXT_THREAD
S
+#if
HAVE_THREAD_CONTEXT
S
void BoostParallelContext::suspend()
{
void BoostParallelContext::suspend()
{
@@
-245,14
+245,14
@@
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]);
}
SIMIX_context_set_current((smx_context_t) next_context);
next_context = static_cast<BoostParallelContext*>(
workers_context_[worker_id]);
}
SIMIX_context_set_current((smx_context_t) next_context);
-#if HAVE_BOOST_CONTEXT == 1
+#if HAVE_BOOST_CONTEXT
S
== 1
boost::context::jump_fcontext(
this->fc_, next_context->fc_, (intptr_t)next_context);
#else
boost::context::jump_fcontext(
this->fc_, next_context->fc_, (intptr_t)next_context);
#else
@@
-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 =
@@
-277,7
+277,7
@@
void BoostParallelContext::resume()
workers_context_[worker_id] = worker_context;
SIMIX_context_set_current(this);
workers_context_[worker_id] = worker_context;
SIMIX_context_set_current(this);
-#if HAVE_BOOST_CONTEXT == 1
+#if HAVE_BOOST_CONTEXT
S
== 1
boost::context::jump_fcontext(
worker_context->fc_, this->fc_, (intptr_t) this);
#else
boost::context::jump_fcontext(
worker_context->fc_, this->fc_, (intptr_t) this);
#else
@@
-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();
}