-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-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. */
-#include <cstdint>
-
-#include <memory>
-#include <functional>
-#include <utility>
-
-#include <simgrid/simix.hpp>
-
#include "mc/mc.h"
#include "src/kernel/context/Context.hpp"
-#include "src/simix/smx_private.h"
+#include "src/simix/smx_private.hpp"
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
/**
* @brief creates a new context for a user level process
* @param code a main function
* @param cleanup_func the function to call when the context stops
+ * @param simix_process
*/
smx_context_t SIMIX_context_new(
std::function<void()> code,
void_pfn_smxprocess_t cleanup_func,
- smx_process_t simix_process)
+ smx_actor_t simix_process)
{
xbt_assert(simix_global, "simix is not initialized, please call MSG_init first");
return simix_global->context_factory->create_context(
namespace simgrid {
namespace kernel {
namespace context {
+static thread_local smx_context_t smx_current_context;
ContextFactoryInitializer factory_initializer = nullptr;
-ContextFactory::~ContextFactory() {}
+ContextFactory::~ContextFactory() = default;
Context* ContextFactory::self()
{
- return SIMIX_context_get_current();
+ return smx_current_context;
}
-void ContextFactory::declare_context(void* context, std::size_t size)
+void Context::declare_context(std::size_t size)
{
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
/* Store the address of the stack in heap to compare it apart of heap comparison */
if(MC_is_active())
- MC_ignore_heap(context, size);
+ MC_ignore_heap(this, size);
#endif
}
-Context* ContextFactory::attach(void_pfn_smxprocess_t cleanup_func, smx_process_t process)
+Context* ContextFactory::attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
{
xbt_die("Cannot attach with this ContextFactory.\n"
"Try using --cfg=contexts/factory:thread instead.\n");
}
-Context* ContextFactory::create_maestro(std::function<void()> code, smx_process_t process)
+Context* ContextFactory::create_maestro(std::function<void()> code, smx_actor_t process)
{
xbt_die("Cannot create_maestro with this ContextFactory.\n"
"Try using --cfg=contexts/factory:thread instead.\n");
}
-Context::Context(std::function<void()> code,
- void_pfn_smxprocess_t cleanup_func, smx_process_t process)
- : code_(std::move(code)), process_(process), iwannadie(false)
+Context::Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
+ : code_(std::move(code)), 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
SIMIX_context_set_current(this);
}
-Context::~Context()
-{
-}
+Context::~Context() = default;
void Context::stop()
{
if (this->cleanup_func_)
- this->cleanup_func_(this->process_);
- this->process_->suspended = 0;
+ this->cleanup_func_(this->actor_);
+ this->actor_->suspended_ = 0;
this->iwannadie = false;
- simcall_process_cleanup(this->process_);
+ simgrid::simix::simcall([this] { SIMIX_process_cleanup(this->actor_); });
this->iwannadie = true;
}
-AttachContext::~AttachContext()
-{
-}
+AttachContext::~AttachContext() = default;
}}}
return nullptr;
}
+/**
+ * @brief Sets the current context of this thread.
+ * @param context the context to set
+ */
+void SIMIX_context_set_current(smx_context_t context)
+{
+ simgrid::kernel::context::smx_current_context = context;
+}