X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/340cf8df326e4bbb67c046172f8a73eecc6a3583..ab9a2d2c7dca2b08750d70ef5769fc2c14350ab6:/src/mc/mc_smx.h diff --git a/src/mc/mc_smx.h b/src/mc/mc_smx.h index 6db9ae4a82..609807ca19 100644 --- a/src/mc/mc_smx.h +++ b/src/mc/mc_smx.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2015-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. */ @@ -10,8 +9,6 @@ #include #include -#include -#include #include #include @@ -19,7 +16,7 @@ #include "src/smpi/private.h" #include "src/mc/Process.hpp" -#include "src/mc/mc_protocol.h" +#include "src/mc/remote/mc_protocol.h" /** @file * @brief (Cross-process, MCer/MCed) Access to SMX structures @@ -43,12 +40,6 @@ SG_BEGIN_DECL() -typedef struct s_mc_smx_process_info s_mc_smx_process_info_t, *mc_smx_process_info_t; - -XBT_PRIVATE xbt_dynar_t MC_smx_process_info_list_new(void); - -XBT_PRIVATE void MC_process_smx_refresh(simgrid::mc::Process* process); - /** Get the issuer of a simcall (`req->issuer`) * * In split-process mode, it does the black magic necessary to get an address @@ -58,22 +49,13 @@ XBT_PRIVATE void MC_process_smx_refresh(simgrid::mc::Process* process); * @param process the MCed process * @param req the simcall (copied in the local process) */ -XBT_PRIVATE smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req); +XBT_PRIVATE smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req); -XBT_PRIVATE const char* MC_smx_process_get_name(smx_process_t p); -XBT_PRIVATE const char* MC_smx_process_get_host_name(smx_process_t p); +XBT_PRIVATE const char* MC_smx_actor_get_name(smx_actor_t p); +XBT_PRIVATE const char* MC_smx_actor_get_host_name(smx_actor_t p); XBT_PRIVATE int MC_smpi_process_count(void); - -/* ***** Resolve (local/MCer structure from remote/MCed addresses) ***** */ - -/** Get a local copy of the process from the process remote address */ -XBT_PRIVATE smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address); - -/** Get the process info structure from the process remote address */ -XBT_PRIVATE mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_address); - XBT_PRIVATE unsigned long MC_smx_get_maxpid(void); SG_END_DECL()