From: Martin Quinson Date: Sun, 27 Feb 2022 18:02:28 +0000 (+0100) Subject: And now kill simcalls.py: simix v2 is not completely removed X-Git-Tag: v3.31~296 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/14ff25fb4c95aac368592cd99a63856b9d23a718 And now kill simcalls.py: simix v2 is not completely removed --- diff --git a/MANIFEST.in b/MANIFEST.in index 1066f25375..4de49711dd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2466,11 +2466,7 @@ include src/simgrid/sg_version.cpp include src/simgrid/util.hpp include src/simix/libsmx.cpp include src/simix/popping.cpp -include src/simix/popping_enum.hpp -include src/simix/popping_generated.cpp include src/simix/popping_private.hpp -include src/simix/simcalls.in -include src/simix/simcalls.py include src/simix/smx_context.cpp include src/smpi/bindings/smpi_f77.cpp include src/smpi/bindings/smpi_f77_coll.cpp diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in deleted file mode 100644 index 7b2f49c1f6..0000000000 --- a/src/simix/simcalls.in +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (c) 2014-2022. 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. - -# The simcalls are given as C-like signatures (one per line): -# -# int foo(int x, int y); -# int foo(int x, int y) [[block]]; -# int foo(int x, int y) [[nohandler]]; -# int foo(int x, int y) [[block, nohandler]]; -# -# The `block` attribute is used for calls which do not return in the same -# scheduling round. The answer requires some interaction with SURF, -# even if this can still occur at the same timestamp under some -# circumstances (eg if the surf_action cannot start because of resources -# that are down) examples: things that last some time (communicate, execute, -# mutex_lock). -# -# The `nohandler` is used to disable handlers. -# I wish we could completely remove the handlers as their only use is -# to adapt the interface between the exported symbol that is visible -# by the user applications and the internal symbol that is implemented -# by the kernel. -# The only remaining use of that mechanism is to add the caller -# identity as a parameter of internal call, but that could be -# automated too (eg by having a special parameter type called "self") - -# Please note that in addition to completing this file with your new simcall, -# you should complete the libsmx.c file by adding the corresponding function -# (a.k.a. stub). Anyway, if you omit to do it, the invocation of ./simcalls.py will notify you ;) -# If you want to remove an handler, it is important to remove although -# the corresponding code (simcall_HANDLER_name_of_simcall(xxx) (note that comment the code -# is not sufficient, the python script does not check whether the code is commented or not). -# Last but not the least, you should declare the new simix call in -# ./include/simgrid/simix.h (otherwise you will get a warning at compile time) - -void run_kernel(std::function const* code) [[nohandler]]; -void run_blocking(std::function const* code) [[block,nohandler]]; diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py deleted file mode 100755 index 5d47f0fad4..0000000000 --- a/src/simix/simcalls.py +++ /dev/null @@ -1,226 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Copyright (c) 2014-2022. 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: - - def __init__(self, name, thetype): - self.name = name - self.type = thetype - self.simcall_types = [] - - def field(self): - return self.simcall_types[self.type] - - def rettype(self): - return self.type - - -class Simcall: - simcalls_pre = None - - def __init__(self, name, handler, res, args, call_kind): - self.name = name - self.res = res - self.args = args - self.need_handler = handler - self.call_kind = call_kind - - def check(self): - # 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('../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() - 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('{') - 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') - return False - return True - - def string(self): - return ' "Simcall::%s",' % self.name.upper() - - def accessors(self): - res = [] - res.append('') - regex = re.compile(r"^boost::intrusive_ptr<(.*?)>(.*)$") # to compute the raw type - # Arguments getter/setters - for i, arg in enumerate(self.args): - rawtype = regex.sub(r'\1*\2', arg.rettype()) - 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('}') - 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('}') - 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('}') - - # Return value getter/setters - if self.res.type != 'void': - rawtype = regex.sub(r'\1*\2', self.res.rettype()) - 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('}') - 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('}') - 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('}') - return '\n'.join(res) - - def case(self): - res = [] - indent = ' ' - args = ["simcall_.code_"] - res.append(indent + 'case Simcall::%s:' % (self.name.upper())) - if self.need_handler: - call = "simcall_HANDLER_%s(&simcall_%s%s)" % (self.name, - ", " if args else "", - ', '.join(args)) - else: - call = "SIMIX_%s(%s)" % (self.name, ', '.join(args)) - res.append(indent + " " + call + ";") - if self.call_kind != 'Blck': - res.append(indent + ' simcall_answer();') - res.append(indent + ' break;') - res.append('') - return '\n'.join(res) - - def handler_prototype(self): - if self.need_handler: - return "XBT_PRIVATE void simcall_HANDLER_%s(smx_simcall_t simcall%s);" % (self.name, - ''.join(', %s %s' % (arg.rettype(), arg.name) - for i, arg in enumerate(self.args))) - return "" - - -def parse(fn): - simcalls = [] - resdi = None - simcalls_guarded = {} - for line in open(fn).read().split('\n'): - if line.startswith('##'): - resdi = [] - simcalls_guarded[re.search(r'## *(.*)', line).group(1)] = resdi - if line.startswith('#') or not line: - continue - match = re.match( - r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*$', line) - if not match: - raise AssertionError(line) - ret, name, args, attrs = match.groups() - sargs = [] - 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": - raise Exception ("Func simcalls (ie, returning a value) not supported anymore") - ans = 'Proc' - 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: - 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) - else: - resdi.append(sim) - return simcalls, simcalls_guarded - - -def header(name): - fd = open(name, 'w') - fd.write('/**********************************************************************/\n') - fd.write('/* File generated by src/simix/simcalls.py from src/simix/simcalls.in */\n') - fd.write('/* */\n') - fd.write('/* DO NOT EVER CHANGE THIS FILE */\n') - fd.write('/* */\n') - fd.write('/* change simcalls specification in src/simix/simcalls.in */\n') - fd.write('/* Copyright (c) 2014-2022. The SimGrid Team. All rights reserved. */\n') - fd.write('/**********************************************************************/\n\n') - fd.write('/*\n') - fd.write(' * Note that the name comes from http://en.wikipedia.org/wiki/Popping\n') - fd.write(' * Indeed, the control flow is doing a strange dance in there.\n') - fd.write(' *\n') - fd.write(' * That\'s not about http://en.wikipedia.org/wiki/Poop, despite the odor :)\n') - fd.write(' */\n\n') - return fd - - -def handle(fd, func, simcalls, guarded_simcalls): - def nonempty(e): - return e != '' - fd.write('\n'.join(filter(nonempty, (func(simcall) for simcall in 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') - - fd.write('\n') - -def main(): - simcalls, simcalls_dict = parse('simcalls.in') - - ok = True - ok &= all(map(Simcall.check, simcalls)) - for _k, v in simcalls_dict.items(): - ok &= all(map(Simcall.check, v)) - if not ok: - print("Some checks fail!") - sys.exit(1) - - -if __name__ == '__main__': - main() diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 3a406bb3b5..8074932b4b 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -22,8 +22,6 @@ set(EXTRA_DIST src/dag/dax.dtd src/dag/dax_dtd.c src/dag/dax_dtd.h - src/simix/simcalls.in - src/simix/simcalls.py src/simix/popping_private.hpp src/smpi/colls/coll_tuned_topo.hpp src/smpi/colls/colls_private.hpp