Commit e29108b2 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Rename rpcs.[ch]pp to public.[ch]pp 

Also, rpc definitions have now moved into the `src/rpc` folder and have
their own CMake target
parent ee89ffec

src/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ add_subdirectory(config) 
add_subdirectory(utils)

add_subdirectory(logger)

add_subdirectory(network)

add_subdirectory(rpcs)



# scord daemon

add_executable(scord server.cpp scord.cpp)

src/network/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ add_library(network_engine STATIC) 
target_sources(

  network_engine

  INTERFACE engine.hpp

  PRIVATE rpcs.hpp rpcs.cpp detail/address.hpp

  PRIVATE detail/address.hpp

)



target_include_directories(network_engine INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

target_link_libraries(

  network_engine PUBLIC logger transport_library Mercury::Mercury

  network_engine PUBLIC rpcs logger transport_library Mercury::Mercury

                        Argobots::Argobots Margo::Margo

)

set_property(TARGET network_engine PROPERTY POSITION_INDEPENDENT_CODE ON)

src/network/engine.hpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <logger.hpp>

#include <utility>

#include <detail/address.hpp>

#include "rpcs.hpp"

#include "public.hpp"





namespace scord::network {

src/rpcs/CMakeLists.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
################################################################################

# Copyright 2021-2022, Barcelona Supercomputing Center (BSC), Spain            #

#                                                                              #

# This software was partially supported by the EuroHPC-funded project ADMIRE   #

#   (Project ID: 956748, https://www.admire-eurohpc.eu).                       #

#                                                                              #

# This file is part of scord.                                                  #

#                                                                              #

# scord is free software: you can redistribute it and/or modify                #

# it under the terms of the GNU General Public License as published by         #

# the Free Software Foundation, either version 3 of the License, or            #

# (at your option) any later version.                                          #

#                                                                              #

# scord is distributed in the hope that it will be useful,                     #

# but WITHOUT ANY WARRANTY; without even the implied warranty of               #

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #

# GNU General Public License for more details.                                 #

#                                                                              #

# You should have received a copy of the GNU General Public License            #

# along with scord.  If not, see <https://www.gnu.org/licenses/>.              #

#                                                                              #

# SPDX-License-Identifier: GPL-3.0-or-later                                    #

################################################################################



add_library(rpcs STATIC)

target_sources(rpcs

  PRIVATE public.cpp public.hpp)



target_include_directories(rpcs INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

target_link_libraries(rpcs PUBLIC logger Margo::Margo)

set_property(TARGET rpcs PROPERTY POSITION_INDEPENDENT_CODE ON)

src/network/rpcs.cpp→src/rpcs/public.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * SPDX-License-Identifier: GPL-3.0-or-later

 *****************************************************************************/



#include "rpcs.hpp"

#include "public.hpp"



static void

ADM_ping(hg_handle_t h) {