core: rearranged io source folder (#1265)

eclipse-ecal · Nov 22, 2023 · 0464efa · 0464efa
1 parent e406c3b
commit 0464efa
Show file tree

Hide file tree

Showing 74 changed files with 231 additions and 244 deletions.
diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
diff --git a/ecal/core/src/ecal_globals.cpp b/ecal/core/src/ecal_globals.cpp
@@ -22,7 +22,7 @@
 **/
 
 #include "ecal_globals.h"
-#include "io/udp_init.h"
+#include "io/udp/udp_init.h"
 #include "ecal_config_reader.h"
 
 #include <stdexcept>

diff --git a/ecal/core/src/ecal_globals.h b/ecal/core/src/ecal_globals.h
@@ -34,8 +34,8 @@
 #include "pubsub/ecal_subgate.h"
 #include "service/ecal_servicegate.h"
 #include "service/ecal_clientgate.h"
-#include "io/ecal_memfile_pool.h"
-#include "io/ecal_memfile_db.h"
+#include "io/shm/ecal_memfile_pool.h"
+#include "io/shm/ecal_memfile_db.h"
 
 #include <memory>
 

diff --git a/ecal/core/src/ecal_log_impl.cpp b/ecal/core/src/ecal_log_impl.cpp
@@ -26,7 +26,7 @@
 #include <ecal/ecal_config.h>
 
 #include "ecal_log_impl.h"
-#include "io/udp_configurations.h"
+#include "io/udp/udp_configurations.h"
 
 #include <mutex>
 #include <cstdio>

diff --git a/ecal/core/src/ecal_log_impl.h b/ecal/core/src/ecal_log_impl.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "io/udp_sender.h"
+#include "io/udp/udp_sender.h"
 
 #include <ecal/ecal.h>
 #include <ecal/ecal_os.h>

diff --git a/ecal/core/src/ecal_process.cpp b/ecal/core/src/ecal_process.cpp
@@ -29,7 +29,7 @@
 #include "ecal_registration_receiver.h"
 #include "ecal_globals.h"
 #include "ecal_process.h"
-#include "io/udp_configurations.h"
+#include "io/udp/udp_configurations.h"
 
 #include <array>
 #include <chrono>

diff --git a/ecal/core/src/ecal_registration_provider.cpp b/ecal/core/src/ecal_registration_provider.cpp
@@ -33,8 +33,8 @@
 #include "ecal_registration_provider.h"
 #include "ecal_descgate.h"
 
-#include "io/udp_configurations.h"
-#include "io/snd_sample.h"
+#include "io/udp/udp_configurations.h"
+#include "io/udp/snd_sample.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/ecal_registration_provider.h b/ecal/core/src/ecal_registration_provider.h
@@ -29,11 +29,11 @@
 #pragma once
 
 #include "ecal_thread.h"
-#include "io/snd_sample.h"
-#include "io/udp_sender.h"
+#include "io/udp/snd_sample.h"
+#include "io/udp/udp_sender.h"
 
-#include "io/ecal_memfile_broadcast.h"
-#include "io/ecal_memfile_broadcast_writer.h"
+#include "io/shm/ecal_memfile_broadcast.h"
+#include "io/shm/ecal_memfile_broadcast_writer.h"
 
 #include <atomic>
 #include <mutex>

diff --git a/ecal/core/src/ecal_registration_receiver.cpp b/ecal/core/src/ecal_registration_receiver.cpp
@@ -32,7 +32,7 @@
 #include "service/ecal_clientgate.h"
 #include "service/ecal_servicegate.h"
 
-#include "io/udp_configurations.h"
+#include "io/udp/udp_configurations.h"
 #include "ecal_sample_to_topicinfo.h"
 
 namespace eCAL

diff --git a/ecal/core/src/ecal_registration_receiver.h b/ecal/core/src/ecal_registration_receiver.h
@@ -32,10 +32,10 @@
 #include "ecal_def.h"
 #include "ecal_thread.h"
 
-#include "io/rcv_sample.h"
+#include "io/udp/rcv_sample.h"
 
-#include "io/ecal_memfile_broadcast.h"
-#include "io/ecal_memfile_broadcast_reader.h"
+#include "io/shm/ecal_memfile_broadcast.h"
+#include "io/shm/ecal_memfile_broadcast_reader.h"
 
 #include <string>
 #include <atomic>

diff --git a/ecal/core/src/io/ecal_named_mutex.cpp → ecal/core/src/io/mtx/ecal_named_mutex.cpp b/ecal/core/src/io/ecal_named_mutex.cpp → ecal/core/src/io/mtx/ecal_named_mutex.cpp
diff --git a/ecal/core/src/io/ecal_named_mutex.h → ecal/core/src/io/mtx/ecal_named_mutex.h b/ecal/core/src/io/ecal_named_mutex.h → ecal/core/src/io/mtx/ecal_named_mutex.h
diff --git a/ecal/core/src/io/ecal_named_mutex_base.h → ecal/core/src/io/mtx/ecal_named_mutex_base.h b/ecal/core/src/io/ecal_named_mutex_base.h → ecal/core/src/io/mtx/ecal_named_mutex_base.h
diff --git a/...re/src/io/linux/ecal_named_mutex_impl.cpp → ...rc/io/mtx/linux/ecal_named_mutex_impl.cpp b/...re/src/io/linux/ecal_named_mutex_impl.cpp → ...rc/io/mtx/linux/ecal_named_mutex_impl.cpp
diff --git a/...core/src/io/linux/ecal_named_mutex_impl.h → .../src/io/mtx/linux/ecal_named_mutex_impl.h b/...core/src/io/linux/ecal_named_mutex_impl.h → .../src/io/mtx/linux/ecal_named_mutex_impl.h
diff --git a/...cal_named_mutex_robust_clocklock_impl.cpp → ...cal_named_mutex_robust_clocklock_impl.cpp b/...cal_named_mutex_robust_clocklock_impl.cpp → ...cal_named_mutex_robust_clocklock_impl.cpp
diff --git a/.../ecal_named_mutex_robust_clocklock_impl.h → .../ecal_named_mutex_robust_clocklock_impl.h b/.../ecal_named_mutex_robust_clocklock_impl.h → .../ecal_named_mutex_robust_clocklock_impl.h
diff --git a/...re/src/io/win32/ecal_named_mutex_impl.cpp → ...rc/io/mtx/win32/ecal_named_mutex_impl.cpp b/...re/src/io/win32/ecal_named_mutex_impl.cpp → ...rc/io/mtx/win32/ecal_named_mutex_impl.cpp
diff --git a/...core/src/io/win32/ecal_named_mutex_impl.h → .../src/io/mtx/win32/ecal_named_mutex_impl.h b/...core/src/io/win32/ecal_named_mutex_impl.h → .../src/io/mtx/win32/ecal_named_mutex_impl.h
diff --git a/ecal/core/src/io/ecal_memfile.cpp → ecal/core/src/io/shm/ecal_memfile.cpp b/ecal/core/src/io/ecal_memfile.cpp → ecal/core/src/io/shm/ecal_memfile.cpp
diff --git a/ecal/core/src/io/ecal_memfile.h → ecal/core/src/io/shm/ecal_memfile.h b/ecal/core/src/io/ecal_memfile.h → ecal/core/src/io/shm/ecal_memfile.h
@@ -30,7 +30,7 @@
 #include <ecal/ecal_payload_writer.h>
 
 #include "ecal_memfile_info.h"
-#include "ecal_named_mutex.h"
+#include "io/mtx/ecal_named_mutex.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/io/ecal_memfile_broadcast.cpp → ...ore/src/io/shm/ecal_memfile_broadcast.cpp b/ecal/core/src/io/ecal_memfile_broadcast.cpp → ...ore/src/io/shm/ecal_memfile_broadcast.cpp
diff --git a/ecal/core/src/io/ecal_memfile_broadcast.h → .../core/src/io/shm/ecal_memfile_broadcast.h b/ecal/core/src/io/ecal_memfile_broadcast.h → .../core/src/io/shm/ecal_memfile_broadcast.h
@@ -29,7 +29,7 @@
 #include <cstring>
 #include <cstdint>
 
-#include "relocatable_circular_queue.h"
+#include "io/relocatable_circular_queue.h"
 
 #include <ecal/ecal.h>
 

diff --git a/.../src/io/ecal_memfile_broadcast_reader.cpp → .../io/shm/ecal_memfile_broadcast_reader.cpp b/.../src/io/ecal_memfile_broadcast_reader.cpp → .../io/shm/ecal_memfile_broadcast_reader.cpp
diff --git a/...re/src/io/ecal_memfile_broadcast_reader.h → ...rc/io/shm/ecal_memfile_broadcast_reader.h b/...re/src/io/ecal_memfile_broadcast_reader.h → ...rc/io/shm/ecal_memfile_broadcast_reader.h
diff --git a/.../src/io/ecal_memfile_broadcast_writer.cpp → .../io/shm/ecal_memfile_broadcast_writer.cpp b/.../src/io/ecal_memfile_broadcast_writer.cpp → .../io/shm/ecal_memfile_broadcast_writer.cpp
diff --git a/...re/src/io/ecal_memfile_broadcast_writer.h → ...rc/io/shm/ecal_memfile_broadcast_writer.h b/...re/src/io/ecal_memfile_broadcast_writer.h → ...rc/io/shm/ecal_memfile_broadcast_writer.h
diff --git a/ecal/core/src/io/ecal_memfile_db.cpp → ecal/core/src/io/shm/ecal_memfile_db.cpp b/ecal/core/src/io/ecal_memfile_db.cpp → ecal/core/src/io/shm/ecal_memfile_db.cpp
diff --git a/ecal/core/src/io/ecal_memfile_db.h → ecal/core/src/io/shm/ecal_memfile_db.h b/ecal/core/src/io/ecal_memfile_db.h → ecal/core/src/io/shm/ecal_memfile_db.h
diff --git a/ecal/core/src/io/ecal_memfile_header.h → ecal/core/src/io/shm/ecal_memfile_header.h b/ecal/core/src/io/ecal_memfile_header.h → ecal/core/src/io/shm/ecal_memfile_header.h
diff --git a/ecal/core/src/io/ecal_memfile_info.h → ecal/core/src/io/shm/ecal_memfile_info.h b/ecal/core/src/io/ecal_memfile_info.h → ecal/core/src/io/shm/ecal_memfile_info.h
diff --git a/ecal/core/src/io/ecal_memfile_naming.cpp → ecal/core/src/io/shm/ecal_memfile_naming.cpp b/ecal/core/src/io/ecal_memfile_naming.cpp → ecal/core/src/io/shm/ecal_memfile_naming.cpp
@@ -17,7 +17,7 @@
  * ========================= eCAL LICENSE =================================
 */
 
-#include <io/ecal_memfile_naming.h>
+#include "io/shm/ecal_memfile_naming.h"
 
 #include <cstdint>
 #include <limits>

diff --git a/ecal/core/src/io/ecal_memfile_naming.h → ecal/core/src/io/shm/ecal_memfile_naming.h b/ecal/core/src/io/ecal_memfile_naming.h → ecal/core/src/io/shm/ecal_memfile_naming.h
diff --git a/ecal/core/src/io/ecal_memfile_os.h → ecal/core/src/io/shm/ecal_memfile_os.h b/ecal/core/src/io/ecal_memfile_os.h → ecal/core/src/io/shm/ecal_memfile_os.h
diff --git a/ecal/core/src/io/ecal_memfile_pool.cpp → ecal/core/src/io/shm/ecal_memfile_pool.cpp b/ecal/core/src/io/ecal_memfile_pool.cpp → ecal/core/src/io/shm/ecal_memfile_pool.cpp
diff --git a/ecal/core/src/io/ecal_memfile_pool.h → ecal/core/src/io/shm/ecal_memfile_pool.h b/ecal/core/src/io/ecal_memfile_pool.h → ecal/core/src/io/shm/ecal_memfile_pool.h
diff --git a/ecal/core/src/io/ecal_memfile_sync.cpp → ecal/core/src/io/shm/ecal_memfile_sync.cpp b/ecal/core/src/io/ecal_memfile_sync.cpp → ecal/core/src/io/shm/ecal_memfile_sync.cpp
diff --git a/ecal/core/src/io/ecal_memfile_sync.h → ecal/core/src/io/shm/ecal_memfile_sync.h b/ecal/core/src/io/ecal_memfile_sync.h → ecal/core/src/io/shm/ecal_memfile_sync.h
diff --git a/ecal/core/src/io/linux/ecal_memfile_os.cpp → ...core/src/io/shm/linux/ecal_memfile_os.cpp b/ecal/core/src/io/linux/ecal_memfile_os.cpp → ...core/src/io/shm/linux/ecal_memfile_os.cpp
diff --git a/ecal/core/src/io/win32/ecal_memfile_os.cpp → ...core/src/io/shm/win32/ecal_memfile_os.cpp b/ecal/core/src/io/win32/ecal_memfile_os.cpp → ...core/src/io/shm/win32/ecal_memfile_os.cpp
diff --git a/ecal/core/src/io/ecal_receiver.h → ecal/core/src/io/udp/ecal_receiver.h b/ecal/core/src/io/ecal_receiver.h → ecal/core/src/io/udp/ecal_receiver.h
diff --git a/...e/src/io/linux/ecal_socket_option_linux.h → ...c/io/udp/linux/ecal_socket_option_linux.h b/...e/src/io/linux/ecal_socket_option_linux.h → ...c/io/udp/linux/ecal_socket_option_linux.h
diff --git a/ecal/core/src/io/msg_type.h → ecal/core/src/io/udp/msg_type.h b/ecal/core/src/io/msg_type.h → ecal/core/src/io/udp/msg_type.h
diff --git a/ecal/core/src/io/rcv_sample.cpp → ecal/core/src/io/udp/rcv_sample.cpp b/ecal/core/src/io/rcv_sample.cpp → ecal/core/src/io/udp/rcv_sample.cpp
diff --git a/ecal/core/src/io/rcv_sample.h → ecal/core/src/io/udp/rcv_sample.h b/ecal/core/src/io/rcv_sample.h → ecal/core/src/io/udp/rcv_sample.h
diff --git a/ecal/core/src/io/snd_raw_buffer.cpp → ecal/core/src/io/udp/snd_raw_buffer.cpp b/ecal/core/src/io/snd_raw_buffer.cpp → ecal/core/src/io/udp/snd_raw_buffer.cpp
@@ -26,7 +26,7 @@
 #include "ecal_process.h"
 
 #include "snd_raw_buffer.h"
-#include "io/msg_type.h"
+#include "io/udp/msg_type.h"
 
 namespace
 {

diff --git a/ecal/core/src/io/snd_raw_buffer.h → ecal/core/src/io/udp/snd_raw_buffer.h b/ecal/core/src/io/snd_raw_buffer.h → ecal/core/src/io/udp/snd_raw_buffer.h
diff --git a/ecal/core/src/io/snd_sample.cpp → ecal/core/src/io/udp/snd_sample.cpp b/ecal/core/src/io/snd_sample.cpp → ecal/core/src/io/udp/snd_sample.cpp
diff --git a/ecal/core/src/io/snd_sample.h → ecal/core/src/io/udp/snd_sample.h b/ecal/core/src/io/snd_sample.h → ecal/core/src/io/udp/snd_sample.h
diff --git a/ecal/core/src/io/udp_configurations.cpp → ecal/core/src/io/udp/udp_configurations.cpp b/ecal/core/src/io/udp_configurations.cpp → ecal/core/src/io/udp/udp_configurations.cpp
@@ -17,7 +17,7 @@
  * ========================= eCAL LICENSE =================================
 */
 
-#include "io/udp_configurations.h"
+#include "io/udp/udp_configurations.h"
 
 #include <ecal/ecal_config.h>
 

diff --git a/ecal/core/src/io/udp_configurations.h → ecal/core/src/io/udp/udp_configurations.h b/ecal/core/src/io/udp_configurations.h → ecal/core/src/io/udp/udp_configurations.h
diff --git a/ecal/core/src/io/udp_init.cpp → ecal/core/src/io/udp/udp_init.cpp b/ecal/core/src/io/udp_init.cpp → ecal/core/src/io/udp/udp_init.cpp
diff --git a/ecal/core/src/io/udp_init.h → ecal/core/src/io/udp/udp_init.h b/ecal/core/src/io/udp_init.h → ecal/core/src/io/udp/udp_init.h
diff --git a/ecal/core/src/io/udp_receiver.cpp → ecal/core/src/io/udp/udp_receiver.cpp b/ecal/core/src/io/udp_receiver.cpp → ecal/core/src/io/udp/udp_receiver.cpp
@@ -27,10 +27,10 @@
 
 #include <ecal/ecal_config.h>
 
-#include "io/udp_receiver_base.h"
-#include "io/udp_receiver_asio.h"
+#include "io/udp/udp_receiver_base.h"
+#include "io/udp/udp_receiver_asio.h"
 #ifdef ECAL_NPCAP_SUPPORT
-#include "io/udp_receiver_npcap.h"
+#include "io/udp/udp_receiver_npcap.h"
 #endif
 
 namespace eCAL

diff --git a/ecal/core/src/io/udp_receiver.h → ecal/core/src/io/udp/udp_receiver.h b/ecal/core/src/io/udp_receiver.h → ecal/core/src/io/udp/udp_receiver.h
diff --git a/ecal/core/src/io/udp_receiver_asio.cpp → ecal/core/src/io/udp/udp_receiver_asio.cpp b/ecal/core/src/io/udp_receiver_asio.cpp → ecal/core/src/io/udp/udp_receiver_asio.cpp
@@ -18,7 +18,7 @@
 */
 
 
-#include <io/udp_receiver_asio.h>
+#include "io/udp/udp_receiver_asio.h"
 
 #ifdef __linux__
 #include "linux/ecal_socket_option_linux.h"

diff --git a/ecal/core/src/io/udp_receiver_asio.h → ecal/core/src/io/udp/udp_receiver_asio.h b/ecal/core/src/io/udp_receiver_asio.h → ecal/core/src/io/udp/udp_receiver_asio.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <io/udp_receiver_base.h>
+#include "io/udp/udp_receiver_base.h"
 
 #ifdef _MSC_VER
 #pragma warning(push)

diff --git a/ecal/core/src/io/udp_receiver_base.h → ecal/core/src/io/udp/udp_receiver_base.h b/ecal/core/src/io/udp_receiver_base.h → ecal/core/src/io/udp/udp_receiver_base.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <io/udp_receiver.h>
+#include "io/udp/udp_receiver.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/io/udp_receiver_npcap.cpp → ecal/core/src/io/udp/udp_receiver_npcap.cpp b/ecal/core/src/io/udp_receiver_npcap.cpp → ecal/core/src/io/udp/udp_receiver_npcap.cpp
@@ -16,7 +16,7 @@
  *
  * ========================= eCAL LICENSE =================================
 */
-#include <io/udp_receiver_npcap.h>
+#include "io/udp/udp_receiver_npcap.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/io/udp_receiver_npcap.h → ecal/core/src/io/udp/udp_receiver_npcap.h b/ecal/core/src/io/udp_receiver_npcap.h → ecal/core/src/io/udp/udp_receiver_npcap.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <io/udp_receiver_base.h>
+#include "io/udp/udp_receiver_base.h"
 
 #include "ecal_config_reader_hlp.h"
 #include <udpcap/npcap_helpers.h>

diff --git a/ecal/core/src/io/udp_sender.cpp → ecal/core/src/io/udp/udp_sender.cpp b/ecal/core/src/io/udp_sender.cpp → ecal/core/src/io/udp/udp_sender.cpp
diff --git a/ecal/core/src/io/udp_sender.h → ecal/core/src/io/udp/udp_sender.h b/ecal/core/src/io/udp_sender.h → ecal/core/src/io/udp/udp_sender.h
diff --git a/ecal/core/src/mon/ecal_monitoring_impl.h b/ecal/core/src/mon/ecal_monitoring_impl.h
@@ -27,7 +27,7 @@
 
 #include "ecal_monitoring_threads.h"
 #include "ecal_expmap.h"
-#include "io/rcv_sample.h"
+#include "io/udp/rcv_sample.h"
 
 #include <memory>
 #include <mutex>

diff --git a/ecal/core/src/mon/ecal_monitoring_threads.cpp b/ecal/core/src/mon/ecal_monitoring_threads.cpp
@@ -25,8 +25,8 @@
 #include <ecal/ecal_config.h>
 
 #include "ecal_def.h"
-#include "io/msg_type.h"
-#include "io/udp_configurations.h"
+#include "io/udp/msg_type.h"
+#include "io/udp/udp_configurations.h"
 
 #include "ecal_monitoring_threads.h"
 

diff --git a/ecal/core/src/mon/ecal_monitoring_threads.h b/ecal/core/src/mon/ecal_monitoring_threads.h
@@ -27,7 +27,7 @@
 #include <ecal/msg/protobuf/publisher.h>
 
 #include "ecal_thread.h"
-#include "io/udp_receiver.h"
+#include "io/udp/udp_receiver.h"
 
 #ifdef _MSC_VER
 #pragma warning(push, 0) // disable proto warnings

diff --git a/ecal/core/src/readwrite/ecal_reader_shm.cpp b/ecal/core/src/readwrite/ecal_reader_shm.cpp
@@ -33,7 +33,7 @@
 
 #include "ecal_global_accessors.h"
 #include "pubsub/ecal_subgate.h"
-#include "io/ecal_memfile_pool.h"
+#include "io/shm/ecal_memfile_pool.h"
 #include "readwrite/ecal_reader_shm.h"
 
 #include <iostream>

diff --git a/ecal/core/src/readwrite/ecal_reader_udp_mc.cpp b/ecal/core/src/readwrite/ecal_reader_udp_mc.cpp
@@ -26,7 +26,7 @@
 #include "ecal_global_accessors.h"
 #include "pubsub/ecal_subgate.h"
 
-#include "io/udp_configurations.h"
+#include "io/udp/udp_configurations.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/readwrite/ecal_reader_udp_mc.h b/ecal/core/src/readwrite/ecal_reader_udp_mc.h
@@ -25,7 +25,7 @@
 
 #include "readwrite/ecal_reader_layer.h"
 
-#include "io/rcv_sample.h"
+#include "io/udp/rcv_sample.h"
 
 #include <map>
 #include <memory>

diff --git a/ecal/core/src/readwrite/ecal_writer_shm.h b/ecal/core/src/readwrite/ecal_writer_shm.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include "readwrite/ecal_writer_base.h"
-#include "io/ecal_memfile_sync.h"
+#include "io/shm/ecal_memfile_sync.h"
 
 #include <memory>
 #include <string>

diff --git a/ecal/core/src/readwrite/ecal_writer_udp_mc.cpp b/ecal/core/src/readwrite/ecal_writer_udp_mc.cpp
@@ -25,7 +25,7 @@
 #include <ecal/ecal_config.h>
 
 #include "ecal_writer_udp_mc.h"
-#include "io/udp_configurations.h"
+#include "io/udp/udp_configurations.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/readwrite/ecal_writer_udp_mc.h b/ecal/core/src/readwrite/ecal_writer_udp_mc.h
@@ -33,8 +33,8 @@
 #pragma warning(pop)
 #endif
 
-#include "io/snd_sample.h"
-#include "io/udp_sender.h"
+#include "io/udp/snd_sample.h"
+#include "io/udp/udp_sender.h"
 #include "readwrite/ecal_writer_base.h"
 
 #include <string>

diff --git a/testing/ecal/io_memfile_test/CMakeLists.txt b/testing/ecal/io_memfile_test/CMakeLists.txt
@@ -24,23 +24,23 @@ find_package(GTest REQUIRED)
 set(memfile_test_src
     src/memfile_test.cpp
     src/memfile_naming_test.cpp
-    ../../../ecal/core/src/io/ecal_memfile.cpp
-    ../../../ecal/core/src/io/ecal_memfile_db.cpp
-    ../../../ecal/core/src/io/ecal_named_mutex.cpp
-    ../../../ecal/core/src/io/ecal_memfile_naming.cpp
+    ../../../ecal/core/src/io/mtx/ecal_named_mutex.cpp
+    ../../../ecal/core/src/io/shm/ecal_memfile.cpp
+    ../../../ecal/core/src/io/shm/ecal_memfile_db.cpp
+    ../../../ecal/core/src/io/shm/ecal_memfile_naming.cpp
 )
 
 if(UNIX)
 set(memfile_test_os_src
-    ../../../ecal/core/src/io/linux/ecal_memfile_os.cpp
-    ../../../ecal/core/src/io/linux/ecal_named_mutex_impl.cpp
+    ../../../ecal/core/src/io/mtx/linux/ecal_named_mutex_impl.cpp
+    ../../../ecal/core/src/io/shm/linux/ecal_memfile_os.cpp
 )
 endif()
 
 if(WIN32)
 set(memfile_test_os_src
-    ../../../ecal/core/src/io/win32/ecal_memfile_os.cpp
-    ../../../ecal/core/src/io/win32/ecal_named_mutex_impl.cpp
+    ../../../ecal/core/src/io/mtx/win32/ecal_named_mutex_impl.cpp
+    ../../../ecal/core/src/io/shm/win32/ecal_memfile_os.cpp
 )
 endif()
 

diff --git a/testing/ecal/io_memfile_test/src/memfile_naming_test.cpp b/testing/ecal/io_memfile_test/src/memfile_naming_test.cpp
@@ -17,7 +17,7 @@
  * ========================= eCAL LICENSE =================================
 */
 
-#include "io/ecal_memfile_naming.h"
+#include "io/shm/ecal_memfile_naming.h"
 
 #include <atomic>
 #include <chrono>

diff --git a/testing/ecal/io_memfile_test/src/memfile_test.cpp b/testing/ecal/io_memfile_test/src/memfile_test.cpp
@@ -18,8 +18,8 @@
 */
 
 #include <ecal/ecal.h>
-#include "io/ecal_memfile.h"
-#include "io/ecal_memfile_db.h"
+#include "io/shm/ecal_memfile.h"
+#include "io/shm/ecal_memfile_db.h"
 
 #include <atomic>
 #include <chrono>