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 includes

Browse Source
This commit is contained in:
Alexey Rybalchenko 2020-09-02 12:40:40 +02:00
parent fdbf289364
commit 5e97d85956
16 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fairmq/DeviceRunner.cxx
View File

@ -8,10 +8,14 @@
#include "DeviceRunner.h" #include "DeviceRunner.h"
#include <exception> #include <fairmq/tools/Strings.h>
#include <fairmq/Tools.h> #include <fairmq/tools/Version.h>
#include <fairmq/Version.h> #include <fairmq/Version.h>
#include <fairlogger/Logger.h>
#include <exception>
using namespace std; using namespace std;
using namespace fair::mq; using namespace fair::mq;

1
fairmq/DeviceRunner.h
View File

@ -13,7 +13,6 @@
#include <fairmq/PluginManager.h> #include <fairmq/PluginManager.h>
#include <fairmq/ProgOptions.h> #include <fairmq/ProgOptions.h>
#include <FairMQDevice.h> #include <FairMQDevice.h>
#include <FairMQLogger.h>
#include <functional> #include <functional>
#include <memory> #include <memory>

4
fairmq/FairMQChannel.cxx
View File

@ -7,11 +7,15 @@
********************************************************************************/ ********************************************************************************/
#include "FairMQChannel.h" #include "FairMQChannel.h"
#include <fairmq/tools/Strings.h> #include <fairmq/tools/Strings.h>
#include <fairmq/Properties.h> #include <fairmq/Properties.h>
#include <fairlogger/Logger.h>
#include <boost/algorithm/string.hpp> // join/split #include <boost/algorithm/string.hpp> // join/split
#include <cstddef> // size_t
#include <regex> #include <regex>
#include <set> #include <set>
#include <random> #include <random>

2
fairmq/FairMQChannel.h
View File

@ -13,7 +13,6 @@
#include <FairMQUnmanagedRegion.h> #include <FairMQUnmanagedRegion.h>
#include <FairMQSocket.h> #include <FairMQSocket.h>
#include <fairmq/Transports.h> #include <fairmq/Transports.h>
#include <FairMQLogger.h>
#include <FairMQParts.h> #include <FairMQParts.h>
#include <fairmq/Properties.h> #include <fairmq/Properties.h>
#include <FairMQMessage.h> #include <FairMQMessage.h>
@ -24,7 +23,6 @@
#include <mutex> #include <mutex>
#include <stdexcept> #include <stdexcept>
#include <utility> // std::move #include <utility> // std::move
#include <cstddef> // size_t
#include <cstdint> // int64_t #include <cstdint> // int64_t
class FairMQChannel class FairMQChannel

2
fairmq/FairMQTransportFactory.cxx
View File

@ -15,6 +15,8 @@
#include <FairMQLogger.h> #include <FairMQLogger.h>
#include <fairmq/Tools.h> #include <fairmq/Tools.h>
#include <fairlogger/Logger.h>
#include <memory> #include <memory>
#include <string> #include <string>

1
fairmq/FairMQTransportFactory.h
View File

@ -9,7 +9,6 @@
#ifndef FAIRMQTRANSPORTFACTORY_H_ #ifndef FAIRMQTRANSPORTFACTORY_H_
#define FAIRMQTRANSPORTFACTORY_H_ #define FAIRMQTRANSPORTFACTORY_H_
#include <FairMQLogger.h>
#include <FairMQMessage.h> #include <FairMQMessage.h>
#include <FairMQPoller.h> #include <FairMQPoller.h>
#include <FairMQSocket.h> #include <FairMQSocket.h>

11
fairmq/JSONParser.cxx
View File

@ -12,16 +12,19 @@
* Created on May 14, 2015, 5:01 PM * Created on May 14, 2015, 5:01 PM
*/ */
#include <fairmq/PropertyOutput.h>
#include "JSONParser.h" #include "JSONParser.h"
#include "FairMQLogger.h" #include "FairMQChannel.h"
#include <fairmq/Tools.h> #include <fairmq/PropertyOutput.h>
#include <fairmq/tools/CppSTL.h>
#include <fairmq/tools/Strings.h>
#include <fairlogger/Logger.h>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#include <boost/any.hpp> #include <boost/any.hpp>
#include <ios> #include <iomanip>
using namespace std; using namespace std;
using namespace fair::mq; using namespace fair::mq;

10
fairmq/JSONParser.h
View File

@ -15,15 +15,11 @@
#ifndef FAIR_MQ_JSONPARSER_H #ifndef FAIR_MQ_JSONPARSER_H
#define FAIR_MQ_JSONPARSER_H #define FAIR_MQ_JSONPARSER_H
#include <string> #include <fairmq/Properties.h>
#include <vector>
#include <unordered_map>
#include <exception>
#include <boost/property_tree/ptree_fwd.hpp> #include <boost/property_tree/ptree_fwd.hpp>
#include "FairMQChannel.h" #include <stdexcept>
#include <fairmq/Properties.h> #include <string>
namespace fair namespace fair
{ {

5
fairmq/MemoryResources.h
View File

@ -18,11 +18,12 @@
#include <fairmq/FairMQMessage.h> #include <fairmq/FairMQMessage.h>
class FairMQTransportFactory; class FairMQTransportFactory;
#include <boost/container/container_fwd.hpp>
#include <boost/container/flat_map.hpp> #include <boost/container/flat_map.hpp>
#include <boost/container/pmr/memory_resource.hpp> #include <boost/container/pmr/memory_resource.hpp>
#include <boost/container/pmr/monotonic_buffer_resource.hpp>
#include <boost/container/pmr/polymorphic_allocator.hpp>
#include <cstring> #include <cstring>
#include <stdexcept>
#include <utility> #include <utility>
namespace fair { namespace fair {

9
fairmq/PluginServices.h
View File

@ -17,13 +17,14 @@
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/optional/optional_io.hpp> #include <boost/optional/optional_io.hpp>
#include <condition_variable>
#include <functional> #include <functional>
#include <map>
#include <mutex>
#include <stdexcept>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <mutex> #include <vector>
#include <map>
#include <condition_variable>
#include <stdexcept>
namespace fair namespace fair
{ {

1
fairmq/Properties.h
View File

@ -16,6 +16,7 @@
#include <functional> #include <functional>
#include <map> #include <map>
#include <unordered_map> #include <unordered_map>
#include <stdexcept>
#include <string> #include <string>
#include <typeindex> #include <typeindex>
#include <typeinfo> #include <typeinfo>

3
fairmq/StateMachine.cxx
View File

@ -7,7 +7,8 @@
********************************************************************************/ ********************************************************************************/
#include <fairmq/StateMachine.h> #include <fairmq/StateMachine.h>
#include <fairmq/Tools.h>
#include <fairlogger/Logger.h>
// Increase maximum number of boost::msm states (default is 10) // Increase maximum number of boost::msm states (default is 10)
// This #define has to be before any msm header includes // This #define has to be before any msm header includes

2
fairmq/StateMachine.h
View File

@ -11,8 +11,6 @@
#include <fairmq/States.h> #include <fairmq/States.h>
#include <fairlogger/Logger.h>
#include <string> #include <string>
#include <memory> #include <memory>
#include <functional> #include <functional>

5
fairmq/SuboptParser.cxx
View File

@ -12,9 +12,12 @@
/// @brief Parser implementation for key-value subopt format /// @brief Parser implementation for key-value subopt format
#include <fairmq/SuboptParser.h> #include <fairmq/SuboptParser.h>
#include <fairmq/JSONParser.h>
#include <fairlogger/Logger.h>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#include <cstring>
#include <utility> // make_pair #include <utility> // make_pair
using boost::property_tree::ptree; using boost::property_tree::ptree;

2
fairmq/SuboptParser.h
View File

@ -14,7 +14,7 @@
#ifndef FAIR_MQ_SUBOPTPARSER_H #ifndef FAIR_MQ_SUBOPTPARSER_H
#define FAIR_MQ_SUBOPTPARSER_H #define FAIR_MQ_SUBOPTPARSER_H
#include <fairmq/JSONParser.h> #include <fairmq/Properties.h>
#include <vector> #include <vector>
#include <string> #include <string>

10
test/memory_resources/_memory_resources.cxx
View File

@ -9,6 +9,7 @@
#include <cstring> #include <cstring>
#include <fairmq/FairMQTransportFactory.h> #include <fairmq/FairMQTransportFactory.h>
#include <fairmq/MemoryResourceTools.h> #include <fairmq/MemoryResourceTools.h>
#include <boost/container/pmr/polymorphic_allocator.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <vector> #include <vector>
@ -79,8 +80,7 @@ TEST(MemoryResources, allocator)
testData::ndeallocations = 0; testData::ndeallocations = 0;
{ {
std::vector<testData, polymorphic_allocator<testData>> v( std::vector<testData, polymorphic_allocator<testData>> v(polymorphic_allocator<testData>{allocZMQ});
polymorphic_allocator<testData>{allocZMQ});
v.reserve(3); v.reserve(3);
EXPECT_TRUE(v.capacity() == 3); EXPECT_TRUE(v.capacity() == 3);
EXPECT_TRUE(allocZMQ->getNumberOfMessages() == 1); EXPECT_TRUE(allocZMQ->getNumberOfMessages() == 1);
@ -105,8 +105,7 @@ TEST(MemoryResources, getMessage)
// test message creation on the same channel it was allocated with // test message creation on the same channel it was allocated with
{ {
std::vector<testData, polymorphic_allocator<testData>> v( std::vector<testData, polymorphic_allocator<testData>> v(polymorphic_allocator<testData>{allocZMQ});
polymorphic_allocator<testData>{allocZMQ});
v.emplace_back(1); v.emplace_back(1);
v.emplace_back(2); v.emplace_back(2);
v.emplace_back(3); v.emplace_back(3);
@ -121,8 +120,7 @@ TEST(MemoryResources, getMessage)
// test message creation on a different channel than it was allocated with // test message creation on a different channel than it was allocated with
{ {
std::vector<testData, polymorphic_allocator<testData>> v( std::vector<testData, polymorphic_allocator<testData>> v(polymorphic_allocator<testData>{allocZMQ});
polymorphic_allocator<testData>{allocZMQ});
v.emplace_back(4); v.emplace_back(4);
v.emplace_back(5); v.emplace_back(5);
v.emplace_back(6); v.emplace_back(6);