/* 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 <utility>
-#include <functional>
+#include "src/kernel/context/ContextThread.hpp"
+#include "simgrid/Exception.hpp"
#include "src/internal_config.h" /* loads context system definitions */
#include "src/simix/smx_private.hpp"
#include "src/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
#include "xbt/function_types.h"
#include "xbt/xbt_os_thread.h"
-#include "src/kernel/context/ContextThread.hpp"
+#include <functional>
+#include <utility>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
// ThreadContext
-ThreadContext::ThreadContext(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process,
- bool maestro)
- : AttachContext(std::move(code), cleanup, process), is_maestro_(maestro)
+ThreadContext::ThreadContext(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t actor, bool maestro)
+ : AttachContext(std::move(code), cleanup, actor), is_maestro_(maestro)
{
- // We do not need the semaphores when maestro is in main,
- // but creating them anyway simplifies things when maestro is externalized
- this->begin_ = xbt_os_sem_init(0);
- this->end_ = xbt_os_sem_init(0);
-
/* If the user provided a function for the process then use it */
if (has_code()) {
if (smx_context_stack_size_was_set)
xbt_os_thread_setguardsize(smx_context_guard_size);
/* create and start the process */
- /* NOTE: The first argument to xbt_os_thread_create used to be the process *
- * name, but now the name is stored at SIMIX level, so we pass a null */
- this->thread_ = xbt_os_thread_create(nullptr, ThreadContext::wrapper, this, this);
+ this->thread_ = xbt_os_thread_create(ThreadContext::wrapper, this);
/* wait the starting of the newly created process */
- xbt_os_sem_acquire(this->end_);
+ this->end_.acquire();
}
/* Otherwise, we attach to the current thread */
else {
- xbt_os_thread_set_extra_data(this);
+ SIMIX_context_set_current(this);
}
}
{
if (this->thread_) /* If there is a thread (maestro don't have any), wait for its termination */
xbt_os_thread_join(this->thread_, nullptr);
-
- /* destroy the synchronization objects */
- xbt_os_sem_destroy(this->begin_);
- xbt_os_sem_destroy(this->end_);
}
void *ThreadContext::wrapper(void *param)
{
ThreadContext* context = static_cast<ThreadContext*>(param);
+ SIMIX_context_set_current(context);
#ifndef WIN32
/* Install alternate signal stack, for SIGSEGV handler. */
sigaltstack(&stack, nullptr);
#endif
// Tell the caller (normally the maestro) we are starting, and wait for its green light
- xbt_os_sem_release(context->end_);
+ context->end_.release();
context->start();
try {
(*context)();
- if (not context->isMaestro()) // really?
- context->Context::stop();
} catch (StopRequest const&) {
XBT_DEBUG("Caught a StopRequest");
- xbt_assert(not context->isMaestro(), "I'm not supposed to be maestro here.");
+ xbt_assert(not context->is_maestro(), "Maestro shall not receive StopRequests, even when detached.");
+ } catch (simgrid::Exception const& e) {
+ XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
+ throw;
}
+ if (not context->is_maestro()) // Just in case somebody detached maestro
+ context->Context::stop();
// Signal to the caller (normally the maestro) that we have finished:
context->yield();
void ThreadContext::release()
{
- xbt_os_sem_release(this->begin_);
+ this->begin_.release();
}
void ThreadContext::wait()
{
- xbt_os_sem_acquire(this->end_);
+ this->end_.acquire();
}
void ThreadContext::start()
{
- xbt_os_sem_acquire(this->begin_);
+ this->begin_.acquire();
this->start_hook();
}
void ThreadContext::yield()
{
this->yield_hook();
- xbt_os_sem_release(this->end_);
+ this->end_.release();
}
void ThreadContext::stop()
{
// We're breaking the layers here by depending on the upper layer:
ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_;
- xbt_os_sem_release(maestro->begin_);
- xbt_assert(not this->isMaestro());
+ maestro->begin_.release();
+ xbt_assert(not this->is_maestro());
this->start();
}
void ThreadContext::attach_stop()
{
- xbt_assert(not this->isMaestro());
+ xbt_assert(not this->is_maestro());
this->yield();
ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_;
- xbt_os_sem_acquire(maestro->end_);
+ maestro->end_.acquire();
- xbt_os_thread_set_extra_data(nullptr);
+ SIMIX_context_set_current(nullptr);
}
// SerialThreadContext
// ParallelThreadContext
-xbt_os_sem_t ParallelThreadContext::thread_sem_ = nullptr;
+xbt::OsSemaphore* ParallelThreadContext::thread_sem_ = nullptr;
void ParallelThreadContext::initialize()
{
- thread_sem_ = xbt_os_sem_init(SIMIX_context_get_nthreads());
+ thread_sem_ = new xbt::OsSemaphore(SIMIX_context_get_nthreads());
}
void ParallelThreadContext::finalize()
{
- xbt_os_sem_destroy(thread_sem_);
+ delete thread_sem_;
thread_sem_ = nullptr;
}
void ParallelThreadContext::start_hook()
{
- if (not isMaestro()) /* parallel run */
- xbt_os_sem_acquire(thread_sem_);
+ if (not is_maestro()) /* parallel run */
+ thread_sem_->acquire();
}
void ParallelThreadContext::yield_hook()
{
- if (not isMaestro()) /* parallel run */
- xbt_os_sem_release(thread_sem_);
+ if (not is_maestro()) /* parallel run */
+ thread_sem_->release();
}
XBT_PRIVATE ContextFactory* thread_factory()
