X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a15797ea55151ddfdbae48147e74159efe01b411..e44a0d71a8bacd7ab03e284fc32ad23731f5869c:/src/simix/simcalls.py diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index adca70962c..7474d22665 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-2016. The SimGrid Team. All rights reserved. +# Copyright (c) 2014-2017. 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/*cpp'): 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 @@ -76,7 +75,7 @@ class Simcall(object): 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 = [] @@ -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: @@ -175,10 +174,10 @@ def parse(fn): assert match, line ret, name, args, attrs = match.groups() sargs = [] - if not re.match("^\s*$", args): + if not re.match(r"^\s*$", args): for arg in re.split(",", args): args = args.strip() - match = re.match("^(.*?)\s*?(\S+)$", arg) + match = re.match(r"^(.*?)\s*?(\S+)$", arg) t, n = match.groups() t = t.strip() n = n.strip() @@ -234,17 +233,16 @@ def header(name): 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(): + for guard, ll in guarded_simcalls.items(): fd.write('\n#if %s\n' % (guard)) - fd.write('\n'.join(func(simcall) for simcall in list)) + fd.write('\n'.join(func(simcall) for simcall in ll)) fd.write('\n#endif\n') if __name__ == '__main__': - import sys simcalls, simcalls_dict = parse('simcalls.in') ok = True @@ -291,7 +289,7 @@ if __name__ == '__main__': fd.write('#include \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') @@ -301,10 +299,10 @@ if __name__ == '__main__': '/** @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) - fd.write('};\n\n') + fd.write('\n};\n\n') fd.write('/** @private\n') fd.write( @@ -327,11 +325,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') @@ -354,7 +350,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(),