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
added doc for wifi ns3
[simgrid.git]
/
src
/
simix
/
simcalls.py
diff --git
a/src/simix/simcalls.py
b/src/simix/simcalls.py
index 3ce600d5ba5ce5807cf4ca9fdcb9502be7bda46d..77add25b637e286ea01482ebf465bd8f27c43573 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-20
19
. The SimGrid Team. All rights reserved.
+# Copyright (c) 2014-20
20
. 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.
@@
-130,17
+130,17
@@
class Simcall(object):
def case(self):
res = []
indent = ' '
def case(self):
res = []
indent = ' '
- args = ["simgrid::simix::unmarshal<%s>(simcall.args_[%d])" % (arg.rettype(), i)
+ args = ["simgrid::simix::unmarshal<%s>(simcall
_
.args_[%d])" % (arg.rettype(), i)
for i, arg in enumerate(self.args)]
res.append(indent + 'case SIMCALL_%s:' % (self.name.upper()))
if self.need_handler:
for i, arg in enumerate(self.args)]
res.append(indent + 'case SIMCALL_%s:' % (self.name.upper()))
if self.need_handler:
- call = "simcall_HANDLER_%s(&simcall%s%s)" % (self.name,
+ call = "simcall_HANDLER_%s(&simcall
_
%s%s)" % (self.name,
", " if args else "",
', '.join(args))
else:
call = "SIMIX_%s(%s)" % (self.name, ', '.join(args))
if self.call_kind == 'Func':
", " if args else "",
', '.join(args))
else:
call = "SIMIX_%s(%s)" % (self.name, ', '.join(args))
if self.call_kind == 'Func':
- res.append(indent + " simgrid::simix::marshal<%s>(simcall.result_, %s);" % (self.res.rettype(), call))
+ res.append(indent + " simgrid::simix::marshal<%s>(simcall
_
.result_, %s);" % (self.res.rettype(), call))
else:
res.append(indent + " " + call + ";")
if self.call_kind != 'Blck':
else:
res.append(indent + " " + call + ";")
if self.call_kind != 'Blck':
@@
-156,10
+156,10
@@
class Simcall(object):
self.name,
', '.join('%s %s' % (arg.rettype(), arg.name) for arg in self.args)))
res.append('{')
self.name,
', '.join('%s %s' % (arg.rettype(), arg.name) for arg in self.args)))
res.append('{')
- res.append(' if (
0
) /* Go to that function to follow the code flow through the simcall barrier */')
+ res.append(' if (
false
) /* Go to that function to follow the code flow through the simcall barrier */')
if self.need_handler:
res.append(' simcall_HANDLER_%s(%s);' % (self.name,
if self.need_handler:
res.append(' simcall_HANDLER_%s(%s);' % (self.name,
- ', '.join(["&SIMIX_process_self()->simcall"] + [arg.name for arg in self.args])))
+ ', '.join(["&SIMIX_process_self()->simcall
_
"] + [arg.name for arg in self.args])))
else:
res.append(' SIMIX_%s(%s);' % (self.name,
', '.join(arg.name for arg in self.args)))
else:
res.append(' SIMIX_%s(%s);' % (self.name,
', '.join(arg.name for arg in self.args)))
@@
-242,7
+242,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-20
19
. The SimGrid Team. All rights reserved. */\n')
+ '/* Copyright (c) 2014-20
20
. The SimGrid Team. All rights reserved. */\n')
fd.write(
'/**********************************************************************/\n\n')
fd.write('/*\n')
fd.write(
'/**********************************************************************/\n\n')
fd.write('/*\n')
@@
-292,19
+292,19
@@
if __name__ == '__main__':
fd.close()
#
fd.close()
#
- # popping_enum.h
+ # popping_enum.h
pp
#
#
- fd = header("popping_enum.h")
+ fd = header("popping_enum.h
pp
")
fd.write('/**\n')
fd.write(' * @brief All possible simcalls.\n')
fd.write(' */\n')
fd.write('/**\n')
fd.write(' * @brief All possible simcalls.\n')
fd.write(' */\n')
- fd.write('
typedef enum
{\n')
+ fd.write('
enum e_smx_simcall_t
{\n')
fd.write(' SIMCALL_NONE,\n')
handle(fd, Simcall.enum, simcalls, simcalls_dict)
fd.write(' NUM_SIMCALLS\n')
fd.write(' SIMCALL_NONE,\n')
handle(fd, Simcall.enum, simcalls, simcalls_dict)
fd.write(' NUM_SIMCALLS\n')
- fd.write('}
e_smx_simcall_t
;\n')
+ fd.write('};\n')
fd.close()
#
fd.close()
#
@@
-314,6
+314,7
@@
if __name__ == '__main__':
fd = header("popping_generated.cpp")
fd.write('#include "smx_private.hpp"\n')
fd = header("popping_generated.cpp")
fd.write('#include "smx_private.hpp"\n')
+ fd.write('#include <simgrid/host.h>\n')
fd.write('#include <xbt/base.h>\n')
fd.write('#if SIMGRID_HAVE_MC\n')
fd.write('#include "src/mc/mc_forward.hpp"\n')
fd.write('#include <xbt/base.h>\n')
fd.write('#if SIMGRID_HAVE_MC\n')
fd.write('#include "src/mc/mc_forward.hpp"\n')
@@
-325,12
+326,12
@@
if __name__ == '__main__':
fd.write(
'/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n')
fd.write(
'/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n')
- fd.write('const
char* simcall_names[] =
{\n')
+ fd.write('const
expr std::array<const char*, NUM_SIMCALLS> simcall_names{
{\n')
fd.write(' "SIMCALL_NONE",\n')
handle(fd, Simcall.string, simcalls, simcalls_dict)
fd.write(' "SIMCALL_NONE",\n')
handle(fd, Simcall.string, simcalls, simcalls_dict)
- fd.write('};\n\n')
+ fd.write('}
}
;\n\n')
fd.write('/** @private\n')
fd.write(
fd.write('/** @private\n')
fd.write(
@@
-341,12
+342,12
@@
if __name__ == '__main__':
fd.write(
'void simgrid::kernel::actor::ActorImpl::simcall_handle(int value) {\n')
fd.write(
fd.write(
'void simgrid::kernel::actor::ActorImpl::simcall_handle(int value) {\n')
fd.write(
- ' XBT_DEBUG("Handling simcall %p: %s", &simcall
, SIMIX_simcall_name(simcall
.call_));\n')
- fd.write(' SIMCALL_SET_MC_VALUE(simcall, value);\n')
+ ' XBT_DEBUG("Handling simcall %p: %s", &simcall
_, SIMIX_simcall_name(simcall_
.call_));\n')
+ fd.write(' SIMCALL_SET_MC_VALUE(simcall
_
, value);\n')
fd.write(
fd.write(
- ' if (context_->
iwannadie
)\n')
+ ' if (context_->
wannadie()
)\n')
fd.write(' return;\n')
fd.write(' return;\n')
- fd.write(' switch (simcall.call_) {\n')
+ fd.write(' switch (simcall
_
.call_) {\n')
handle(fd, Simcall.case, simcalls, simcalls_dict)
handle(fd, Simcall.case, simcalls, simcalls_dict)
@@
-382,15
+383,15
@@
template<class R, class... T>
inline static R simcall(e_smx_simcall_t call, T const&... t)
{
smx_actor_t self = SIMIX_process_self();
inline static R simcall(e_smx_simcall_t call, T const&... t)
{
smx_actor_t self = SIMIX_process_self();
- simgrid::simix::marshal(&self->simcall, call, t...);
+ simgrid::simix::marshal(&self->simcall
_
, call, t...);
if (self != simix_global->maestro_) {
if (self != simix_global->maestro_) {
- XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->get_cname(), SIMIX_simcall_name(self->simcall.call_),
- (int)self->simcall.call_);
+ XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->get_cname(), SIMIX_simcall_name(self->simcall
_
.call_),
+ (int)self->simcall
_
.call_);
self->yield();
} else {
self->simcall_handle(0);
}
self->yield();
} else {
self->simcall_handle(0);
}
- return simgrid::simix::unmarshal<R>(self->simcall.result_);
+ return simgrid::simix::unmarshal<R>(self->simcall
_
.result_);
}
''')
handle(fd, Simcall.body, simcalls, simcalls_dict)
}
''')
handle(fd, Simcall.body, simcalls, simcalls_dict)