Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 08:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup tools includes

Browse Source
This commit is contained in:
Alexey Rybalchenko 2021-01-13 14:01:48 +01:00
parent 751c53171c
commit d9a5e82160
43 changed files with 58 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fairmq/FairMQTransportFactory.cxx
View File

@ -13,7 +13,8 @@
#include <fairmq/ofi/TransportFactory.h>
#endif
#include <FairMQLogger.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/tools/Strings.h>
#include <fairlogger/Logger.h>

1
fairmq/JSONParser.cxx
View File

@ -15,7 +15,6 @@
#include "JSONParser.h"
#include "FairMQChannel.h"
#include <fairmq/PropertyOutput.h>
#include <fairmq/tools/CppSTL.h>
#include <fairmq/tools/Strings.h>
#include <fairlogger/Logger.h>

2
fairmq/Properties.cxx
View File

@ -7,12 +7,10 @@
********************************************************************************/
#include <fairmq/Properties.h>
#include <fairmq/Tools.h>
#include <boost/filesystem.hpp>
using namespace std;
using namespace fair::mq::tools;
using boost::any_cast;
namespace fair

2
fairmq/ofi/Context.cxx
View File

@ -7,7 +7,7 @@
********************************************************************************/
#include <fairmq/ofi/Context.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <FairMQLogger.h>
#include <asiofi/version.hpp>

1
fairmq/ofi/Message.cxx
View File

@ -7,7 +7,6 @@
********************************************************************************/
#include <fairmq/ofi/Message.h>
#include <fairmq/Tools.h>
#include <FairMQLogger.h>
#include <asiofi.hpp>

2
fairmq/ofi/Poller.cxx
View File

@ -8,7 +8,7 @@
#include <fairmq/ofi/Poller.h>
#include <fairmq/ofi/Socket.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <FairMQLogger.h>
#include <zmq.h>

1
fairmq/ofi/TransportFactory.cxx
View File

@ -10,7 +10,6 @@
#include <fairmq/ofi/Poller.h>
#include <fairmq/ofi/Socket.h>
#include <fairmq/ofi/TransportFactory.h>
#include <fairmq/Tools.h>
#include <stdexcept>

2
fairmq/plugins/PMIx/PMIxPlugin.cxx
View File

@ -9,7 +9,7 @@
#include "PMIxPlugin.h"
#include <fairmq/sdk/commands/Commands.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <sstream>
#include <stdexcept>

2
fairmq/run/runUuidGenerator.cxx
View File

@ -5,7 +5,7 @@
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <boost/program_options.hpp>

2
fairmq/sdk/DDSEnvironment.cxx
View File

@ -11,7 +11,7 @@
#include <cstdlib>
#include <dds/dds.h>
#include <fairlogger/Logger.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/InstanceLimit.h>
#include <fairmq/sdk/DDSInfo.h>
#include <sstream>
#include <utility>

3
fairmq/sdk/DDSSession.cxx
View File

@ -14,7 +14,8 @@
#include <cstdlib>
#include <dds/dds.h>
#include <fairlogger/Logger.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <fairmq/tools/Semaphore.h>
#include <fairmq/sdk/DDSAgent.h>
#include <fairmq/sdk/DDSEnvironment.h>
#include <fairmq/sdk/DDSTopology.h>

1
fairmq/sdk/DDSTopology.cxx
View File

@ -11,7 +11,6 @@
#include <boost/range/iterator_range.hpp>
#include <dds/dds.h>
#include <fairlogger/Logger.h>
#include <fairmq/Tools.h>
#include <fairmq/sdk/DDSEnvironment.h>
#include <memory>
#include <sstream>

2
fairmq/sdk/runDDSCommandUI.cxx
View File

@ -9,7 +9,7 @@
#include <fairmq/sdk/commands/Commands.h>
#include <fairmq/States.h>
#include <fairmq/SDK.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <boost/program_options.hpp>

1
fairmq/shmem/Message.h
View File

@ -12,7 +12,6 @@
#include "Manager.h"
#include "Region.h"
#include "UnmanagedRegion.h"
#include <fairmq/Tools.h>
#include <FairMQLogger.h>
#include <FairMQMessage.h>
#include <FairMQUnmanagedRegion.h>

2
fairmq/shmem/Monitor.cxx
View File

@ -9,7 +9,7 @@
#include "Monitor.h"
#include "Common.h"
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <fairlogger/Logger.h>
#include <boost/interprocess/managed_shared_memory.hpp>

2
fairmq/shmem/Poller.h
View File

@ -9,7 +9,7 @@
#define FAIR_MQ_SHMEM_POLLER_H_
#include "Socket.h"
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <FairMQChannel.h>
#include <FairMQLogger.h>
#include <FairMQPoller.h>

5
fairmq/shmem/Socket.h
View File

@ -15,7 +15,7 @@
#include <FairMQSocket.h>
#include <FairMQMessage.h>
#include <FairMQLogger.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <zmq.h>
@ -386,8 +386,7 @@ class Socket final : public fair::mq::Socket
{
size_t eventsSize = sizeof(uint32_t);
if (zmq_getsockopt(fSocket, ZMQ_EVENTS, events, &eventsSize) < 0) {
throw SocketError(
tools::ToString("failed setting ZMQ_EVENTS, reason: ", zmq_strerror(errno)));
throw SocketError(tools::ToString("failed setting ZMQ_EVENTS, reason: ", zmq_strerror(errno)));
}
}

2
fairmq/shmem/TransportFactory.h
View File

@ -19,7 +19,7 @@
#include <FairMQTransportFactory.h>
#include <fairmq/ProgOptions.h>
#include <FairMQLogger.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <boost/version.hpp>

2
fairmq/zeromq/Context.h
View File

@ -9,7 +9,7 @@
#ifndef FAIR_MQ_ZMQ_CONTEXT_H_
#define FAIR_MQ_ZMQ_CONTEXT_H_
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <FairMQLogger.h>
#include <FairMQUnmanagedRegion.h>

2
fairmq/zeromq/Poller.h
View File

@ -10,7 +10,7 @@
#define FAIR_MQ_ZMQ_POLLER_H
#include <fairmq/zeromq/Socket.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <FairMQChannel.h>
#include <FairMQLogger.h>
#include <FairMQPoller.h>

2
fairmq/zeromq/Socket.h
View File

@ -12,7 +12,7 @@
#include <FairMQLogger.h>
#include <FairMQMessage.h>
#include <FairMQSocket.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <fairmq/zeromq/Context.h>
#include <fairmq/zeromq/Message.h>

1
fairmq/zeromq/TransportFactory.h
View File

@ -14,7 +14,6 @@
#include <fairmq/zeromq/Socket.h>
#include <fairmq/zeromq/Poller.h>
#include <fairmq/zeromq/UnmanagedRegion.h>
#include <fairmq/Tools.h>
#include <FairMQTransportFactory.h>
#include <fairmq/ProgOptions.h>

2
test/device/_config.cxx
View File

@ -10,8 +10,6 @@
#include <fairmq/DeviceRunner.h>
#include <fairmq/ProgOptions.h>
#include <fairmq/Tools.h>
#include <gtest/gtest.h>
#include <sstream> // std::stringstream

3
test/device/_error_state.cxx
View File

@ -10,7 +10,8 @@
#include <gtest/gtest.h>
#include <boost/process.hpp>
#include <fairmq/Tools.h>
#include <fairmq/tools/Process.h>
#include <fairmq/tools/Unique.h>
#include <FairMQDevice.h>
#include <string>

3
test/device/_exceptions.cxx
View File

@ -10,7 +10,8 @@
#include <gtest/gtest.h>
#include <boost/process.hpp>
#include <fairmq/Tools.h>
#include <fairmq/tools/Process.h>
#include <fairmq/tools/Unique.h>
#include <string>
#include <thread>

3
test/device/_signals.cxx
View File

@ -10,7 +10,8 @@
#include <gtest/gtest.h>
#include <boost/process.hpp>
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/tools/Process.h>
#include <string>
#include <thread>

2
test/device/_version.cxx
View File

@ -8,7 +8,7 @@
#include <FairMQDevice.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Version.h>
#include <gtest/gtest.h>

4
test/device/_waitfor.cxx
View File

@ -9,7 +9,9 @@
#include "runner.h"
#include <gtest/gtest.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/tools/Process.h>
#include <signal.h> // kill

2
test/memory_resources/_memory_resources.cxx
View File

@ -9,7 +9,7 @@
#include <fairmq/FairMQTransportFactory.h>
#include <fairmq/MemoryResourceTools.h>
#include <fairmq/ProgOptions.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <boost/container/pmr/polymorphic_allocator.hpp>

3
test/message/_message.cxx
View File

@ -10,7 +10,8 @@
#include <FairMQLogger.h>
#include <FairMQTransportFactory.h>
#include <fairmq/ProgOptions.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/tools/Strings.h>
#include <gtest/gtest.h>

2
test/plugin_services/_config.cxx
View File

@ -7,7 +7,7 @@
********************************************************************************/
#include "Fixture.h"
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <fairmq/PropertyOutput.h>
#include <algorithm>

2
test/plugins/_plugin.cxx
View File

@ -9,7 +9,7 @@
#include <gtest/gtest.h>
#include <fairmq/Plugin.h>
#include <fairmq/PluginServices.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Version.h>
#include <FairMQDevice.h>
#include <fairmq/ProgOptions.h>
#include <memory>

4
test/poller/_poller.cxx
View File

@ -7,7 +7,9 @@
********************************************************************************/
#include "runner.h"
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/tools/Process.h>
#include <gtest/gtest.h>
#include <sstream> // std::stringstream
#include <thread>

3
test/protocols/_pair.cxx
View File

@ -7,7 +7,8 @@
********************************************************************************/
#include "runner.h"
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/tools/Process.h>
#include <gtest/gtest.h>
#include <sstream> // std::stringstream
#include <thread>

3
test/protocols/_pub_sub.cxx
View File

@ -7,7 +7,8 @@
********************************************************************************/
#include "runner.h"
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/tools/Process.h>
#include <gtest/gtest.h>
#include <sstream> // std::stringstream
#include <thread>

3
test/protocols/_push_pull.cxx
View File

@ -7,7 +7,8 @@
********************************************************************************/
#include "runner.h"
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/tools/Process.h>
#include <gtest/gtest.h>
#include <sstream> // std::stringstream
#include <thread>

2
test/protocols/_push_pull_multipart.cxx
View File

@ -11,7 +11,7 @@
#include <FairMQParts.h>
#include <FairMQLogger.h>
#include <FairMQTransportFactory.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/ProgOptions.h>
#include <algorithm>

3
test/protocols/_req_rep.cxx
View File

@ -7,7 +7,8 @@
********************************************************************************/
#include "runner.h"
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/tools/Process.h>
#include <gtest/gtest.h>
#include <sstream> // std::stringstream
#include <thread>

9
test/region/_region.cxx
View File

@ -9,10 +9,13 @@
#include <FairMQLogger.h>
#include <FairMQTransportFactory.h>
#include <fairmq/ProgOptions.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/tools/Semaphore.h>
#include <fairmq/tools/Strings.h>
#include <gtest/gtest.h>
#include <memory> // make_unique
#include <string>
namespace
@ -101,8 +104,8 @@ void RegionCallbacks(const string& transport, const string& _address)
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
unique_ptr<int> intPtr1 = fair::mq::tools::make_unique<int>(42);
unique_ptr<int> intPtr2 = fair::mq::tools::make_unique<int>(43);
unique_ptr<int> intPtr1 = make_unique<int>(42);
unique_ptr<int> intPtr2 = make_unique<int>(43);
fair::mq::tools::Semaphore blocker;
FairMQChannel push("Push", "push", factory);

3
test/sdk/_topology.cxx
View File

@ -11,7 +11,8 @@
#include <asio.hpp>
#include <dds/dds.h>
#include <fairmq/sdk/Topology.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Strings.h>
#include <fairmq/tools/Semaphore.h>
#include <thread>

2
test/tools/_network.cxx
View File

@ -7,7 +7,7 @@
********************************************************************************/
#include <gtest/gtest.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Network.h>
#include <string>

2
test/transport/_options.cxx
View File

@ -11,7 +11,7 @@
#include <FairMQParts.h>
#include <FairMQLogger.h>
#include <FairMQTransportFactory.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Unique.h>
#include <fairmq/ProgOptions.h>
#include <algorithm>

4
test/transport/_transfer_timeout.cxx
View File

@ -11,7 +11,9 @@
#include <FairMQLogger.h>
#include <FairMQTransportFactory.h>
#include <fairmq/ProgOptions.h>
#include <fairmq/Tools.h>
#include <fairmq/tools/Process.h>
#include <fairmq/tools/Strings.h>
#include <fairmq/tools/Unique.h>
#include <gtest/gtest.h>
#include <chrono>