X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aacb341f7ac21e280b8a224e99d307a14c85d9e7..fd87c495d48cc6a966dd4365a194bf4e2b4beeb9:/src/simix/simcalls.py diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index aed91390ab..62358d0e8d 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. +# 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. @@ -159,7 +159,7 @@ class Simcall(object): res.append(' if (false) /* Go to that function to follow the code flow through the simcall barrier */') if self.need_handler: res.append(' simcall_HANDLER_%s(%s);' % (self.name, - ', '.join(["&SIMIX_process_self()->simcall_"] + [arg.name for arg in self.args]))) + ', '.join(["&simgrid::kernel::actor::ActorImpl::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))) @@ -192,7 +192,7 @@ def parse(fn): if line.startswith('#') or not line: continue match = re.match( - r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line) + r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*$', line) if not match: raise AssertionError(line) ret, name, args, attrs = match.groups() @@ -229,30 +229,19 @@ def parse(fn): 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-2021. The SimGrid Team. All rights reserved. */\n') - fd.write( - '/**********************************************************************/\n\n') + 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(' * 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(' * That\'s not about http://en.wikipedia.org/wiki/Poop, despite the odor :)\n') fd.write(' */\n\n') return fd @@ -318,21 +307,22 @@ if __name__ == '__main__': fd = header("popping_generated.cpp") - fd.write('#include "smx_private.hpp"\n') + fd.write('#include \n') fd.write('#include \n') fd.write('#include \n') 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/kernel/actor/SimcallObserver.hpp"\n') + fd.write('#include "src/kernel/context/Context.hpp"\n') fd.write('\n') fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n') fd.write('using simgrid::simix::Simcall;') fd.write('\n') - fd.write( - '/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n') + fd.write('/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n') fd.write('constexpr std::array simcall_names{{\n') fd.write(' "Simcall::NONE",\n') @@ -341,18 +331,18 @@ if __name__ == '__main__': fd.write('}};\n\n') fd.write('/** @private\n') - fd.write( - ' * @brief (in kernel mode) unpack the simcall and activate the handler\n') + fd.write(' * @brief (in kernel mode) unpack the simcall and activate the handler\n') fd.write(' *\n') fd.write(' * This function is generated from src/simix/simcalls.in\n') fd.write(' */\n') - fd.write( - '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') - fd.write(' SIMCALL_SET_MC_VALUE(simcall_, value);\n') - fd.write( - ' if (context_->wannadie())\n') + fd.write('void simgrid::kernel::actor::ActorImpl::simcall_handle(int times_considered)\n') + fd.write('{\n') + fd.write(' XBT_DEBUG("Handling simcall %p: %s", &simcall_, SIMIX_simcall_name(simcall_));\n') + fd.write(' simcall_.mc_value_ = times_considered;\n') + fd.write(' if (simcall_.observer_ != nullptr)\n') + fd.write(' simcall_.observer_->prepare(times_considered);\n') + + fd.write(' if (context_->wannadie())\n') fd.write(' return;\n') fd.write(' switch (simcall_.call_) {\n') @@ -373,7 +363,8 @@ if __name__ == '__main__': # popping_bodies.cpp # fd = header('popping_bodies.cpp') - fd.write('#include "smx_private.hpp"\n') + fd.write('#include "src/kernel/EngineImpl.hpp"\n') + fd.write('#include "src/kernel/actor/ActorImpl.hpp"\n') fd.write('#include "src/mc/mc_forward.hpp"\n') fd.write('#include "xbt/ex.h"\n') fd.write('#include \n') @@ -389,11 +380,10 @@ using simgrid::simix::Simcall; template inline static R simcall(Simcall call, T const&... t) { - smx_actor_t self = SIMIX_process_self(); + auto self = simgrid::kernel::actor::ActorImpl::self(); simgrid::simix::marshal(&self->simcall_, call, t...); - if (self != simix_global->maestro_) { - XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->get_cname(), SIMIX_simcall_name(self->simcall_.call_), - (int)self->simcall_.call_); + if (not simgrid::kernel::EngineImpl::get_instance()->is_maestro(self)) { + XBT_DEBUG("Yield process '%s' on simcall %s", self->get_cname(), SIMIX_simcall_name(self->simcall_)); self->yield(); } else { self->simcall_handle(0);