X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e8f0399a8d83bfddeb5ca70bec5880eb26f420b5..ea74f5d95928a521a588737e81f1de94eef25d19:/src/simix/simcalls.py diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index 82d9aa5b05..06b5b401a7 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -1,7 +1,7 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2014-2019. 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. @@ -79,15 +79,15 @@ class Simcall(object): return True def enum(self): - return ' SIMCALL_%s,' % (self.name.upper()) + return ' %s,' % (self.name.upper()) def string(self): - return ' "SIMCALL_%s",' % self.name.upper() + return ' "Simcall::%s",' % self.name.upper() 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] @@ -130,17 +130,17 @@ class Simcall(object): def case(self): res = [] indent = ' ' - 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(indent + 'case SIMCALL_%s:' % (self.name.upper())) + 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 "", + call = "simcall_HANDLER_%s(&simcall_%s%s)" % (self.name, + ", " if args else "", ', '.join(args)) else: call = "SIMIX_%s(%s)" % (self.name, ', '.join(args)) if self.call_kind == 'Func': - res.append(indent + " 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(indent + " " + call + ";") if self.call_kind != 'Blck': @@ -156,14 +156,14 @@ class Simcall(object): 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 */') + 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))) - res.append(' return simcall<%s%s>(SIMCALL_%s%s);' % ( + res.append(' return simcall<%s%s>(Simcall::%s%s);' % ( self.res.rettype(), "".join([", " + arg.rettype() for i, arg in enumerate(self.args)]), self.name.upper(), @@ -178,8 +178,7 @@ class Simcall(object): self.name, ''.join(', %s %s' % (arg.rettype(), arg.name) for i, arg in enumerate(self.args))) - else: - return "" + return "" def parse(fn): @@ -230,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-2019. 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 @@ -293,19 +281,24 @@ if __name__ == '__main__': fd.close() # - # popping_enum.h + # popping_enum.hpp # - fd = header("popping_enum.h") + fd = header("popping_enum.hpp") + fd.write('namespace simgrid {\n') + fd.write('namespace simix {\n') fd.write('/**\n') fd.write(' * @brief All possible simcalls.\n') fd.write(' */\n') - fd.write('typedef enum {\n') - fd.write(' SIMCALL_NONE,\n') + fd.write('enum class Simcall {\n') + fd.write(' NONE,\n') handle(fd, Simcall.enum, simcalls, simcalls_dict) - fd.write(' NUM_SIMCALLS\n') - fd.write('} e_smx_simcall_t;\n') + fd.write('};\n') + fd.write('\n') + fd.write('constexpr int NUM_SIMCALLS = ' + str(1 + len(simcalls)) + ';\n') + fd.write('} // namespace simix\n') + fd.write('} // namespace simgrid\n') fd.close() # @@ -314,46 +307,48 @@ 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( - '/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n') - fd.write('const char* simcall_names[] = {\n') + fd.write('using simgrid::simix::Simcall;') + fd.write('\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') + fd.write(' "Simcall::NONE",\n') handle(fd, Simcall.string, simcalls, simcalls_dict) - fd.write('};\n\n') + 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_->iwannadie)\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') + 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(' case Simcall::NONE:\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') @@ -368,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') @@ -379,19 +375,20 @@ if __name__ == '__main__': fd.write(''' XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); +using simgrid::simix::Simcall; + template -inline static R simcall(e_smx_simcall_t call, T const&... t) +inline static R simcall(Simcall call, T const&... t) { - smx_actor_t self = SIMIX_process_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_); + auto self = simgrid::kernel::actor::ActorImpl::self(); + simgrid::simix::marshal(&self->simcall_, call, t...); + 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); } - return simgrid::simix::unmarshal(self->simcall.result_); + return simgrid::simix::unmarshal(self->simcall_.result_); } ''') handle(fd, Simcall.body, simcalls, simcalls_dict)