#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (c) 2014-2019. The SimGrid Team. All rights reserved.
+# Copyright (c) 2014-2020. 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.
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]
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
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 = []
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':
- res.append(indent + ' SIMIX_simcall_answer(simcall);')
+ res.append(indent + ' simcall_answer();')
res.append(indent + ' break;')
res.append('')
return '\n'.join(res)
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(["&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)))
- 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(),
self.name,
''.join(', %s %s' % (arg.rettype(), arg.name)
for i, arg in enumerate(self.args)))
- else:
- return ""
+ return ""
def parse(fn):
fd.write(
'/* change simcalls specification in src/simix/simcalls.in */\n')
fd.write(
- '/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. */\n')
+ '/* Copyright (c) 2014-2020. The SimGrid Team. All rights reserved. */\n')
fd.write(
'/**********************************************************************/\n\n')
fd.write('/*\n')
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()
#
fd = header("popping_generated.cpp")
fd.write('#include "smx_private.hpp"\n')
+ fd.write('#include <simgrid/host.h>\n')
fd.write('#include <xbt/base.h>\n')
fd.write('#if SIMGRID_HAVE_MC\n')
fd.write('#include "src/mc/mc_forward.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('const char* simcall_names[] = {\n')
+ fd.write('constexpr std::array<const char*, simgrid::simix::NUM_SIMCALLS> 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(
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')
- fd.write(' SIMCALL_SET_MC_VALUE(simcall, value);\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_->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(' 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->get_host()));\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')
fd.write(' default:\n')
fd.write(' THROW_IMPOSSIBLE;\n')
fd.write(' }\n')
fd.write('''
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
+using simgrid::simix::Simcall;
+
template<class R, class... T>
-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_process) {
- XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->get_cname(), SIMIX_simcall_name(self->simcall.call),
- (int)self->simcall.call);
+ 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_);
self->yield();
} else {
- SIMIX_simcall_handle(&self->simcall, 0);
+ self->simcall_handle(0);
}
- return simgrid::simix::unmarshal<R>(self->simcall.result);
+ return simgrid::simix::unmarshal<R>(self->simcall_.result_);
}
''')
handle(fd, Simcall.body, simcalls, simcalls_dict)