From 0c9455527c48f9bf981d278f65cb179052ebe9df Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 3 Apr 2018 14:58:34 +0200 Subject: [PATCH] Kill useless typedefs routing_NetPoint and sg_netpoint_t. --- include/simgrid/forward.h | 4 ---- include/simgrid/kernel/routing/NetPoint.hpp | 2 +- src/instr/instr_interface.cpp | 4 ++-- src/instr/instr_paje_containers.hpp | 4 ++-- src/kernel/routing/FloydZone.cpp | 5 ++--- src/s4u/s4u_netzone.cpp | 6 +++--- src/surf/xml/platf_private.hpp | 10 +++++----- 7 files changed, 15 insertions(+), 20 deletions(-) diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 0b77f998c6..4f75329884 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -91,7 +91,6 @@ typedef simgrid::s4u::Storage s4u_Storage; typedef simgrid::s4u::NetZone s4u_NetZone; typedef simgrid::s4u::VirtualMachine s4u_VM; typedef boost::intrusive_ptr smx_activity_t; -typedef simgrid::kernel::routing::NetPoint routing_NetPoint; typedef simgrid::trace_mgr::trace tmgr_Trace; typedef simgrid::kernel::context::Context* smx_context_t; @@ -113,7 +112,6 @@ typedef struct s4u_Storage s4u_Storage; typedef struct s4u_NetZone s4u_NetZone; typedef struct s4u_VM s4u_VM; typedef struct kernel_Activity* smx_activity_t; -typedef struct routing_NetPoint routing_NetPoint; typedef struct Trace tmgr_Trace; typedef struct s_smx_context* smx_context_t; @@ -132,8 +130,6 @@ typedef s4u_File* sg_file_t; typedef s4u_VM* sg_vm_t; typedef s4u_Actor* sg_actor_t; -typedef routing_NetPoint* sg_netpoint_t; - typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */ typedef struct s_smx_simcall* smx_simcall_t; diff --git a/include/simgrid/kernel/routing/NetPoint.hpp b/include/simgrid/kernel/routing/NetPoint.hpp index cfcd311369..94c0dd3994 100644 --- a/include/simgrid/kernel/routing/NetPoint.hpp +++ b/include/simgrid/kernel/routing/NetPoint.hpp @@ -54,6 +54,6 @@ private: } // namespace kernel } // namespace simgrid -XBT_PUBLIC sg_netpoint_t sg_netpoint_by_name_or_null(const char* name); +XBT_PUBLIC simgrid::kernel::routing::NetPoint* sg_netpoint_by_name_or_null(const char* name); #endif /* KERNEL_ROUTING_NETPOINT_HPP_ */ diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 7e675121d1..c5ff45cddf 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -297,11 +297,11 @@ static void instr_user_variable(double time, const char* resource, const char* v static void instr_user_srcdst_variable(double time, const char *src, const char *dst, const char *variable, const char *father_type, double value, InstrUserVariable what) { - sg_netpoint_t src_elm = sg_netpoint_by_name_or_null(src); + simgrid::kernel::routing::NetPoint* src_elm = sg_netpoint_by_name_or_null(src); if (not src_elm) xbt_die("Element '%s' not found!",src); - sg_netpoint_t dst_elm = sg_netpoint_by_name_or_null(dst); + simgrid::kernel::routing::NetPoint* dst_elm = sg_netpoint_by_name_or_null(dst); if (not dst_elm) xbt_die("Element '%s' not found!",dst); diff --git a/src/instr/instr_paje_containers.hpp b/src/instr/instr_paje_containers.hpp index cada386a35..0106898bf0 100644 --- a/src/instr/instr_paje_containers.hpp +++ b/src/instr/instr_paje_containers.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-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. */ @@ -26,7 +26,7 @@ public: Type* type_; /* Type of this container */ Container* father_; std::map children_; - sg_netpoint_t netpoint_ = nullptr; + kernel::routing::NetPoint* netpoint_ = nullptr; static Container* byNameOrNull(std::string name); static Container* byName(std::string name); diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index c6ace477f3..f1b25bed25 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -66,7 +66,7 @@ void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route->gw_dst = route_stack.front()->gw_dst; } - sg_netpoint_t prev_dst_gw = nullptr; + NetPoint* prev_dst_gw = nullptr; while (not route_stack.empty()) { RouteCreationArgs* e_route = route_stack.back(); route_stack.pop_back(); @@ -85,8 +85,7 @@ void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* } } -void FloydZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, - kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, +void FloydZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, std::vector& link_list, bool symmetrical) { /* set the size of table routing */ diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp index f15347bdfe..09a00f48cd 100644 --- a/src/s4u/s4u_netzone.cpp +++ b/src/s4u/s4u_netzone.cpp @@ -104,9 +104,9 @@ int NetZone::addComponent(kernel::routing::NetPoint* elm) return vertices_.size() - 1; // The rank of the newly created object } -void NetZone::add_route(sg_netpoint_t /*src*/, sg_netpoint_t /*dst*/, sg_netpoint_t /*gw_src*/, - sg_netpoint_t /*gw_dst*/, std::vector& /*link_list*/, - bool /*symmetrical*/) +void NetZone::add_route(kernel::routing::NetPoint* /*src*/, kernel::routing::NetPoint* /*dst*/, + kernel::routing::NetPoint* /*gw_src*/, kernel::routing::NetPoint* /*gw_dst*/, + std::vector& /*link_list*/, bool /*symmetrical*/) { xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_.c_str()); } diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 39b93d2490..2004447b91 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -73,11 +73,11 @@ public: class RouteCreationArgs { public: - bool symmetrical = false; - sg_netpoint_t src = nullptr; - sg_netpoint_t dst = nullptr; - sg_netpoint_t gw_src = nullptr; - sg_netpoint_t gw_dst = nullptr; + bool symmetrical = false; + NetPoint* src = nullptr; + NetPoint* dst = nullptr; + NetPoint* gw_src = nullptr; + NetPoint* gw_dst = nullptr; std::vector link_list; }; -- 2.20.1