X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..ba8076af3a3dd44a02c349d55256c64eaa4e7291:/src/simix/simcalls.py diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index be84fb8186..01cca20a49 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -1,13 +1,14 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. +# Copyright (c) 2014-2019. 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. import re import glob +import sys class Arg(object): @@ -21,6 +22,7 @@ class Arg(object): def rettype(self): return self.type + class Simcall(object): simcalls_body = None simcalls_pre = None @@ -42,7 +44,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))) + join('%s %s' % (arg.rettype(), arg.name) for arg in self.args))) print ('{') print (' return simcall_BODY_%s(%s);' % (self.name, "...")) print ('}') @@ -52,7 +54,8 @@ class Simcall(object): # smx_host_t h) if self.simcalls_pre is None: self.simcalls_pre = set() - for fn in glob.glob('smx_*') + glob.glob('ActorImpl*') + glob.glob('../mc/*cpp') + glob.glob('../kernel/activity/*cpp'): + for fn in glob.glob('smx_*') + glob.glob('../kernel/actor/ActorImpl*') + \ + glob.glob('../mc/*cpp') + glob.glob('../kernel/activity/*cpp'): f = open(fn) self.simcalls_pre |= set(re.findall(r'simcall_HANDLER_(.*?)\(', f.read())) f.close() @@ -61,14 +64,16 @@ class Simcall(object): 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))) + join(', %s %s' % (arg.rettype(), arg.name)for arg in self.args))) print ('{') 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 ( + '# 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 @@ -82,7 +87,7 @@ class Simcall(object): def accessors(self): res = [] res.append('') - regex = re.compile(r"^boost::intrusive_ptr<(.*?)>(.*)$") # to compute the raw type + regex = re.compile(r"^boost::intrusive_ptr<(.*?)>(.*)$") #  to compute the raw type # Arguments getter/setters for i in range(len(self.args)): arg = self.args[i] @@ -90,17 +95,17 @@ class Simcall(object): res.append('static inline %s simcall_%s__get__%s(smx_simcall_t simcall)' % ( arg.rettype(), self.name, arg.name)) res.append('{') - res.append(' return simgrid::simix::unmarshal<%s>(simcall->args[%i]);' % (arg.rettype(), i)) + res.append(' return simgrid::simix::unmarshal<%s>(simcall->args_[%i]);' % (arg.rettype(), i)) res.append('}') res.append('static inline %s simcall_%s__getraw__%s(smx_simcall_t simcall)' % ( rawtype, self.name, arg.name)) res.append('{') - res.append(' return simgrid::simix::unmarshal_raw<%s>(simcall->args[%i]);' % (rawtype, i)) + res.append(' return simgrid::simix::unmarshal_raw<%s>(simcall->args_[%i]);' % (rawtype, i)) res.append('}') res.append('static inline void simcall_%s__set__%s(smx_simcall_t simcall, %s arg)' % ( self.name, arg.name, arg.rettype())) res.append('{') - res.append(' simgrid::simix::marshal<%s>(simcall->args[%i], arg);' % (arg.rettype(), i)) + res.append(' simgrid::simix::marshal<%s>(simcall->args_[%i], arg);' % (arg.rettype(), i)) res.append('}') # Return value getter/setters @@ -109,37 +114,38 @@ class Simcall(object): res.append( 'static inline %s simcall_%s__get__result(smx_simcall_t simcall)' % (self.res.rettype(), self.name)) res.append('{') - res.append(' return simgrid::simix::unmarshal<%s>(simcall->result);' % self.res.rettype()) + res.append(' return simgrid::simix::unmarshal<%s>(simcall->result_);' % self.res.rettype()) res.append('}') res.append('static inline %s simcall_%s__getraw__result(smx_simcall_t simcall)' % (rawtype, self.name)) res.append('{') - res.append(' return simgrid::simix::unmarshal_raw<%s>(simcall->result);' % rawtype) + res.append(' return simgrid::simix::unmarshal_raw<%s>(simcall->result_);' % rawtype) res.append('}') res.append( 'static inline void simcall_%s__set__result(smx_simcall_t simcall, %s result)' % (self.name, self.res.rettype())) res.append('{') - res.append(' simgrid::simix::marshal<%s>(simcall->result, result);' % (self.res.rettype())) + res.append(' simgrid::simix::marshal<%s>(simcall->result_, result);' % (self.res.rettype())) res.append('}') return '\n'.join(res) def case(self): res = [] - 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())) + indent = ' ' + args = ["simgrid::simix::unmarshal<%s>(simcall.args_[%d])" % (arg.rettype(), i) + for i, arg in enumerate(self.args)] + res.append(indent + 'case SIMCALL_%s:' % (self.name.upper())) if self.need_handler: - call = "simcall_HANDLER_%s(simcall%s%s)" % (self.name, - ", " if len(args) > 0 else "", - ', '.join(args)) + call = "simcall_HANDLER_%s(&simcall%s%s)" % (self.name, + ", " if len(args) > 0 else "", + ', '.join(args)) else: call = "SIMIX_%s(%s)" % (self.name, ', '.join(args)) if self.call_kind == 'Func': - res.append(" simgrid::simix::marshal<%s>(simcall->result, %s);" % (self.res.rettype(), call)) + res.append(indent + " simgrid::simix::marshal<%s>(simcall.result_, %s);" % (self.res.rettype(), call)) else: - res.append(" " + call + ";"); + res.append(indent + " " + call + ";") if self.call_kind != 'Blck': - res.append(' SIMIX_simcall_answer(simcall);') - res.append(' break;') + res.append(indent + ' simcall_answer();') + res.append(indent + ' break;') res.append('') return '\n'.join(res) @@ -147,8 +153,8 @@ class Simcall(object): res = [''] res.append( 'inline static %s simcall_BODY_%s(%s)' % (self.res.rettype(), - self.name, - ', '.join('%s %s' % (arg.rettype(), arg.name) for arg in self.args))) + self.name, + ', '.join('%s %s' % (arg.rettype(), arg.name) for arg in self.args))) res.append('{') res.append(' if (0) /* Go to that function to follow the code flow through the simcall barrier */') if self.need_handler: @@ -156,13 +162,13 @@ class Simcall(object): ', '.join(["&SIMIX_process_self()->simcall"] + [arg.name for arg in self.args]))) else: res.append(' SIMIX_%s(%s);' % (self.name, - ', '.join(arg.name for arg in self.args))) + ', '.join(arg.name for arg in self.args))) res.append(' return simcall<%s%s>(SIMCALL_%s%s);' % ( self.res.rettype(), - "".join([ ", " + arg.rettype() for i, arg in enumerate(self.args) ]), + "".join([", " + arg.rettype() for i, arg in enumerate(self.args)]), self.name.upper(), - "".join([ ", " + arg.name for i, arg in enumerate(self.args) ]) - )); + "".join([", " + arg.name for i, arg in enumerate(self.args)]) + )) res.append('}') return '\n'.join(res) @@ -188,7 +194,8 @@ def parse(fn): continue match = re.match( r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line) - assert match, line + if not match: + raise AssertionError(line) ret, name, args, attrs = match.groups() sargs = [] if not re.match(r"^\s*$", args): @@ -212,7 +219,7 @@ def parse(fn): elif attr == "nohandler": handler = False else: - assert False, "Unknown attribute %s in: %s" % (attr, line) + raise AssertionError("Unknown attribute %s in: %s" % (attr, line)) sim = Simcall(name, handler, Arg('result', ret), sargs, ans) if resdi is None: simcalls.append(sim) @@ -236,7 +243,7 @@ def header(name): fd.write( '/* change simcalls specification in src/simix/simcalls.in */\n') fd.write( - '/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */\n') + '/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. */\n') fd.write( '/**********************************************************************/\n\n') fd.write('/*\n') @@ -259,7 +266,9 @@ def handle(fd, func, simcalls, guarded_simcalls): for guard, ll in guarded_simcalls.items(): fd.write('\n#if %s\n' % (guard)) fd.write('\n'.join(func(simcall) for simcall in ll)) - fd.write('\n#endif\n') + fd.write('\n#endif') + + fd.write('\n') if __name__ == '__main__': simcalls, simcalls_dict = parse('simcalls.in') @@ -268,19 +277,18 @@ if __name__ == '__main__': ok &= all(map(Simcall.check, simcalls)) for k, v in simcalls_dict.items(): ok &= all(map(Simcall.check, v)) - # FIXME: we should not hide it - # if not ok: - # print ("Some checks fail!") - # sys.exit(1) + if not ok: + print ("Some checks fail!") + sys.exit(1) # # popping_accessors.hpp # fd = header('popping_accessors.hpp') - fd.write('#include "src/simix/popping_private.hpp"'); + fd.write('#include "src/simix/popping_private.hpp"') handle(fd, Simcall.accessors, simcalls, simcalls_dict) fd.write( - "\n\n/* The prototype of all simcall handlers, automatically generated for you */\n\n") + "\n/* The prototype of all simcall handlers, automatically generated for you */\n\n") handle(fd, Simcall.handler_prototype, simcalls, simcalls_dict) fd.close() @@ -296,7 +304,6 @@ if __name__ == '__main__': handle(fd, Simcall.enum, simcalls, simcalls_dict) - fd.write('\n') fd.write(' NUM_SIMCALLS\n') fd.write('} e_smx_simcall_t;\n') fd.close() @@ -313,8 +320,6 @@ if __name__ == '__main__': fd.write('#include "src/mc/mc_forward.hpp"\n') fd.write('#endif\n') fd.write('#include "src/kernel/activity/ConditionVariableImpl.hpp"\n') - fd.write('#include "src/simix/smx_host_private.hpp"\n') - fd.write('#include "src/simix/smx_synchro_private.hpp"\n') fd.write('\n') fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n') @@ -326,7 +331,7 @@ if __name__ == '__main__': fd.write(' "SIMCALL_NONE",\n') handle(fd, Simcall.string, simcalls, simcalls_dict) - fd.write('\n};\n\n') + fd.write('};\n\n') fd.write('/** @private\n') fd.write( @@ -335,23 +340,23 @@ if __name__ == '__main__': fd.write(' * This function is generated from src/simix/simcalls.in\n') fd.write(' */\n') fd.write( - 'void SIMIX_simcall_handle(smx_simcall_t simcall, int value) {\n') + 'void simgrid::kernel::actor::ActorImpl::simcall_handle(int value) {\n') fd.write( - ' XBT_DEBUG("Handling simcall %p: %s", simcall, SIMIX_simcall_name(simcall->call));\n') + ' XBT_DEBUG("Handling simcall %p: %s", &simcall, SIMIX_simcall_name(simcall.call_));\n') fd.write(' SIMCALL_SET_MC_VALUE(simcall, value);\n') fd.write( - ' if (simcall->issuer->context_->iwannadie)\n') + ' if (context_->iwannadie)\n') fd.write(' return;\n') - fd.write(' switch (simcall->call) {\n') + fd.write(' switch (simcall.call_) {\n') handle(fd, Simcall.case, simcalls, simcalls_dict) 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", simcall->issuer->get_cname(),\n') - fd.write(' sg_host_get_name(simcall->issuer->host_));\n') - fd.write(' break;\n') + fd.write(' throw std::invalid_argument(simgrid::xbt::string_printf("Asked to do the noop syscall on %s@%s",\n') + fd.write(' get_cname(),\n') + fd.write(' sg_host_get_name(get_host())));\n') fd.write(' default:\n') fd.write(' THROW_IMPOSSIBLE;\n') fd.write(' }\n') @@ -365,28 +370,30 @@ if __name__ == '__main__': fd = header('popping_bodies.cpp') fd.write('#include "smx_private.hpp"\n') fd.write('#include "src/mc/mc_forward.hpp"\n') - fd.write('#include "src/simix/smx_synchro_private.hpp"\n') fd.write('#include "xbt/ex.h"\n') fd.write('#include \n') fd.write('#include \n') + fd.write('#include \n') fd.write("/** @cond */ // Please Doxygen, don't look at this\n") fd.write(''' +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); + template inline static R simcall(e_smx_simcall_t call, T const&... t) { 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->get_cname(), SIMIX_simcall_name(self->simcall.call), - (int)self->simcall.call); - SIMIX_process_yield(self); + XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->get_cname(), SIMIX_simcall_name(self->simcall.call_), + (int)self->simcall.call_); + self->yield(); } else { - SIMIX_simcall_handle(&self->simcall, 0); + self->simcall_handle(0); } - return simgrid::simix::unmarshal(self->simcall.result); + return simgrid::simix::unmarshal(self->simcall.result_); } ''') handle(fd, Simcall.body, simcalls, simcalls_dict) - fd.write(" /** @endcond */\n"); + fd.write("/** @endcond */\n") fd.close()