-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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. */
ContextFactory::~ContextFactory() = default;
-static thread_local smx_context_t smx_current_context;
+static thread_local smx_context_t smx_current_context = nullptr;
Context* Context::self()
{
return smx_current_context;
}
Context::Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
- : code_(std::move(code)), actor_(actor)
+ : code_(std::move(code)), cleanup_func_(cleanup_func), actor_(actor)
{
- /* If the user provided a function for the process then use it.
- Otherwise, it is the context for maestro and we should set it as the
- current context */
- if (has_code())
- this->cleanup_func_ = cleanup_func;
- else
+ /* If no function was provided, this is the context for maestro
+ * and we should set it as the current context */
+ if (not has_code())
set_current(this);
}
-Context::~Context() = default;
+Context::~Context()
+{
+ if (self() == this)
+ set_current(nullptr);
+}
void Context::stop()
{
{
simix_global->context_factory->run_all();
}
-
-/** @brief returns the current running context */
-smx_context_t SIMIX_context_self()
-{
- if (simix_global && simix_global->context_factory)
- return simgrid::kernel::context::Context::self();
- else
- return nullptr;
-}