New Enchanced Thread Pool Implementation

Signed-off-by: jparisu <[email protected]>

ddsrouter_cmake/cmake/test/test_target.cmake

@@ -58,15 +58,24 @@ function(add_test_executable TEST_EXECUTABLE_NAME TEST_SOURCES TEST_NAME TEST_LI
 
     get_win32_path_dependencies(${TEST_EXECUTABLE_NAME} TEST_FRIENDLY_PATH)
 
-    foreach(test_name ${TEST_LIST})
-        add_test(NAME ${TEST_NAME}.${test_name}
-                COMMAND ${TEST_EXECUTABLE_NAME}
-                --gtest_filter=${TEST_NAME}.${test_name}:**/${TEST_NAME}.${test_name}/**)
-
-        if(TEST_FRIENDLY_PATH)
-            set_tests_properties(${TEST_NAME}.${test_name} PROPERTIES ENVIRONMENT "PATH=${TEST_FRIENDLY_PATH}")
-        endif(TEST_FRIENDLY_PATH)
-    endforeach()
+    if( TEST_LIST )
+        # If list of tests is not empty, add each test separatly
+        foreach(test_name ${TEST_LIST})
+            add_test(NAME ${TEST_NAME}.${test_name}
+                    COMMAND ${TEST_EXECUTABLE_NAME}
+                    --gtest_filter=${TEST_NAME}**.${test_name}:**/${TEST_NAME}**.${test_name}/**)
+
+            if(TEST_FRIENDLY_PATH)
+                set_tests_properties(${TEST_NAME}.${test_name} PROPERTIES ENVIRONMENT "PATH=${TEST_FRIENDLY_PATH}")
+            endif(TEST_FRIENDLY_PATH)
+        endforeach()
+    else()
+        # If no tests are provided, create a single test
+        message(STATUS "Creating general test ${TEST_NAME}.")
+        add_test(NAME ${TEST_NAME}
+            COMMAND ${TEST_EXECUTABLE_NAME})
+    endif( TEST_LIST )
+
 
     target_compile_definitions(${TEST_EXECUTABLE_NAME}
         PRIVATE FASTDDS_ENFORCE_LOG_INFO

ddsrouter_utils/include/ddsrouter_utils/thread/_ThreadPool.hpp

@@ -0,0 +1,100 @@
+// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file SlotThreadPool.hpp
+ *
+ * This file contains class SlotThreadPool definition.
+ */
+
+#ifndef _DDSROUTERTHREAD__SRC_CPP_POOL_SLOTTHREADPOOL_HPP_
+#define _DDSROUTERTHREAD__SRC_CPP_POOL_SLOTTHREADPOOL_HPP_
+
+#include <functional>
+#include <memory>
+
+namespace eprosima {
+namespace ddsrouter {
+namespace utils {
+
+class IThreadPool
+{
+public:
+    void execute(std::unique_ptr<ITask>&& task){}
+};
+
+class ITask
+{
+public:
+    void operator() () noexcept;
+};
+
+class BasicTask : ITask
+{
+public:
+    BasicTask(const std::function<void()>* callback_ptr){}
+    void operator() () noexcept;
+};
+
+class OwnedTask : ITask
+{
+public:
+    OwnedTask(const std::function<void()>& callback_){}
+    OwnedTask(std::function<void()>&& callback_){}
+    void operator() () noexcept;
+};
+
+template <typename ... Args>
+class ConnectorOneShotArgs
+{
+public:
+    static void execute(const IThreadPool& tp, const std::function<void(Args...)>& callback, Args... args){}
+    static void execute(const IThreadPool& tp, std::function<void(Args...)>&& callback, Args... args){}
+};
+using ConnectorOneShot = ConnectorOneShotArgs<>;
+
+template <typename ... Args>
+class ConnectorSlotArgs
+{
+public:
+    ConnectorSlotArgs(const IThreadPool& tp, const std::function<void(Args...)>& callback){}
+    // ConnectorSlotArgs(const IThreadPool& tp, std::function<void<(Args...)>&& callback){}
+    void execute(Args...){}
+};
+using ConnectorSlot = ConnectorSlotArgs<>;
+
+int main()
+{
+    IThreadPool pool;
+
+    ConnectorOneShot::execute(pool, [](){ /* do something */ });
+    ConnectorOneShotArgs<int>::execute(pool, [](int x){ /* do something */ }, 3);
+    ConnectorOneShotArgs<std::string, bool>::execute(pool, [](std::string s, bool b){ /* do something */ }, std::string("hello"), true);
+
+    ConnectorSlot slot_connector(pool, [](){ /* do something */ });
+    slot_connector.execute();
+
+    ConnectorSlotArgs<int> slot_args(pool, [](int x){});
+    slot_args.execute(2);
+
+    ConnectorSlotArgs<std::string, bool> slot_args_2(pool, std::function<void(std::string, bool)>([](std::string s, bool b){}));
+    slot_args_2.execute(std::string("hello"), true);
+
+}
+
+} /* namespace utils */
+} /* namespace ddsrouter */
+} /* namespace eprosima */
+
+#endif /* _DDSROUTERTHREAD__SRC_CPP_POOL_SLOTTHREADPOOL_HPP_ */

ddsrouter_utils/include/ddsrouter_utils/thread/connector/OneShotConnector.hpp

@@ -0,0 +1,51 @@
+// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file OwnedTask.hpp
+ *
+ * This file contains class Task definition.
+ */
+
+#pragma once
+
+#include <functional>
+
+#include <ddsrouter_utils/thread/task/ITask.hpp>
+#include <ddsrouter_utils/thread/manager/IManager.hpp>
+
+namespace eprosima {
+namespace ddsrouter {
+namespace utils {
+namespace thread {
+
+template <typename ... Args>
+class OneShotConnector
+{
+public:
+
+    static void execute(IManager* tp, const std::function<void(Args...)>& callback, Args... args);
+
+    static void execute(IManager* tp, std::function<void(Args...)>&& callback, Args... args);
+
+};
+using SimpleOneShotConnector = OneShotConnector<>;
+
+} /* namespace thread */
+} /* namespace utils */
+} /* namespace ddsrouter */
+} /* namespace eprosima */
+
+// Include implementation template file
+#include <ddsrouter_utils/thread/connector/impl/OneShotConnector.ipp>

ddsrouter_utils/include/ddsrouter_utils/thread/connector/SlotConnector.hpp

@@ -0,0 +1,65 @@
+// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file SlotConnector.hpp
+ *
+ * This file contains class SlotConnector definition.
+ */
+
+#pragma once
+
+#include <functional>
+
+#include <ddsrouter_utils/thread/task/ITask.hpp>
+#include <ddsrouter_utils/thread/manager/IManager.hpp>
+
+namespace eprosima {
+namespace ddsrouter {
+namespace utils {
+namespace thread {
+
+template <typename ... Args>
+class SlotConnector
+{
+public:
+
+    SlotConnector(
+        IManager* manager,
+        const std::function<void(Args...)>& callback);
+
+    SlotConnector(
+        IManager* manager,
+        std::function<void(Args...)>&& callback);
+
+    ~SlotConnector() = default;
+
+    void execute(Args...);
+
+protected:
+
+    IManager* manager_;
+
+    std::function<void (Args...)> callback_;
+
+};
+using SimpleSlotConnector = SlotConnector<>;
+
+} /* namespace thread */
+} /* namespace utils */
+} /* namespace ddsrouter */
+} /* namespace eprosima */
+
+// Include implementation template file
+#include <ddsrouter_utils/thread/connector/impl/SlotConnector.ipp>

ddsrouter_utils/include/ddsrouter_utils/thread/connector/impl/OneShotConnector.ipp

@@ -0,0 +1,75 @@
+// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file OneShotConnector.hpp
+ *
+ * This file contains class OneShotConnector implementation.
+ */
+
+#pragma once
+
+#include <ddsrouter_utils/thread/task/ArgsOwnedTask.hpp>
+
+namespace eprosima {
+namespace ddsrouter {
+namespace utils {
+namespace thread {
+
+template <typename ... Args>
+void OneShotConnector<Args...>::execute(
+        IManager* manager,
+        const std::function<void(Args...)>& callback,
+        Args... args)
+{
+    manager->execute(
+        std::make_unique<ArgsOwnedTask<Args...>>(
+            callback,
+            args...
+        )
+    );
+}
+
+template <typename ... Args>
+void OneShotConnector<Args...>::execute(
+        IManager* manager,
+        std::function<void(Args...)>&& callback,
+        Args... args)
+{
+    manager->execute(
+        std::make_unique<ArgsOwnedTask<Args...>>(
+            std::move(callback),
+            args...
+        )
+    );
+}
+
+// template <typename ... Args>
+// void OneShotConnector<Args...>::execute(
+//         IManager* manager,
+//         std::function<void(Args...)> callback,
+//         Args... args)
+// {
+//     manager->execute(
+//         std::make_unique<ArgsOwnedTask<Args...>>(
+//             callback,
+//             args...
+//         )
+//     );
+// }
+
+} /* namespace thread */
+} /* namespace event */
+} /* namespace ddsrouter */
+} /* namespace eprosima */

ddsrouter_utils/include/ddsrouter_utils/thread/connector/impl/SlotConnector.ipp

@@ -0,0 +1,62 @@
+// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file SlotConnector.hpp
+ *
+ * This file contains class SlotConnector implementation.
+ */
+
+#pragma once
+
+#include <ddsrouter_utils/thread/task/ArgsOwnedTask.hpp>
+
+namespace eprosima {
+namespace ddsrouter {
+namespace utils {
+namespace thread {
+
+template <typename ... Args>
+SlotConnector<Args...>::SlotConnector(
+        IManager* manager,
+        const std::function<void(Args...)>& callback)
+    : manager_(manager)
+    , callback_(callback)
+{
+}
+
+template <typename ... Args>
+SlotConnector<Args...>::SlotConnector(
+        IManager* manager,
+        std::function<void(Args...)>&& callback)
+    : manager_(manager)
+    , callback_(std::move(callback))
+{
+}
+
+template <typename ... Args>
+void SlotConnector<Args...>::execute(Args... args)
+{
+    manager_->execute(
+        std::make_unique<ArgsOwnedTask<Args...>>(
+            callback_,
+            args...
+        )
+    );
+}
+
+} /* namespace thread */
+} /* namespace event */
+} /* namespace ddsrouter */
+} /* namespace eprosima */