#!/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.
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):
if line.startswith('#') or not line:
continue
match = re.match(
- r'^(Proc|Func|Blck)\s*([H-])\s*(\S*)\s*(\S*)\s*\(*([^\(\)]*)\)\s*;?$', line)
+ r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)
assert match, line
- ans, handler, ret, name, 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 = []
if not re.match("^\s*$", args):
for arg in re.split(",", args):
t = t.strip()
n = n.strip()
sargs.append(Arg(n, t))
- sim = Simcall(name, handler == 'H',
- Arg('result', ret), sargs, ans)
+ 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:
# 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')