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
travis: activate MC on linux so that sonar checks it (fix #158)
[simgrid.git]
/
src
/
simix
/
simcalls.py
diff --git
a/src/simix/simcalls.py
b/src/simix/simcalls.py
index
eff39b7
..
706dc92
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
6
. The SimGrid Team. All rights reserved.
+# Copyright (c) 2014-201
7
. 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.
@@
-51,7
+51,7
@@
class Simcall(object):
# smx_host_t h)
if self.simcalls_PRE is None:
self.simcalls_PRE = set()
# smx_host_t h)
if self.simcalls_PRE is None:
self.simcalls_PRE = set()
- for fn in glob.glob('smx_*') + glob.glob('ActorImpl*') + glob.glob('../mc/*'):
+ for fn in glob.glob('smx_*') + glob.glob('ActorImpl*') + glob.glob('../mc/*
cpp
'):
f = open(fn)
self.simcalls_PRE |= set(re.findall(r'simcall_HANDLER_(.*?)\(', f.read()))
f.close()
f = open(fn)
self.simcalls_PRE |= set(re.findall(r'simcall_HANDLER_(.*?)\(', f.read()))
f.close()
@@
-75,7
+75,7
@@
class Simcall(object):
return ' SIMCALL_%s,' % (self.name.upper())
def string(self):
return ' SIMCALL_%s,' % (self.name.upper())
def string(self):
- return ' "SIMCALL_%s",' % self.name.upper()
+ return '
"SIMCALL_%s",' % self.name.upper()
def accessors(self):
res = []
def accessors(self):
res = []
@@
-233,9
+233,9
@@
def header(name):
def handle(fd, func, simcalls, guarded_simcalls):
def handle(fd, func, simcalls, guarded_simcalls):
- def nonempty(e):
return e != ''
- fd.write(
-
'\n'.join(filter(nonempty, (func(simcall) for simcall in simcalls))))
+ def nonempty(e):
+ return e != ''
+
fd.write(
'\n'.join(filter(nonempty, (func(simcall) for simcall in simcalls))))
for guard, list in guarded_simcalls.items():
fd.write('\n#if %s\n' % (guard))
for guard, list in guarded_simcalls.items():
fd.write('\n#if %s\n' % (guard))
@@
-290,7
+290,7
@@
if __name__ == '__main__':
fd.write('#include <xbt/base.h>\n')
fd.write('#include "smx_private.h"\n')
fd.write('#include <xbt/base.h>\n')
fd.write('#include "smx_private.h"\n')
- fd.write('#if HAVE_MC\n')
+ fd.write('#if
SIMGRID_
HAVE_MC\n')
fd.write('#include "src/mc/mc_forward.hpp"\n')
fd.write('#endif\n')
fd.write('\n')
fd.write('#include "src/mc/mc_forward.hpp"\n')
fd.write('#endif\n')
fd.write('\n')
@@
-300,10
+300,10
@@
if __name__ == '__main__':
'/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n')
fd.write('const char* simcall_names[] = {\n')
'/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n')
fd.write('const char* simcall_names[] = {\n')
- fd.write('
"SIMCALL_NONE",
')
+ fd.write('
"SIMCALL_NONE",\n
')
handle(fd, Simcall.string, simcalls, simcalls_dict)
handle(fd, Simcall.string, simcalls, simcalls_dict)
- fd.write('};\n\n')
+ fd.write('
\n
};\n\n')
fd.write('/** @private\n')
fd.write(
fd.write('/** @private\n')
fd.write(