X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/475ce4c065d733046aa0b5cb3912ab45a3ffe9d9..efacb3792fdfe6bc849af2ce1a2e426c092601fb:/src/simix/simcalls.py diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index aa6e1992a0..eff39b7a07 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. @@ -36,39 +36,38 @@ 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(r'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, # smx_host_t h) if self.simcalls_PRE is None: self.simcalls_PRE = set() - for fn in glob.glob('smx_*') + glob.glob('../mc/*'): + for fn in glob.glob('smx_*') + glob.glob('ActorImpl*') + glob.glob('../mc/*'): f = open(fn) - self.simcalls_PRE |= set( - re.findall('simcall_HANDLER_(.*?)\(', f.read())) + self.simcalls_PRE |= set(re.findall(r'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: @@ -121,8 +120,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): @@ -169,18 +170,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 in re.findall(r'\((.*?), *(.*?)\)', args): - sargs.append(Arg(n, t)) - sim = Simcall(name, handler == 'H', - Arg('result', rest), sargs, ans) + if not re.match(r"^\s*$", args): + for arg in re.split(",", args): + args = args.strip() + match = re.match(r"^(.*?)\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: @@ -310,11 +326,9 @@ if __name__ == '__main__': fd.write(' case NUM_SIMCALLS:\n') fd.write(' break;\n') fd.write(' case SIMCALL_NONE:\n') - fd.write( - ' THROWF(arg_error,0,"Asked to do the noop syscall on %s@%s",\n') - fd.write(' SIMIX_process_get_name(simcall->issuer),\n') - fd.write( - ' sg_host_get_name(SIMIX_process_get_host(simcall->issuer))\n') + fd.write(' THROWF(arg_error,0,"Asked to do the noop syscall on %s@%s",\n') + fd.write(' simcall->issuer->name.c_str(),\n') + fd.write(' sg_host_get_name(simcall->issuer->host)\n') fd.write(' );\n') fd.write(' break;\n') fd.write('\n') @@ -327,6 +341,7 @@ if __name__ == '__main__': # smx_popping_bodies.cpp # fd = header('popping_bodies.cpp') + fd.write('#include \n') fd.write('#include "smx_private.h"\n') fd.write('#include "src/mc/mc_forward.hpp"\n') fd.write('#include "xbt/ex.h"\n') @@ -336,7 +351,7 @@ if __name__ == '__main__': template inline static R simcall(e_smx_simcall_t call, T const&... t) { - smx_process_t self = SIMIX_process_self(); + smx_actor_t self = SIMIX_process_self(); simgrid::simix::marshal(&self->simcall, call, t...); if (self != simix_global->maestro_process) { XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),