X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/abd9f0ae086cef85194d86bb6019f30e3980f931..0d9a15e44114bd49c578a0ceda7503abdd9b39a9:/src/simix/simcalls.py

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index ee7ef82159..7d1b2b76bb 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -36,15 +36,15 @@ class Simcall(object):
         # libsmx.c  simcall_BODY_
         if self.simcalls_BODY is None:
             f = open('libsmx.cpp')
-            self.simcalls_BODY = set(
-                re.findall('simcall_BODY_(.*?)\(', f.read()))
+            self.simcalls_BODY = set(re.findall('simcall_BODY_(.*?)\(', f.read()))
             f.close()
         if self.name not in self.simcalls_BODY:
-            print '# ERROR: No function calling simcall_BODY_%s' % self.name
-            print '# Add something like this to libsmx.c:'
-            print '%s simcall_%s(%s) {' % (self.res.rettype(), self.name, ', '.join('%s %s' % (arg.rettype(), arg.name) for arg in self.args))
-            print '  return simcall_BODY_%s(%s);' % (self.name, "...")
-            print '}'
+            print ('# ERROR: No function calling simcall_BODY_%s' % self.name)
+            print ('# Add something like this to libsmx.c:')
+            print ('%s simcall_%s(%s) {' % (self.res.rettype(), self.name, ', '.
+                   join('%s %s' % (arg.rettype(), arg.name) for arg in self.args)))
+            print ('  return simcall_BODY_%s(%s);' % (self.name, "..."))
+            print ('}')
             return False
 
         # smx_*.c void simcall_HANDLER_host_on(smx_simcall_t simcall,
@@ -53,22 +53,21 @@ class Simcall(object):
             self.simcalls_PRE = set()
             for fn in glob.glob('smx_*') + glob.glob('../mc/*'):
                 f = open(fn)
-                self.simcalls_PRE |= set(
-                    re.findall('simcall_HANDLER_(.*?)\(', f.read()))
+                self.simcalls_PRE |= set(re.findall('simcall_HANDLER_(.*?)\(', f.read()))
                 f.close()
         if self.need_handler:
-            if (self.name not in self.simcalls_PRE):
-                print '# ERROR: No function called simcall_HANDLER_%s' % self.name
-                print '# Add something like this to the relevant C file (like smx_io.c if it\'s an IO call):'
-                print '%s simcall_HANDLER_%s(smx_simcall_t simcall%s) {' % (self.res.rettype(), self.name, ''.join(', %s %s' % (arg.rettype(), arg.name)
-                                                                                                                   for arg in self.args))
-                print '  // Your code handling the simcall'
-                print '}'
+            if self.name not in self.simcalls_PRE:
+                print ('# ERROR: No function called simcall_HANDLER_%s' % self.name)
+                print ('# Add something like this to the relevant C file (like smx_io.c if it\'s an IO call):')
+                print ('%s simcall_HANDLER_%s(smx_simcall_t simcall%s) {' % (self.res.rettype(), self.name, ''.
+                       join(', %s %s' % (arg.rettype(), arg.name)for arg in self.args)))
+                print ('  // Your code handling the simcall')
+                print ('}')
                 return False
         else:
-            if (self.name in self.simcalls_PRE):
-                print '# ERROR: You have a function called simcall_HANDLER_%s, but that simcall is not using any handler' % self.name
-                print '# Either change your simcall definition, or kill that function'
+            if self.name in self.simcalls_PRE:
+                print ('# ERROR: You have a function called simcall_HANDLER_%s, but that simcall is not using any handler' % self.name)
+                print ('# Either change your simcall definition, or kill that function')
                 return False
         return True
 
@@ -108,7 +107,7 @@ class Simcall(object):
 
     def case(self):
         res = []
-        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('case SIMCALL_%s:' % (self.name.upper()))
         if self.need_handler:
@@ -171,7 +170,7 @@ def parse(fn):
         if line.startswith('#') or not line:
             continue
         match = re.match(
-            r'^(\S*)\s*(\S*)\s*\(*([^\(\)]*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)
+            r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)
         assert match, line
         ret, name, args, attrs = match.groups()
         sargs = []
@@ -344,6 +343,7 @@ if __name__ == '__main__':
     # smx_popping_bodies.cpp
     #
     fd = header('popping_bodies.cpp')
+    fd.write('#include <functional>\n')
     fd.write('#include "smx_private.h"\n')
     fd.write('#include "src/mc/mc_forward.hpp"\n')
     fd.write('#include "xbt/ex.h"\n')