#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (c) 2014-2018. 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.
fd.write(
'/* change simcalls specification in src/simix/simcalls.in */\n')
fd.write(
- '/* Copyright (c) 2014-2018. 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('#include "src/mc/mc_forward.hpp"\n')
fd.write('#endif\n')
fd.write('#include "src/kernel/activity/ConditionVariableImpl.hpp"\n')
- fd.write('#include "src/simix/smx_host_private.hpp"\n')
- fd.write('#include "src/simix/smx_synchro_private.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 = header('popping_bodies.cpp')
fd.write('#include "smx_private.hpp"\n')
fd.write('#include "src/mc/mc_forward.hpp"\n')
- fd.write('#include "src/simix/smx_synchro_private.hpp"\n')
fd.write('#include "xbt/ex.h"\n')
fd.write('#include <functional>\n')
fd.write('#include <simgrid/simix.hpp>\n')
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);
}