iox-eclipse-iceoryx#2130 Move 'sync' types from 'iceoryx_dust' to 'ic…

…eoryx_hoofs'
EgorWeders · Dec 12, 2023 · 726128f · 726128f
1 parent 28908d6
commit 726128f
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 28 deletions.
diff --git a/iceoryx_dust/BUILD.bazel b/iceoryx_dust/BUILD.bazel
@@ -17,31 +17,14 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:configure_file.bzl", "configure_file")
 
-configure_file(
-    name = "iceoryx_dust_deployment_hpp",
-    src = "cmake/iceoryx_dust_deployment.hpp.in",
-    out = "generated/include/iox/iceoryx_dust_deployment.hpp",
-    config = {
-        "IOX_MAX_NAMED_PIPE_MESSAGE_SIZE": "4096",
-        "IOX_MAX_NAMED_PIPE_NUMBER_OF_MESSAGES": "10",
-    },
-)
-
 cc_library(
     name = "iceoryx_dust",
     srcs = glob([
         "cli/source/**/*.cpp",
-        "posix/sync/source/**/*.cpp",
     ]),
-    hdrs = glob(["cli/**"]) + glob(["memory/**"]) + glob(["utility/**"]) + glob(["posix/ipc/**"]) + glob(["posix/sync/**"]) + [
-        ":iceoryx_dust_deployment_hpp",
-    ],
+    hdrs = glob(["cli/**"]) +
     includes = [
         "cli/include/",
-        "generated/include/",
-        "memory/include/",
-        "posix/sync/include/",
-        "utility/include/",
     ],
     visibility = ["//visibility:public"],
     deps = ["//iceoryx_hoofs"],

diff --git a/iceoryx_dust/CMakeLists.txt b/iceoryx_dust/CMakeLists.txt
@@ -45,20 +45,14 @@ iox_add_library(
     PRIVATE_LIBS_LINUX          ${CODE_COVERAGE_LIBS}
     PUBLIC_LIBS                 iceoryx_hoofs::iceoryx_hoofs
     BUILD_INTERFACE             ${PROJECT_SOURCE_DIR}/cli/include
-                                ${PROJECT_SOURCE_DIR}/posix/sync/include
-                                ${PROJECT_SOURCE_DIR}/utility/include
-                                ${CMAKE_BINARY_DIR}/generated/iceoryx_dust/include
     INSTALL_INTERFACE           include/${PREFIX}
     EXPORT_INCLUDE_DIRS         cli/include/
-                                posix/sync/include/
-                                utility/include/
     FILES
         cli/source/arguments.cpp
         cli/source/command_line_parser.cpp
         cli/source/option.cpp
         cli/source/option_definition.cpp
         cli/source/option_manager.cpp
-        posix/sync/source/signal_watcher.cpp
 )
 
 #

diff --git a/iceoryx_dust/README.md b/iceoryx_dust/README.md
@@ -10,5 +10,4 @@ grouped together in categories or namespace, depending on where or how they are
 | class/file            | description                                                                                                                                                                                                                                                                                                           |
 |:---------------------:|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 |`FileReader`           | Wrapper for opening files and reading them.                                                                                                                                                                                                                                                                           |
-|`SignalWatcher`        | Batteries included signal handling with polling and optional blocking wait for `SIGINT` and `SIGTERM`.                                                                                                                                                                                                                |
 |`serialization`        | Implements a simple serialization concept for classes based on the idea presented here [ISOCPP serialization](https://isocpp.org/wiki/faq/serialization#serialize-text-format).                                                                                                                                       |
diff --git a/iceoryx_hoofs/CMakeLists.txt b/iceoryx_hoofs/CMakeLists.txt
@@ -127,6 +127,7 @@ iox_add_library(
         posix/sync/source/mutex.cpp
         posix/sync/source/named_semaphore.cpp
         posix/sync/source/signal_handler.cpp
+        posix/sync/source/signal_watcher.cpp
         posix/sync/source/semaphore_interface.cpp
         posix/sync/source/thread.cpp
         posix/sync/source/unnamed_semaphore.cpp

diff --git a/iceoryx_hoofs/README.md b/iceoryx_hoofs/README.md
@@ -139,6 +139,7 @@ The module structure is a logical grouping. It is replicated for `concurrent` an
 |`NamedSemaphore`       |          | Named semaphore interface, see [ManPage sem_overview](https://man7.org/linux/man-pages/man7/sem_overview.7.html)                                                                                                                      |
 |`thread`               |          | Heap-less replacement for `std::thread`.                                                                                                                                                                                              |
 |`SignalGuard`          |          | Helper class for signal handler registration.                                                                                                                                                                                         |
+|`SignalWatcher`        |          | Batteries included signal handling with polling and optional blocking wait for `SIGINT` and `SIGTERM`.                                                                                                                                                                                                                |
 
 ### Generalized design patterns & abstractions (design)
 

diff --git a/...posix/sync/include/iox/signal_watcher.hpp → ...posix/sync/include/iox/signal_watcher.hpp b/...posix/sync/include/iox/signal_watcher.hpp → ...posix/sync/include/iox/signal_watcher.hpp
@@ -13,8 +13,9 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_DUST_POSIX_WRAPPER_SIGNAL_WATCHER_HPP
-#define IOX_DUST_POSIX_WRAPPER_SIGNAL_WATCHER_HPP
+
+#ifndef IOX_HOOFS_POSIX_WRAPPER_SIGNAL_WATCHER_HPP
+#define IOX_HOOFS_POSIX_WRAPPER_SIGNAL_WATCHER_HPP
 
 #include "iox/optional.hpp"
 #include "iox/signal_handler.hpp"
@@ -82,4 +83,4 @@ void waitForTerminationRequest() noexcept;
 bool hasTerminationRequested() noexcept;
 } // namespace iox
 
-#endif
+#endif // IOX_HOOFS_POSIX_WRAPPER_SIGNAL_WATCHER_HPP
diff --git a/...dust/posix/sync/source/signal_watcher.cpp → ...oofs/posix/sync/source/signal_watcher.cpp b/...dust/posix/sync/source/signal_watcher.cpp → ...oofs/posix/sync/source/signal_watcher.cpp
diff --git a/...etests/test_posix_sync_signal_watcher.cpp → ...etests/test_posix_sync_signal_watcher.cpp b/...etests/test_posix_sync_signal_watcher.cpp → ...etests/test_posix_sync_signal_watcher.cpp