X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4aea7e49e47243417f094ee62b8e43de066e56d2..a92d7b716f51a53dea7f59db8524d4add713b910:/src/simix/smx_host_private.h diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h index 0db9188999..91149d1479 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMIX_HOST_PRIVATE_H -#define _SIMIX_HOST_PRIVATE_H +#ifndef SIMIX_HOST_PRIVATE_H +#define SIMIX_HOST_PRIVATE_H #include #include @@ -16,8 +15,7 @@ #include "simgrid/simix.h" #include "popping_private.h" -#include "simgrid/s4u/VirtualMachine.hpp" -#include "src/kernel/activity/SynchroExec.hpp" +#include "src/kernel/activity/ExecImpl.hpp" /** @brief Host datatype from SIMIX POV */ namespace simgrid { @@ -39,11 +37,8 @@ namespace simgrid { }; } } -typedef simgrid::simix::Host s_smx_host_priv_t; SG_BEGIN_DECL() -XBT_PRIVATE void _SIMIX_host_free_process_arg(void *); - XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host, const char *name, std::function code, @@ -62,7 +57,7 @@ XBT_PRIVATE void SIMIX_execution_cancel(smx_activity_t synchro); XBT_PRIVATE void SIMIX_execution_set_priority(smx_activity_t synchro, double priority); XBT_PRIVATE void SIMIX_execution_set_bound(smx_activity_t synchro, double bound); -XBT_PRIVATE void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec); +XBT_PRIVATE void SIMIX_execution_finish(simgrid::kernel::activity::ExecImpl* exec); XBT_PRIVATE void SIMIX_set_category(smx_activity_t synchro, const char *category);