Commit 49881cc2 authored by Dominik Charousset's avatar Dominik Charousset

Merge git://github.com/abigagli/libcppa into unstable

parents 241da2dc 668dcb59
...@@ -56,6 +56,9 @@ void fiber::swap(fiber&, fiber&) { ...@@ -56,6 +56,9 @@ void fiber::swap(fiber&, fiber&) {
#endif #endif
#include <boost/version.hpp> #include <boost/version.hpp>
#include <boost/context/all.hpp> #include <boost/context/all.hpp>
#if BOOST_VERSION >= 105300
#include <boost/coroutine/all.hpp>
#endif
namespace cppa { namespace util { namespace cppa { namespace util {
...@@ -96,10 +99,25 @@ inline void fc_make(fc_member& storage, fc_allocator& alloc, vg_member& vgm) { ...@@ -96,10 +99,25 @@ inline void fc_make(fc_member& storage, fc_allocator& alloc, vg_member& vgm) {
reinterpret_cast<void*>( reinterpret_cast<void*>(
reinterpret_cast<intptr_t>(storage.fc_stack.base) - stacksize)); reinterpret_cast<intptr_t>(storage.fc_stack.base) - stacksize));
} }
#elif BOOST_VERSION < 105300
namespace ctx = boost::context;
typedef ctx::fcontext_t* fc_member;
typedef ctx::guarded_stack_allocator fc_allocator
inline void fc_jump(fc_member& from, fc_member& to, fiber_impl* ptr) {
ctx::jump_fcontext(from, to, (intptr_t) ptr);
}
inline void fc_make(fc_member& storage, fc_allocator& alloc, vg_member& vgm) {
size_t mss = fc_allocator::minimum_stacksize();
storage = ctx::make_fcontext(alloc.allocate(mss), mss, fiber_trampoline);
vg_register(vgm,
storage->fc_stack.sp,
reinterpret_cast<void*>(
reinterpret_cast<intptr_t>(storage->fc_stack.sp) - mss));
}
#else #else
namespace ctx = boost::context; namespace ctx = boost::context;
typedef ctx::fcontext_t* fc_member; typedef ctx::fcontext_t* fc_member;
typedef ctx::guarded_stack_allocator fc_allocator; typedef boost::coroutines::stack_allocator fc_allocator;
inline void fc_jump(fc_member& from, fc_member& to, fiber_impl* ptr) { inline void fc_jump(fc_member& from, fc_member& to, fiber_impl* ptr) {
ctx::jump_fcontext(from, to, (intptr_t) ptr); ctx::jump_fcontext(from, to, (intptr_t) ptr);
} }
...@@ -111,6 +129,7 @@ inline void fc_make(fc_member& storage, fc_allocator& alloc, vg_member& vgm) { ...@@ -111,6 +129,7 @@ inline void fc_make(fc_member& storage, fc_allocator& alloc, vg_member& vgm) {
reinterpret_cast<void*>( reinterpret_cast<void*>(
reinterpret_cast<intptr_t>(storage->fc_stack.sp) - mss)); reinterpret_cast<intptr_t>(storage->fc_stack.sp) - mss));
} }
#endif #endif
} // namespace <anonymous> } // namespace <anonymous>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment