X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/src/simix/simcalls.py diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index 093fe97b15..be84fb8186 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-2017. The SimGrid Team. All rights reserved. +# Copyright (c) 2014-2018. 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. @@ -22,8 +22,8 @@ class Arg(object): return self.type class Simcall(object): - simcalls_BODY = None - simcalls_PRE = None + simcalls_body = None + simcalls_pre = None def __init__(self, name, handler, res, args, call_kind): self.name = name @@ -34,11 +34,11 @@ class Simcall(object): def check(self): # libsmx.c simcall_BODY_ - if self.simcalls_BODY is None: + if self.simcalls_body is None: f = open('libsmx.cpp') - self.simcalls_BODY = set(re.findall(r'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: + 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, ', '. @@ -50,14 +50,14 @@ class Simcall(object): # 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('ActorImpl*') + glob.glob('../mc/*cpp'): + 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'): f = open(fn) - self.simcalls_PRE |= set(re.findall(r'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: + 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, ''. @@ -67,7 +67,7 @@ class Simcall(object): print ('}') return False else: - if self.name in self.simcalls_PRE: + 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 @@ -236,7 +236,7 @@ def header(name): fd.write( '/* change simcalls specification in src/simix/simcalls.in */\n') fd.write( - '/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved. */\n') + '/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */\n') fd.write( '/**********************************************************************/\n\n') fd.write('/*\n') @@ -296,6 +296,7 @@ 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() @@ -311,6 +312,10 @@ if __name__ == '__main__': fd.write('#if SIMGRID_HAVE_MC\n') 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') @@ -335,7 +340,7 @@ if __name__ == '__main__': ' 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 && simcall->call != SIMCALL_PROCESS_CLEANUP)\n') + ' if (simcall->issuer->context_->iwannadie)\n') fd.write(' return;\n') fd.write(' switch (simcall->call) {\n') @@ -344,12 +349,11 @@ 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(' simcall->issuer->name.c_str(),\n') - fd.write(' sg_host_get_name(simcall->issuer->host)\n') - fd.write(' );\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('\n') + fd.write(' default:\n') + fd.write(' THROW_IMPOSSIBLE;\n') fd.write(' }\n') fd.write('}\n') @@ -361,9 +365,11 @@ 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("/** @cond */ // Please Doxygen, don't look at this\n") fd.write(''' template @@ -372,8 +378,8 @@ 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->name.c_str(), - SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); + 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); } else { SIMIX_simcall_handle(&self->simcall, 0);