-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2018. 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. */
#ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP
#define SIMGRID_SIMIX_BOOST_CONTEXT_HPP
-#include <boost/context/all.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106100
+#include <boost/context/fcontext.hpp>
+#else
+#include <boost/context/detail/fcontext.hpp>
+#endif
+#include <atomic>
#include <cstdint>
#include <functional>
#include <vector>
#include "Context.hpp"
#include "src/internal_config.h"
-#include "src/simix/smx_private.hpp"
namespace simgrid {
namespace kernel {
namespace context {
-class BoostContext;
-class SerialBoostContext;
-class ParallelBoostContext;
-class BoostContextFactory;
-
/** @brief Userspace context switching implementation based on Boost.Context */
class BoostContext : public Context {
public:
};
class SerialBoostContext : public BoostContext {
- friend BoostContextFactory;
-
public:
SerialBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
: BoostContext(std::move(code), cleanup_func, process)
void suspend() override;
void resume() override;
+ static void run_all();
+
private:
static unsigned long process_index_;
};
#if HAVE_THREAD_CONTEXTS
class ParallelBoostContext : public BoostContext {
- friend BoostContextFactory;
-
public:
ParallelBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
: BoostContext(std::move(code), cleanup_func, process)
void suspend() override;
void resume() override;
+ static void initialize();
+ static void finalize();
+ static void run_all();
+
private:
static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
- static std::vector<BoostContext*> workers_context_;
- static uintptr_t threads_working_;
+ static std::vector<ParallelBoostContext*> workers_context_;
+ static std::atomic<uintptr_t> threads_working_;
static xbt_os_thread_key_t worker_id_key_;
};
#endif
public:
BoostContextFactory();
~BoostContextFactory() override;
- Context* create_context(std::function<void()> code, void_pfn_smxprocess_t, smx_actor_t process) override;
+ Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
void run_all() override;
private:
bool parallel_;
};
-
}}} // namespace
#endif