#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (c) 2014-2017. The SimGrid Team. All rights reserved.
+# Copyright (c) 2014-2019. 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(object):
def rettype(self):
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
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, ', '.
- join('%s %s' % (arg.rettype(), arg.name) for arg in self.args)))
+ join('%s %s' % (arg.rettype(), arg.name) for arg in self.args)))
print ('{')
print (' return simcall_BODY_%s(%s);' % (self.name, "..."))
print ('}')
# 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('../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()))
+ 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, ''.
- join(', %s %s' % (arg.rettype(), arg.name)for arg in self.args)))
+ 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)
+ 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 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]
def case(self):
res = []
- args = [ "simgrid::simix::unmarshal<%s>(simcall->args[%d])" % (arg.rettype(), i)
- for i, arg in enumerate(self.args) ]
+ args = ["simgrid::simix::unmarshal<%s>(simcall->args[%d])" % (arg.rettype(), i)
+ for i, arg in enumerate(self.args)]
res.append('case SIMCALL_%s:' % (self.name.upper()))
if self.need_handler:
call = "simcall_HANDLER_%s(simcall%s%s)" % (self.name,
- ", " if len(args) > 0 else "",
- ', '.join(args))
+ ", " if len(args) > 0 else "",
+ ', '.join(args))
else:
call = "SIMIX_%s(%s)" % (self.name, ', '.join(args))
if self.call_kind == 'Func':
res.append(" simgrid::simix::marshal<%s>(simcall->result, %s);" % (self.res.rettype(), call))
else:
- res.append(" " + call + ";");
+ res.append(" " + call + ";")
if self.call_kind != 'Blck':
res.append(' SIMIX_simcall_answer(simcall);')
res.append(' break;')
res = ['']
res.append(
'inline static %s simcall_BODY_%s(%s)' % (self.res.rettype(),
- self.name,
- ', '.join('%s %s' % (arg.rettype(), arg.name) for arg in self.args)))
+ 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 */')
if self.need_handler:
', '.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)))
+ ', '.join(arg.name for arg in self.args)))
res.append(' return simcall<%s%s>(SIMCALL_%s%s);' % (
self.res.rettype(),
- "".join([ ", " + arg.rettype() for i, arg in enumerate(self.args) ]),
+ "".join([", " + arg.rettype() for i, arg in enumerate(self.args)]),
self.name.upper(),
- "".join([ ", " + arg.name for i, arg in enumerate(self.args) ])
- ));
+ "".join([", " + arg.name for i, arg in enumerate(self.args)])
+ ))
res.append('}')
return '\n'.join(res)
continue
match = re.match(
r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)
- assert match, line
+ if not match:
+ raise AssertionError(line)
ret, name, args, attrs = match.groups()
sargs = []
if not re.match(r"^\s*$", args):
elif attr == "nohandler":
handler = False
else:
- assert False, "Unknown attribute %s in: %s" % (attr, line)
+ 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)
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-2019. The SimGrid Team. All rights reserved. */\n')
fd.write(
'/**********************************************************************/\n\n')
fd.write('/*\n')
fd.write('\n'.join(func(simcall) for simcall in ll))
fd.write('\n#endif\n')
+
if __name__ == '__main__':
simcalls, simcalls_dict = parse('simcalls.in')
ok &= all(map(Simcall.check, simcalls))
for k, v in simcalls_dict.items():
ok &= all(map(Simcall.check, v))
- # FIXME: we should not hide it
- # if not ok:
- # print ("Some checks fail!")
- # sys.exit(1)
+ if not ok:
+ print ("Some checks fail!")
+ sys.exit(1)
#
# popping_accessors.hpp
#
fd = header('popping_accessors.hpp')
- fd.write('#include "src/simix/popping_private.hpp"');
+ fd.write('#include "src/simix/popping_private.hpp"')
handle(fd, Simcall.accessors, simcalls, simcalls_dict)
fd.write(
"\n\n/* The prototype of all simcall handlers, automatically generated for you */\n\n")
handle(fd, Simcall.enum, simcalls, simcalls_dict)
+ fd.write('\n')
fd.write(' NUM_SIMCALLS\n')
fd.write('} e_smx_simcall_t;\n')
fd.close()
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('\n')
fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\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 && simcall->call != SIMCALL_PROCESS_CLEANUP)\n')
+ ' if (simcall->issuer->context_->iwannadie)\n')
fd.write(' return;\n')
fd.write(' switch (simcall->call) {\n')
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(' break;\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(' default:\n')
fd.write(' THROW_IMPOSSIBLE;\n')
fd.write(' }\n')
fd.write('#include "xbt/ex.h"\n')
fd.write('#include <functional>\n')
fd.write('#include <simgrid/simix.hpp>\n')
+ fd.write('#include <xbt/log.h>\n')
+
fd.write("/** @cond */ // Please Doxygen, don't look at this\n")
fd.write('''
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
+
template<class R, class... T>
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);
- SIMIX_process_yield(self);
+ 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);
}
}
''')
handle(fd, Simcall.body, simcalls, simcalls_dict)
- fd.write(" /** @endcond */\n");
+ fd.write(" /** @endcond */\n")
fd.close()
