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
Revert "Give back control to maestro as late as possible."
[simgrid.git]
/
src
/
kernel
/
context
/
ContextThread.cpp
diff --git
a/src/kernel/context/ContextThread.cpp
b/src/kernel/context/ContextThread.cpp
index
9b6d207
..
85ac35a
100644
(file)
--- 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. */
/* 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. */
@@
-52,7
+51,7
@@
ThreadContext* ThreadContextFactory::create_context(
std::function<void()> code,
void_pfn_smxprocess_t cleanup, smx_actor_t process)
{
std::function<void()> code,
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()
}
void ThreadContextFactory::run_all()
@@
-115,7
+114,7
@@
ThreadContext::ThreadContext(std::function<void()> code,
* name, but now the name is stored at SIMIX level, so we pass a null */
this->thread_ =
xbt_os_thread_create(nullptr,
* 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_);
this, this);
/* wait the starting of the newly created process */
xbt_os_sem_acquire(this->end_);