-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-2017. 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. */
static xbt_os_sem_t smx_ctx_thread_sem = nullptr;
namespace simgrid {
-namespace simix {
+namespace kernel {
+namespace context {
XBT_PRIVATE ContextFactory* thread_factory()
{
ThreadContext* ThreadContextFactory::create_context(
std::function<void()> code,
- void_pfn_smxprocess_t cleanup, smx_process_t process)
+ void_pfn_smxprocess_t cleanup, smx_actor_t process)
{
- return this->new_context<ThreadContext>(std::move(code), cleanup, process, !code);
+ return this->new_context<ThreadContext>(std::move(code), cleanup, process, not code);
}
void ThreadContextFactory::run_all()
{
if (smx_ctx_thread_sem == nullptr) {
// Serial execution
- smx_process_t process;
+ smx_actor_t process;
unsigned int cursor;
xbt_dynar_foreach(simix_global->process_to_run, cursor, process) {
XBT_DEBUG("Handling %p",process);
} else {
// Parallel execution
unsigned int index;
- smx_process_t process;
+ smx_actor_t process;
xbt_dynar_foreach(simix_global->process_to_run, index, process)
xbt_os_sem_release(static_cast<ThreadContext*>(process->context)->begin_);
xbt_dynar_foreach(simix_global->process_to_run, index, process)
return static_cast<ThreadContext*>(xbt_os_thread_get_extra_data());
}
-ThreadContext* ThreadContextFactory::attach(void_pfn_smxprocess_t cleanup_func, smx_process_t process)
+ThreadContext* ThreadContextFactory::attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
{
return this->new_context<ThreadContext>(
std::function<void()>(), cleanup_func, process, false);
}
-ThreadContext* ThreadContextFactory::create_maestro(std::function<void()> code, smx_process_t process)
+ThreadContext* ThreadContextFactory::create_maestro(std::function<void()> code, smx_actor_t process)
{
return this->new_context<ThreadContext>(std::move(code), nullptr, process, true);
}
ThreadContext::ThreadContext(std::function<void()> code,
- void_pfn_smxprocess_t cleanup, smx_process_t process, bool maestro)
+ void_pfn_smxprocess_t cleanup, smx_actor_t process, bool maestro)
: AttachContext(std::move(code), cleanup, process)
{
- // We do not need the semaphores when maestro is in main, but we create them anyway for simplicity wrt the case where maestro is externalized
+ // 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);
* name, but now the name is stored at SIMIX level, so we pass a null */
this->thread_ =
xbt_os_thread_create(nullptr,
- maestro ? ThreadContext::maestro_wrapper : ThreadContext::wrapper,
+ maestro ? &ThreadContext::maestro_wrapper : &ThreadContext::wrapper,
this, this);
/* wait the starting of the newly created process */
xbt_os_sem_acquire(this->end_);
xbt_os_thread_set_extra_data(nullptr);
}
-}
-}
+}}} // namespace