A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics
[simgrid.git]
/
src
/
kernel
/
context
/
Context.cpp
diff --git
a/src/kernel/context/Context.cpp
b/src/kernel/context/Context.cpp
index
fc48824
..
7e3ce08
100644
(file)
--- a/
src/kernel/context/Context.cpp
+++ b/
src/kernel/context/Context.cpp
@@
-1,33
+1,26
@@
-/* Copyright (c) 2007-2010, 2012-2015. 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. */
/* 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 "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
/**
* @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_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(
std::move(code), cleanup_func, simix_process);
}
return simix_global->context_factory->create_context(
std::move(code), cleanup_func, simix_process);
}
@@
-38,81
+31,71
@@
namespace context {
ContextFactoryInitializer factory_initializer = nullptr;
ContextFactoryInitializer factory_initializer = nullptr;
-ContextFactory::~ContextFactory()
{}
+ContextFactory::~ContextFactory()
= default;
-Context* ContextFactory::self()
+static thread_local smx_context_t 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 Context
Factory::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())
/* 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
}
#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");
}
{
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");
}
{
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)), 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
- 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()
{
}
Context::~Context()
{
+ if (self() == this)
+ set_current(nullptr);
}
void Context::stop()
{
if (this->cleanup_func_)
}
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;
this->iwannadie = false;
- sim
call_process_cleanup(this->process_
);
+ sim
grid::simix::simcall([this] { SIMIX_process_cleanup(this->actor_); }
);
this->iwannadie = true;
}
this->iwannadie = true;
}
-AttachContext::~AttachContext()
-{
-}
+AttachContext::~AttachContext() = default;
}}}
/** @brief Executes all the processes to run (in parallel if possible). */
}}}
/** @brief Executes all the processes to run (in parallel if possible). */
-void SIMIX_context_runall(void)
-{
- if (!xbt_dynar_is_empty(simix_global->process_to_run))
- simix_global->context_factory->run_all();
-}
-
-/** @brief returns the current running context */
-smx_context_t SIMIX_context_self(void)
+void SIMIX_context_runall()
{
{
- if (simix_global && simix_global->context_factory)
- return simix_global->context_factory->self();
- else
- return nullptr;
+ simix_global->context_factory->run_all();
}
}
-