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

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index c78d970296..adca70962c 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2014-2015. The SimGrid Team. All rights reserved.
+# Copyright (c) 2014-2016. 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.
@@ -9,48 +9,17 @@
 import re
 import glob
 
-types = [
-    ('char', 'c'),
-    ('const char*', 'cc'),
-    ('int', 'i'),
-    ('long', 'l'),
-    ('unsigned char', 'uc'),
-    ('unsigned short', 'us'),
-    ('unsigned int', 'ui'),
-    ('unsigned long', 'ul'),
-    ('float', 'f'),
-    ('double', 'd'),
-    ('void*', 'dp'),
-    ('FPtr', 'fp'),
-    ('const void*', 'cp'),
-    ('size_t', 'sz'),
-    ('sg_size_t', 'sgsz'),
-    ('sg_offset_t', 'sgoff'),
-    ('void', ''),
-    ('void*', 'dp'),
-    ('FPtr', 'fp'),
-    ]
-
-
 class Arg(object):
-    simcall_types = {k: v for k, v in types}
 
-    def __init__(self, name, type, casted=None):
+    def __init__(self, name, type):
         self.name = name
         self.type = type
-        self.casted = casted
-        assert type in self.simcall_types, '%s not in (%s)' % (
-            type, ', '.join(self.simcall_types.keys()))
 
     def field(self):
         return self.simcall_types[self.type]
 
     def rettype(self):
-        return '%s' % self.casted if self.casted else self.type
-
-    def cast(self):
-        return '(%s)' % self.casted if self.casted else ''
-
+        return self.type
 
 class Simcall(object):
     simcalls_BODY = None
@@ -74,7 +43,7 @@ class Simcall(object):
             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 simcall_BODY_%s(%s);' % (self.name, "...")
             print '}'
             return False
 
@@ -152,8 +121,10 @@ class Simcall(object):
             res.append("      simgrid::simix::marshal<%s>(simcall->result, %s);" % (self.res.rettype(), call))
         else:
             res.append("      " + call + ";");
-        res.append('      %sbreak;  \n' %
-                   ('SIMIX_simcall_answer(simcall);\n      ' if self.call_kind != 'Blck' else ' '))
+        if self.call_kind != 'Blck':
+            res.append('      SIMIX_simcall_answer(simcall);')
+        res.append('      break;')
+        res.append('')
         return '\n'.join(res)
 
     def body(self):
@@ -200,18 +171,33 @@ def parse(fn):
         if line.startswith('#') or not line:
             continue
         match = re.match(
-            r'(\S*?) *(\S*?) *(\S*?) *\((.*?)(?:, *(.*?))?\) *(.*)', line)
+            r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)
         assert match, line
-        ans, handler, name, rest, resc, args = match.groups()
-        assert (ans == 'Proc' or ans == 'Func' or ans == 'Blck'), "Invalid call type: '%s'. Faulty line:\n%s\n" % (
-            ans, line)
-        assert (handler == 'H' or handler == '-'), "Invalid need_handler indication: '%s'. Faulty line:\n%s\n" % (
-            handler, line)
+        ret, name, args, attrs = match.groups()
         sargs = []
-        for n, t, c in re.findall(r'\((.*?), *(.*?)(?:, *(.*?))?\)', args):
-            sargs.append(Arg(n, t, c))
-        sim = Simcall(name, handler == 'H',
-                      Arg('result', rest, resc), sargs, ans)
+        if not re.match("^\s*$", args):
+            for arg in re.split(",", args):
+                args = args.strip()
+                match = re.match("^(.*?)\s*?(\S+)$", arg)
+                t, n = match.groups()
+                t = t.strip()
+                n = n.strip()
+                sargs.append(Arg(n, t))
+        if ret == "void":
+            ans = "Proc"
+        else:
+            ans = "Func"
+        handler = True
+        if attrs:
+            attrs = attrs[2:-2]
+            for attr in re.split(",", attrs):
+                if attr == "block":
+                    ans = "Blck"
+                elif attr == "nohandler":
+                    handler = False
+                else:
+                    assert False, "Unknown attribute %s in: %s" % (attr, line)
+        sim = Simcall(name, handler, Arg('result', ret), sargs, ans)
         if resdi is None:
             simcalls.append(sim)
         else:
@@ -358,6 +344,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')