Cleanup includes

examples/1-1/Sampler.cxx

@@ -6,9 +6,6 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
-#include <thread> // this_thread::sleep_for
-#include <chrono>
-
 #include "Sampler.h"
 
 using namespace std;

fairmq/EventManager.h

@@ -12,12 +12,10 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <tuple>
 #include <typeindex>
-#include <typeinfo>
 #include <unordered_map>
 #include <utility>
-#include <vector>
+#include <functional>
 
 #include <boost/any.hpp>
 #include <boost/functional/hash.hpp>

fairmq/FairMQChannel.cxx

@@ -7,7 +7,8 @@
  ********************************************************************************/
 
 #include "FairMQChannel.h"
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
+#include <fairmq/Properties.h>
 
 #include <boost/algorithm/string.hpp> // join/split
 

fairmq/FairMQChannel.h

@@ -10,6 +10,7 @@
 #define FAIRMQCHANNEL_H_
 
 #include <FairMQTransportFactory.h>
+#include <FairMQUnmanagedRegion.h>
 #include <FairMQSocket.h>
 #include <fairmq/Transports.h>
 #include <FairMQLogger.h>
@@ -17,15 +18,14 @@
 #include <fairmq/Properties.h>
 #include <FairMQMessage.h>
 
-#include <boost/any.hpp>
-
 #include <string>
 #include <memory> // unique_ptr, shared_ptr
 #include <vector>
-#include <atomic>
 #include <mutex>
 #include <stdexcept>
 #include <utility> // std::move
+#include <cstddef> // size_t
+#include <cstdint> // int64_t
 
 class FairMQChannel
 {

fairmq/FairMQDevice.cxx

@@ -8,15 +8,15 @@
 
 #include <FairMQDevice.h>
 
+#include <fairmq/tools/RateLimit.h>
+#include <fairmq/tools/Network.h>
+
 #include <boost/algorithm/string.hpp> // join/split
 
 #include <list>
-#include <cstdlib>
 #include <chrono>
 #include <mutex>
 #include <thread>
-#include <functional>
-#include <sstream>
 #include <iomanip>
 #include <future>
 #include <algorithm> // std::max

fairmq/FairMQDevice.h

@@ -14,7 +14,6 @@
 #include <fairmq/Transports.h>
 #include <fairmq/StateQueue.h>
 
-#include <FairMQSocket.h>
 #include <FairMQChannel.h>
 #include <FairMQMessage.h>
 #include <FairMQParts.h>
@@ -24,21 +23,19 @@
 
 #include <vector>
 #include <memory> // unique_ptr
-#include <algorithm> // std::sort()
+#include <algorithm> // find
 #include <string>
 #include <chrono>
 #include <iostream>
 #include <unordered_map>
 #include <functional>
-#include <assert.h> // static_assert
-#include <type_traits> // is_trivially_copyable
 #include <stdexcept>
-#include <queue>
-
 #include <mutex>
-#include <condition_variable>
+#include <atomic>
+#include <cstddef>
+#include <utility> // pair
 
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Version.h>
 
 using FairMQChannelMap = std::unordered_map<std::string, std::vector<FairMQChannel>>;
 

fairmq/FairMQTransportFactory.cxx

@@ -16,11 +16,10 @@
 #include <fairmq/ofi/TransportFactory.h>
 #endif
 #include <FairMQLogger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
 
 #include <memory>
 #include <string>
-#include <sstream>
 
 FairMQTransportFactory::FairMQTransportFactory(const std::string& id)
     : fkId(id)

fairmq/FairMQTransportFactory.h

@@ -12,7 +12,6 @@
 #include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <FairMQPoller.h>
-#include <fairmq/ProgOptionsFwd.h>
 #include <FairMQSocket.h>
 #include <FairMQUnmanagedRegion.h>
 #include <fairmq/MemoryResources.h>
@@ -22,8 +21,11 @@
 #include <memory>
 #include <vector>
 #include <unordered_map>
+#include <stdexcept>
+#include <cstddef> // size_t
 
 class FairMQChannel;
+namespace fair { namespace mq { class ProgOptions; } }
 
 class FairMQTransportFactory
 {

fairmq/MemoryResources.h

@@ -23,11 +23,7 @@ class FairMQTransportFactory;
 #include <boost/container/pmr/monotonic_buffer_resource.hpp>
 #include <boost/container/pmr/polymorphic_allocator.hpp>
 #include <cstring>
-#include <string>
-#include <type_traits>
-#include <unordered_map>
 #include <utility>
-#include <vector>
 
 namespace fair {
 namespace mq {

fairmq/Plugin.h

@@ -9,7 +9,8 @@
 #ifndef FAIR_MQ_PLUGIN_H
 #define FAIR_MQ_PLUGIN_H
 
-#include <fairmq/Tools.h>
+#include <fairmq/tools/CppSTL.h>
+#include <fairmq/tools/Version.h>
 #include <fairmq/PluginServices.h>
 
 #include <boost/dll/alias.hpp>

fairmq/PluginManager.cxx

@@ -8,7 +8,7 @@
 
 #include <fairmq/plugins/Builtin.h>
 #include <fairmq/PluginManager.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <boost/program_options.hpp>
 #include <algorithm>
 #include <iterator>

fairmq/PluginManager.h

@@ -11,8 +11,9 @@
 
 #include <fairmq/Plugin.h>
 #include <fairmq/PluginServices.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/CppSTL.h>
-#include <FairMQDevice.h>
+#include <fairmq/tools/Strings.h>
+
 #define BOOST_FILESYSTEM_VERSION 3
 #define BOOST_FILESYSTEM_NO_DEPRECATED
 #include <boost/filesystem.hpp>
@@ -21,13 +22,14 @@
 #include <boost/dll/import.hpp>
 #include <boost/dll/shared_library.hpp>
 #include <boost/dll/runtime_symbol_info.hpp>
+
 #include <functional>
 #include <map>
 #include <memory>
 #include <stdexcept>
 #include <string>
-#include <tuple>
 #include <vector>
+#include <utility> // forward
 
 namespace fair
 {

fairmq/PluginServices.cxx

@@ -7,6 +7,7 @@
  ********************************************************************************/
 
 #include <fairmq/PluginServices.h>
+#include <fairmq/tools/Strings.h>
 
 using namespace fair::mq;
 using namespace std;

fairmq/PluginServices.h

@@ -9,7 +9,6 @@
 #ifndef FAIR_MQ_PLUGINSERVICES_H
 #define FAIR_MQ_PLUGINSERVICES_H
 
-#include <fairmq/Tools.h>
 #include <fairmq/States.h>
 #include <FairMQDevice.h>
 #include <fairmq/ProgOptions.h>

fairmq/ProgOptions.cxx

@@ -15,7 +15,7 @@
 #include "FairMQLogger.h"
 #include <fairmq/ProgOptions.h>
 
-#include "tools/Unique.h"
+#include <fairmq/tools/Strings.h>
 
 #include <boost/any.hpp>
 #include <boost/regex.hpp>

fairmq/ProgOptions.h

@@ -14,7 +14,7 @@
 #include <fairmq/EventManager.h>
 #include <fairmq/ProgOptionsFwd.h>
 #include <fairmq/Properties.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 
 #include <boost/program_options.hpp>
 

fairmq/Transports.h

@@ -9,7 +9,7 @@
 #ifndef FAIR_MQ_TRANSPORTS_H
 #define FAIR_MQ_TRANSPORTS_H
 
-#include <fairmq/Tools.h>
+#include <fairmq/tools/CppSTL.h>
 
 #include <memory>
 #include <string>

fairmq/devices/FairMQBenchmarkSampler.cxx

@@ -8,10 +8,9 @@
 
 #include "FairMQBenchmarkSampler.h"
 
-#include <fairmq/Tools.h>
+#include "tools/RateLimit.h"
 #include "../FairMQLogger.h"
 
-#include <vector>
 #include <chrono>
 
 using namespace std;
@@ -27,10 +26,6 @@ FairMQBenchmarkSampler::FairMQBenchmarkSampler()
 {
 }
 
-FairMQBenchmarkSampler::~FairMQBenchmarkSampler()
-{
-}
-
 void FairMQBenchmarkSampler::InitTask()
 {
     fMultipart = fConfig->GetProperty<bool>("multipart");

fairmq/devices/FairMQBenchmarkSampler.h

@@ -10,8 +10,10 @@
 #define FAIRMQBENCHMARKSAMPLER_H_
 
 #include <string>
-#include <thread>
 #include <atomic>
+#include <cstddef> // size_t
+#include <cstdint> // uint64_t
+
 
 #include "FairMQDevice.h"
 
@@ -23,7 +25,7 @@ class FairMQBenchmarkSampler : public FairMQDevice
 {
   public:
     FairMQBenchmarkSampler();
-    virtual ~FairMQBenchmarkSampler();
+    virtual ~FairMQBenchmarkSampler() {}
 
   protected:
     bool fMultipart;

fairmq/plugins/DDS/DDS.cxx

@@ -10,19 +10,16 @@
 
 #include <fairmq/sdk/commands/Commands.h>
 
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/asio/post.hpp>
 
-#include <termios.h> // for the interactive mode
-#include <poll.h> // for the interactive mode
-#include <sstream>
-#include <iostream>
 #include <cstdlib>
 #include <stdexcept>
+#include <sstream>
 
 using namespace std;
 using fair::mq::tools::ToString;
@@ -184,7 +181,7 @@ auto DDS::StaticControl() -> void
         ReleaseDeviceControl();
     } catch (exception& e) {
         ReleaseDeviceControl();
-        LOG(error) << "Error: " << e.what() << endl;
+        LOG(error) << "Error: " << e.what() << "\n";
         return;
     }
 }
@@ -395,7 +392,7 @@ auto DDS::SubscribeForCustomCommands() -> void
                 case Type::dump_config: {
                     stringstream ss;
                     for (const auto pKey: GetPropertyKeys()) {
-                        ss << id << ": " << pKey << " -> " << GetPropertyAsString(pKey) << endl;
+                        ss << id << ": " << pKey << " -> " << GetPropertyAsString(pKey) << "\n";
                     }
                     Cmds outCmds(make<Config>(id, ss.str()));
                     fDDS.Send(outCmds.Serialize(), to_string(senderId));

fairmq/plugins/DDS/DDS.h

@@ -9,22 +9,24 @@
 #ifndef FAIR_MQ_PLUGINS_DDS
 #define FAIR_MQ_PLUGINS_DDS
 
-#include <DDS/dds_env_prop.h>
-#include <DDS/dds_intercom.h>
-#include <boost/asio/executor.hpp>
-#include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/io_context.hpp>
-#include <cassert>
-#include <chrono>
-#include <condition_variable>
 #include <fairmq/Plugin.h>
 #include <fairmq/StateQueue.h>
 #include <fairmq/Version.h>
-#include <functional>
+
+#include <DDS/dds_env_prop.h>
+#include <DDS/dds_intercom.h>
+
+#include <boost/asio/executor.hpp>
+#include <boost/asio/executor_work_guard.hpp>
+#include <boost/asio/io_context.hpp>
+
+#include <cassert>
+#include <chrono>
+#include <condition_variable>
 #include <mutex>
-#include <queue>
 #include <set>
 #include <string>
+#include <atomic>
 #include <thread>
 #include <unordered_map>
 #include <vector>

fairmq/plugins/DDS/runDDSCommandUI.cxx

@@ -11,21 +11,14 @@
 
 #include <DDS/dds_intercom.h>
 
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/trim.hpp>
 #include <boost/program_options.hpp>
 
-#include <algorithm>
-#include <atomic>
 #include <condition_variable>
 #include <cstdlib>
-#include <exception>
 #include <iostream>
 #include <mutex>
 #include <string>
-#include <termios.h>   // raw mode console input
+#include <termios.h> // raw mode console input
 #include <thread>
 #include <utility>
 #include <unistd.h>

fairmq/sdk/Error.h

@@ -9,7 +9,7 @@
 #ifndef FAIR_MQ_SDK_ERROR_H
 #define FAIR_MQ_SDK_ERROR_H
 
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <stdexcept>
 #include <system_error>
 

fairmq/sdk/Topology.h

@@ -19,7 +19,7 @@
 #include <fairmq/sdk/DDSTopology.h>
 #include <fairmq/sdk/Error.h>
 #include <fairmq/States.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Semaphore.h>
 
 #include <fairlogger/Logger.h>
 

fairmq/sdk/commands/Commands.h

@@ -10,7 +10,7 @@
 #define FAIR_MQ_SDK_COMMANDFACTORY
 
 #include <fairmq/States.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/CppSTL.h>
 
 #include <vector>
 #include <string>

fairmq/shmem/Manager.cxx

@@ -8,6 +8,8 @@
 
 #include <fairmq/shmem/Manager.h>
 #include <fairmq/shmem/Common.h>
+#include <fairmq/tools/CppSTL.h>
+#include <fairmq/tools/Strings.h>
 
 #include <boost/process.hpp>
 #include <boost/filesystem.hpp>

fairmq/shmem/Manager.h

@@ -15,7 +15,6 @@
 #ifndef FAIR_MQ_SHMEM_MANAGER_H_
 #define FAIR_MQ_SHMEM_MANAGER_H_
 
-#include <fairmq/Tools.h>
 #include <fairmq/shmem/Region.h>
 #include <fairmq/shmem/Common.h>
 

fairmq/shmem/Region.cxx

@@ -9,6 +9,8 @@
 #include <fairmq/shmem/Region.h>
 #include <fairmq/shmem/Common.h>
 #include <fairmq/shmem/Manager.h>
+#include <fairmq/tools/CppSTL.h>
+#include <fairmq/tools/Strings.h>
 
 #include <boost/filesystem.hpp>
 #include <boost/process.hpp>

fairmq/shmem/Region.h

@@ -18,7 +18,6 @@
 #include "FairMQLogger.h"
 #include "FairMQUnmanagedRegion.h"
 
-#include <fairmq/Tools.h>
 #include <fairmq/shmem/Common.h>
 
 #include <boost/interprocess/managed_shared_memory.hpp>

fairmq/tools/Strings.h

@@ -10,7 +10,6 @@
 #define FAIR_MQ_TOOLS_STRINGS_H
 
 #include <array>
-#include <boost/beast/core/span.hpp>
 #include <initializer_list>
 #include <sstream>
 #include <string>
@@ -37,16 +36,11 @@ auto ToString(T&&... t) -> std::string
 /// @brief convert command line arguments from main function to vector of strings
 inline auto ToStrVector(const int argc, char*const* argv, const bool dropProgramName = true) -> std::vector<std::string>
 {
-    auto res = std::vector<std::string>{};
+    if (dropProgramName) {
-    boost::beast::span<char*const> argvView(argv, argc);
+        return std::vector<std::string>(argv + 1, argv + argc);
-    if (dropProgramName)
+    } else {
-    {
+        return std::vector<std::string>(argv, argv + argc);
-        res.assign(argvView.begin() + 1, argvView.end());
-    } else
-    {
-        res.assign(argvView.begin(), argvView.end());
     }
-    return res;
 }
 
 } /* namespace tools */

test/sdk/Fixtures.h

@@ -16,7 +16,7 @@
 #include <cstdlib>
 #include <fairlogger/Logger.h>
 #include <fairmq/SDK.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <gtest/gtest.h>
 #include <thread>