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
Merge branch 'master' of ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
simcalls.py
diff --git
a/src/simix/simcalls.py
b/src/simix/simcalls.py
index
f3d123c
..
696b6f0
100755
(executable)
--- a/
src/simix/simcalls.py
+++ b/
src/simix/simcalls.py
@@
-1,7
+1,7
@@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (c) 2014-201
7
. The SimGrid Team. All rights reserved.
+# Copyright (c) 2014-201
8
. 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.
@@
-236,7
+236,7
@@
def header(name):
fd.write(
'/* change simcalls specification in src/simix/simcalls.in */\n')
fd.write(
fd.write(
'/* change simcalls specification in src/simix/simcalls.in */\n')
fd.write(
- '/* Copyright (c) 2014-201
7
. The SimGrid Team. All rights reserved. */\n')
+ '/* Copyright (c) 2014-201
8
. The SimGrid Team. All rights reserved. */\n')
fd.write(
'/**********************************************************************/\n\n')
fd.write('/*\n')
fd.write(
'/**********************************************************************/\n\n')
fd.write('/*\n')
@@
-311,6
+311,10
@@
if __name__ == '__main__':
fd.write('#if SIMGRID_HAVE_MC\n')
fd.write('#include "src/mc/mc_forward.hpp"\n')
fd.write('#endif\n')
fd.write('#if SIMGRID_HAVE_MC\n')
fd.write('#include "src/mc/mc_forward.hpp"\n')
fd.write('#endif\n')
+ fd.write('#include "src/kernel/activity/ConditionVariableImpl.hpp"\n')
+ fd.write('#include "src/simix/smx_synchro_private.hpp"\n')
+ fd.write('#include "src/simix/smx_host_private.hpp"\n')
+
fd.write('\n')
fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n')
fd.write('\n')
fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n')
@@
-365,6
+369,8
@@
if __name__ == '__main__':
fd.write('#include "xbt/ex.h"\n')
fd.write('#include <functional>\n')
fd.write('#include <simgrid/simix.hpp>\n')
fd.write('#include "xbt/ex.h"\n')
fd.write('#include <functional>\n')
fd.write('#include <simgrid/simix.hpp>\n')
+ fd.write('#include "src/simix/smx_synchro_private.hpp"\n')
+
fd.write("/** @cond */ // Please Doxygen, don't look at this\n")
fd.write('''
template<class R, class... T>
fd.write("/** @cond */ // Please Doxygen, don't look at this\n")
fd.write('''
template<class R, class... T>