From 38e43236966d7844577474360e1db66f194f9c19 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 3 Apr 2018 13:53:19 +0200 Subject: [PATCH] Kill useless typedef s_smx_simcall_t. --- include/simgrid/forward.h | 1 - src/mc/mc_smx.cpp | 2 +- src/mc/mc_smx.hpp | 4 ++-- src/mc/mc_state.hpp | 6 +++--- src/simix/ActorImpl.hpp | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index e4ebfaf87f..0b77f998c6 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -136,7 +136,6 @@ typedef routing_NetPoint* sg_netpoint_t; typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */ -typedef struct s_smx_simcall s_smx_simcall_t; typedef struct s_smx_simcall* smx_simcall_t; typedef enum { // FIXME: move this to s4u::Link; make it an enum class diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index c270a90ec1..7191cb4001 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -96,7 +96,7 @@ void RemoteClient::refresh_simix() * @param process the MCed process * @param req the simcall (copied in the local process) */ -smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req) +smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall const* req) { xbt_assert(mc_model_checker != nullptr); diff --git a/src/mc/mc_smx.hpp b/src/mc/mc_smx.hpp index cebb749f94..19e76fc95b 100644 --- a/src/mc/mc_smx.hpp +++ b/src/mc/mc_smx.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2018. 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. */ @@ -39,7 +39,7 @@ extern "C" { * @param process the MCed process * @param req the simcall (copied in the local process) */ -XBT_PRIVATE smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req); +XBT_PRIVATE smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall const* req); 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); diff --git a/src/mc/mc_state.hpp b/src/mc/mc_state.hpp index d14e7fd9d4..11dcca64ed 100644 --- a/src/mc/mc_state.hpp +++ b/src/mc/mc_state.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -106,14 +106,14 @@ public: Transition transition; /** The simcall which was executed, going out of that state */ - s_smx_simcall_t executed_req; + s_smx_simcall executed_req; /* Internal translation of the executed_req simcall * * SIMCALL_COMM_TESTANY is translated to a SIMCALL_COMM_TEST * and SIMCALL_COMM_WAITANY to a SIMCALL_COMM_WAIT. */ - s_smx_simcall_t internal_req; + s_smx_simcall internal_req; /* Can be used as a copy of the remote synchro object */ simgrid::mc::Remote internal_comm; diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index 7fb9ab50f2..f0fc0bc8ad 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/simix/ActorImpl.hpp @@ -70,7 +70,7 @@ public: smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */ std::list comms; /* the current non-blocking communication synchros */ - s_smx_simcall_t simcall; + s_smx_simcall simcall; void* userdata = nullptr; /* kept for compatibility, it should be replaced with moddata */ std::vector on_exit; /* list of functions executed when the process dies */ -- 2.20.1