-/* 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. */
#include "mc/mc.h"
+#include "simgrid/s4u/Host.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/context/Context.hpp"
#include "src/simix/smx_private.hpp"
+#include "src/surf/surf_interface.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_actor_t simix_process)
-{
- xbt_assert(simix_global, "simix is not initialized, please call MSG_init first");
- return simix_global->context_factory->create_context(
- std::move(code), cleanup_func, simix_process);
-}
namespace simgrid {
namespace kernel {
ContextFactory::~ContextFactory() = default;
-Context* ContextFactory::self()
+static thread_local Context* smx_current_context = nullptr;
+Context* Context::self()
+{
+ return smx_current_context;
+}
+void Context::set_current(Context* self)
{
- return SIMIX_context_get_current();
+ smx_current_context = self;
}
-void ContextFactory::declare_context(void* context, std::size_t size)
+void Context::declare_context(std::size_t size)
{
#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_actor_t process)
+Context* ContextFactory::attach(actor::ActorImpl*)
{
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_actor_t process)
+Context* ContextFactory::create_maestro(std::function<void()>&&, actor::ActorImpl*)
{
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_actor_t process)
- : code_(std::move(code)), process_(process), iwannadie(false)
+Context::Context(std::function<void()>&& code, actor::ActorImpl* 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
- current context */
- if (has_code())
- this->cleanup_func_ = cleanup_func;
- else
- SIMIX_context_set_current(this);
+ /* 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;
-
-void Context::stop()
+Context::~Context()
{
- if (this->cleanup_func_)
- this->cleanup_func_(this->process_);
- this->process_->suspended = 0;
-
- this->iwannadie = false;
- simgrid::simix::kernelImmediate([this] { SIMIX_process_cleanup(this->process_); });
- this->iwannadie = true;
+ if (self() == this)
+ set_current(nullptr);
}
-AttachContext::~AttachContext() = default;
-
-}}}
-
-/** @brief Executes all the processes to run (in parallel if possible). */
-void SIMIX_context_runall()
+void Context::stop()
{
- simix_global->context_factory->run_all();
+ this->actor_->cleanup();
}
-/** @brief returns the current running context */
-smx_context_t SIMIX_context_self()
-{
- if (simix_global && simix_global->context_factory)
- return simix_global->context_factory->self();
- else
- return nullptr;
-}
+AttachContext::~AttachContext() = default;
+} // namespace context
+} // namespace kernel
+} // namespace simgrid