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
changelog update
[simgrid.git]
/
src
/
kernel
/
context
/
Context.cpp
diff --git
a/src/kernel/context/Context.cpp
b/src/kernel/context/Context.cpp
index dbd49f793ebd991b75c1e809866570f65fbf1d38..5736b265cd181d3822339319cb73c99a158ca0e9 100644
(file)
--- a/
src/kernel/context/Context.cpp
+++ b/
src/kernel/context/Context.cpp
@@
-1,42
+1,49
@@
-/* Copyright (c) 2007-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
3
. 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 "mc/mc.h"
+#include "
src/
mc/mc.h"
+#include "simgrid/Exception.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/context/Context.hpp"
#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"
+#include "src/sthread/sthread.h"
-#include <
array
>
+#include <
vector
>
-XBT_LOG_
EXTERNAL_DEFAULT_CATEGORY(simix_context
);
+XBT_LOG_
NEW_DEFAULT_SUBCATEGORY(ker_context, kernel, "Context switching mechanism"
);
-namespace simgrid {
-namespace kernel {
-namespace context {
+namespace simgrid::kernel::context {
-ContextFactoryInitializer factory_initializer = nullptr;
+void Context::set_nthreads(int nb_threads)
+{
+ if (nb_threads <= 0) {
+ nb_threads = std::thread::hardware_concurrency();
+ XBT_INFO("Auto-setting contexts/nthreads to %d", nb_threads);
+ }
+ Context::parallel_contexts = nb_threads;
+}
ContextFactory::~ContextFactory() = default;
ContextFactory::~ContextFactory() = default;
+e_xbt_parmap_mode_t Context::parallel_mode = XBT_PARMAP_DEFAULT;
+int Context::parallel_contexts = 1;
+unsigned Context::stack_size;
+unsigned Context::guard_size;
thread_local Context* Context::current_context_ = nullptr;
thread_local Context* Context::current_context_ = nullptr;
-#ifndef WIN32
/* Install or disable alternate signal stack, for SIGSEGV handler. */
/* Install or disable alternate signal stack, for SIGSEGV handler. */
-int Context::install_sigsegv_stack(
stack_t* old_stack,
bool enable)
+int Context::install_sigsegv_stack(bool enable)
{
{
- static std::
array<unsigned char, SIGSTKSZ> sigsegv_stack
;
+ static std::
vector<unsigned char> sigsegv_stack(SIGSTKSZ)
;
stack_t stack;
stack.ss_sp = sigsegv_stack.data();
stack.ss_size = sigsegv_stack.size();
stack.ss_flags = enable ? 0 : SS_DISABLE;
stack_t stack;
stack.ss_sp = sigsegv_stack.data();
stack.ss_size = sigsegv_stack.size();
stack.ss_flags = enable ? 0 : SS_DISABLE;
- return sigaltstack(&stack,
old_stack
);
+ return sigaltstack(&stack,
nullptr
);
}
}
-#endif
Context* Context::self()
{
Context* Context::self()
{
@@
-47,15
+54,6
@@
void Context::set_current(Context* self)
current_context_ = self;
}
current_context_ = self;
}
-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(this, size);
-#endif
-}
-
Context* ContextFactory::attach(actor::ActorImpl*)
{
xbt_die("Cannot attach with this ContextFactory.\n"
Context* ContextFactory::attach(actor::ActorImpl*)
{
xbt_die("Cannot attach with this ContextFactory.\n"
@@
-68,11
+66,11
@@
Context* ContextFactory::create_maestro(std::function<void()>&&, actor::ActorImp
"Try using --cfg=contexts/factory:thread instead.\n");
}
"Try using --cfg=contexts/factory:thread instead.\n");
}
-Context::Context(std::function<void()>&& code, actor::ActorImpl* actor) : code_(std::move(code)), actor_(actor)
+Context::Context(std::function<void()>&& code, actor::ActorImpl* actor, bool maestro)
+ : code_(std::move(code)), actor_(actor), is_maestro_(maestro)
{
{
- /* If no function was provided, this is the context for maestro
- * and we should set it as the current context */
- if (not has_code())
+ /* If we are creating maestro, we should set it as the current context */
+ if (maestro)
set_current(this);
}
set_current(this);
}
@@
-84,11
+82,10
@@
Context::~Context()
void Context::stop()
{
void Context::stop()
{
- this->actor_->cleanup();
+ this->actor_->cleanup_from_self();
+ sthread_disable();
+ throw ForcefulKillException(); // clean RAII variables with the dedicated exception
}
}
-
AttachContext::~AttachContext() = default;
AttachContext::~AttachContext() = default;
-} // namespace context
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::context