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
add s4u-cloud-simple to the list of examples
[simgrid.git]
/
src
/
simix
/
simcalls.py
diff --git
a/src/simix/simcalls.py
b/src/simix/simcalls.py
index
99d27d8
..
d757d81
100755
(executable)
--- a/
src/simix/simcalls.py
+++ b/
src/simix/simcalls.py
@@
-8,7
+8,7
@@
import re
import glob
import re
import glob
-
+import sys
class Arg(object):
class Arg(object):
@@
-193,7
+193,8
@@
def parse(fn):
continue
match = re.match(
r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)
continue
match = re.match(
r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)
- assert match, line
+ if not match:
+ raise AssertionError(line)
ret, name, args, attrs = match.groups()
sargs = []
if not re.match(r"^\s*$", args):
ret, name, args, attrs = match.groups()
sargs = []
if not re.match(r"^\s*$", args):
@@
-217,7
+218,7
@@
def parse(fn):
elif attr == "nohandler":
handler = False
else:
elif attr == "nohandler":
handler = False
else:
-
assert False, "Unknown attribute %s in: %s" % (attr, line
)
+
raise AssertionError("Unknown attribute %s in: %s" % (attr, line)
)
sim = Simcall(name, handler, Arg('result', ret), sargs, ans)
if resdi is None:
simcalls.append(sim)
sim = Simcall(name, handler, Arg('result', ret), sargs, ans)
if resdi is None:
simcalls.append(sim)
@@
-274,10
+275,9
@@
if __name__ == '__main__':
ok &= all(map(Simcall.check, simcalls))
for k, v in simcalls_dict.items():
ok &= all(map(Simcall.check, v))
ok &= all(map(Simcall.check, simcalls))
for k, v in simcalls_dict.items():
ok &= all(map(Simcall.check, v))
- # FIXME: we should not hide it
- # if not ok:
- # print ("Some checks fail!")
- # sys.exit(1)
+ if not ok:
+ print ("Some checks fail!")
+ sys.exit(1)
#
# popping_accessors.hpp
#
# popping_accessors.hpp
@@
-371,9
+371,12
@@
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 <xbt/log.h>\n')
fd.write("/** @cond */ // Please Doxygen, don't look at this\n")
fd.write('''
fd.write("/** @cond */ // Please Doxygen, don't look at this\n")
fd.write('''
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
+
template<class R, class... T>
inline static R simcall(e_smx_simcall_t call, T const&... t)
{
template<class R, class... T>
inline static R simcall(e_smx_simcall_t call, T const&... t)
{