X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a92d7b716f51a53dea7f59db8524d4add713b910..c7829c256a041aae9a60454263de30188b3f2fcc:/src/kernel/context/ContextThread.cpp diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp index 3e28c30768..012fbcc7ce 100644 --- a/src/kernel/context/ContextThread.cpp +++ b/src/kernel/context/ContextThread.cpp @@ -1,5 +1,4 @@ -/* 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. */ @@ -115,7 +114,7 @@ ThreadContext::ThreadContext(std::function code, * 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_); @@ -201,9 +200,9 @@ void ThreadContext::stop() 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_cleanup_push((void (*)(void*))xbt_os_sem_release, this->end_); xbt_os_thread_exit(nullptr); + xbt_os_thread_cleanup_pop(0); } void ThreadContext::suspend()