#include <utility>
#include <functional>
+#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 "src/simix/smx_private.h"
-#include "src/internal_config.h" /* loads context system definitions */
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
-#include "src/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
#include "src/kernel/context/ContextThread.hpp"
{
if (smx_ctx_thread_sem == nullptr) {
// Serial execution
- smx_actor_t process;
- unsigned int cursor;
- xbt_dynar_foreach(simix_global->process_to_run, cursor, process) {
+ for (smx_actor_t const& process : simix_global->process_to_run) {
XBT_DEBUG("Handling %p",process);
ThreadContext* context = static_cast<ThreadContext*>(process->context);
xbt_os_sem_release(context->begin_);
}
} else {
// Parallel execution
- unsigned int index;
- smx_actor_t process;
- xbt_dynar_foreach(simix_global->process_to_run, index, process)
+ for (smx_actor_t const& process : simix_global->process_to_run)
xbt_os_sem_release(static_cast<ThreadContext*>(process->context)->begin_);
- xbt_dynar_foreach(simix_global->process_to_run, index, process)
- xbt_os_sem_acquire(static_cast<ThreadContext*>(process->context)->end_);
+ for (smx_actor_t const& process : simix_global->process_to_run)
+ xbt_os_sem_acquire(static_cast<ThreadContext*>(process->context)->end_);
}
}
if (smx_ctx_thread_sem) /* parallel run */
xbt_os_sem_acquire(smx_ctx_thread_sem);
- (*context)();
- context->stop();
+ try {
+ (*context)();
+ context->Context::stop();
+ } catch (StopRequest const&) {
+ XBT_DEBUG("Caught a StopRequest");
+ }
+
+ if (smx_ctx_thread_sem)
+ xbt_os_sem_release(smx_ctx_thread_sem);
+ // Signal to the maestro that it has finished:
+ xbt_os_sem_release(context->end_);
+#ifndef WIN32
+ stack.ss_flags = SS_DISABLE;
+ sigaltstack(&stack, nullptr);
+#endif
return nullptr;
}
// Tell main that we have finished:
xbt_os_sem_release(context->end_);
+#ifndef WIN32
+ stack.ss_flags = SS_DISABLE;
+ sigaltstack(&stack, nullptr);
+#endif
return nullptr;
}
void ThreadContext::stop()
{
Context::stop();
- if (smx_ctx_thread_sem)
- xbt_os_sem_release(smx_ctx_thread_sem);
-
- // Signal to the maestro that it has finished:
- xbt_os_sem_release(this->end_);
-
- xbt_os_thread_exit(nullptr);
+ throw StopRequest();
}
void ThreadContext::suspend()