From 2effc173a50996c2b8c3885e2fa8b09c9c6cc144 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 23 Oct 2022 22:08:48 +0200 Subject: [PATCH] Change public NetworkModelIntf.hpp into private NetworkModelFactors.hpp - This will soon become a Trait dedicated to the handling of factors --- MANIFEST.in | 4 ++-- src/kernel/resource/NetworkModel.cpp | 5 ----- src/kernel/resource/NetworkModel.hpp | 2 +- .../kernel/resource/NetworkModelFactors.hpp | 4 ++-- ...etworkModelIntf_test.cpp => NetworkModelFactors_test.cpp} | 2 +- tools/cmake/DefinePackages.cmake | 2 +- tools/cmake/Tests.cmake | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) rename include/simgrid/kernel/resource/NetworkModelIntf.hpp => src/kernel/resource/NetworkModelFactors.hpp (93%) rename src/kernel/resource/{NetworkModelIntf_test.cpp => NetworkModelFactors_test.cpp} (97%) diff --git a/MANIFEST.in b/MANIFEST.in index 2406d6f7a1..8d2e301cf8 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2008,7 +2008,6 @@ include include/simgrid/kernel/ProfileBuilder.hpp include include/simgrid/kernel/Timer.hpp include include/simgrid/kernel/resource/Action.hpp include include/simgrid/kernel/resource/Model.hpp -include include/simgrid/kernel/resource/NetworkModelIntf.hpp include include/simgrid/kernel/routing/ClusterZone.hpp include include/simgrid/kernel/routing/DijkstraZone.hpp include include/simgrid/kernel/routing/DragonflyZone.hpp @@ -2246,7 +2245,8 @@ include src/kernel/resource/LinkImpl.hpp include src/kernel/resource/Model.cpp include src/kernel/resource/NetworkModel.cpp include src/kernel/resource/NetworkModel.hpp -include src/kernel/resource/NetworkModelIntf_test.cpp +include src/kernel/resource/NetworkModelFactors.hpp +include src/kernel/resource/NetworkModelFactors_test.cpp include src/kernel/resource/Resource.hpp include src/kernel/resource/SplitDuplexLinkImpl.cpp include src/kernel/resource/SplitDuplexLinkImpl.hpp diff --git a/src/kernel/resource/NetworkModel.cpp b/src/kernel/resource/NetworkModel.cpp index 69dd1dcecd..8341a7a040 100644 --- a/src/kernel/resource/NetworkModel.cpp +++ b/src/kernel/resource/NetworkModel.cpp @@ -13,9 +13,6 @@ #include -#ifndef NETWORK_INTERFACE_CPP_ -#define NETWORK_INTERFACE_CPP_ - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, that fuel communications"); /********* @@ -138,5 +135,3 @@ void insert_link_latency(std::vector& result, const std::vect } } // namespace simgrid::kernel::resource - -#endif /* NETWORK_INTERFACE_CPP_ */ diff --git a/src/kernel/resource/NetworkModel.hpp b/src/kernel/resource/NetworkModel.hpp index 515c0efdbe..73de86341c 100644 --- a/src/kernel/resource/NetworkModel.hpp +++ b/src/kernel/resource/NetworkModel.hpp @@ -7,7 +7,7 @@ #define SIMGRID_KERNEL_RESOURCE_NETWORKMODEL_HPP #include "simgrid/kernel/resource/Model.hpp" -#include "simgrid/kernel/resource/NetworkModelIntf.hpp" +#include "src/kernel/resource/NetworkModelFactors.hpp" #include "src/kernel/resource/StandardLinkImpl.hpp" #include diff --git a/include/simgrid/kernel/resource/NetworkModelIntf.hpp b/src/kernel/resource/NetworkModelFactors.hpp similarity index 93% rename from include/simgrid/kernel/resource/NetworkModelIntf.hpp rename to src/kernel/resource/NetworkModelFactors.hpp index ee1c446c59..407b31bc8c 100644 --- a/include/simgrid/kernel/resource/NetworkModelIntf.hpp +++ b/src/kernel/resource/NetworkModelFactors.hpp @@ -3,8 +3,8 @@ /* 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 SIMGRID_KERNEL_RESOURCE_NETWORKMODELINTF_HPP -#define SIMGRID_KERNEL_RESOURCE_NETWORKMODELINTF_HPP +#ifndef SIMGRID_KERNEL_RESOURCE_NETWORKMODELFACTORS_HPP +#define SIMGRID_KERNEL_RESOURCE_NETWORKMODELFACTORS_HPP #include diff --git a/src/kernel/resource/NetworkModelIntf_test.cpp b/src/kernel/resource/NetworkModelFactors_test.cpp similarity index 97% rename from src/kernel/resource/NetworkModelIntf_test.cpp rename to src/kernel/resource/NetworkModelFactors_test.cpp index 5574eaa970..ffb7897521 100644 --- a/src/kernel/resource/NetworkModelIntf_test.cpp +++ b/src/kernel/resource/NetworkModelFactors_test.cpp @@ -5,10 +5,10 @@ #include "catch.hpp" -#include "simgrid/kernel/resource/NetworkModelIntf.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" #include "src/internal_config.h" // HAVE_SMPI +#include "src/kernel/resource/NetworkModelFactors.hpp" static double factor_cb(double, const simgrid::s4u::Host*, const simgrid::s4u::Host*, const std::vector&, const std::unordered_set&) diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 60c15b50dd..723d2f48b2 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -18,6 +18,7 @@ set(EXTRA_DIST src/kernel/actor/Simcall.hpp src/kernel/resource/LinkImpl.hpp src/kernel/resource/NetworkModel.hpp + src/kernel/resource/NetworkModelFactors.hpp src/kernel/resource/SplitDuplexLinkImpl.hpp src/kernel/resource/StandardLinkImpl.hpp src/kernel/resource/WifiLinkImpl.hpp @@ -708,7 +709,6 @@ set(headers_to_install include/simgrid/s4u.hpp include/simgrid/kernel/resource/Action.hpp - include/simgrid/kernel/resource/NetworkModelIntf.hpp include/simgrid/kernel/resource/Model.hpp include/simgrid/kernel/routing/ClusterZone.hpp diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index c6d4aa0a54..4ded9f1cd9 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -123,7 +123,7 @@ ENDIF() # New tests should use the Catch Framework set(UNIT_TESTS src/xbt/unit-tests_main.cpp - src/kernel/resource/NetworkModelIntf_test.cpp + src/kernel/resource/NetworkModelFactors_test.cpp src/kernel/resource/SplitDuplexLinkImpl_test.cpp src/kernel/resource/profile/Profile_test.cpp src/kernel/routing/DijkstraZone_test.cpp -- 2.20.1