From cc82e2246163d3a68da5340d335a43b74387e8ba Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 19 Feb 2019 17:15:51 +0100
Subject: [PATCH] fix
---
common/cpp/include/common/networking.h | 7 ++++---
common/cpp/include/request/request.h | 4 ++--
common/cpp/include/request/request_pool.h | 2 +-
common/cpp/src/request/request_pool.cpp | 2 +-
common/cpp/unittests/request/test_request.cpp | 8 ++++----
common/cpp/unittests/request/test_request_pool.cpp | 8 ++++----
producer/api/src/producer_impl.cpp | 2 +-
producer/api/src/producer_request.cpp | 10 +++++-----
producer/api/src/producer_request.h | 5 +++--
producer/api/src/producer_request_handler_factory.cpp | 3 ++-
producer/api/src/producer_request_handler_factory.h | 6 +++---
producer/api/unittests/mocking.h | 2 +-
producer/api/unittests/test_producer_impl.cpp | 6 +++---
13 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/common/cpp/include/common/networking.h b/common/cpp/include/common/networking.h
index cafe5f2ce..3d740dc91 100644
--- a/common/cpp/include/common/networking.h
+++ b/common/cpp/include/common/networking.h
@@ -36,11 +36,12 @@ struct GenericRequestHeader {
op_code{i_op_code}, data_id{i_data_id}, data_size{i_data_size} {
strncpy(message, i_message.c_str(), kMaxMessageSize);
}
- GenericRequestHeader(const GenericRequestHeader &header) {op_code = header.op_code, data_id = header.data_id,data_size = header.data_size,
- strncpy(message, header.message, kMaxMessageSize);
+ GenericRequestHeader(const GenericRequestHeader& header) {
+ op_code = header.op_code, data_id = header.data_id, data_size = header.data_size,
+ strncpy(message, header.message, kMaxMessageSize);
}
- Opcode op_code;
+ Opcode op_code;
uint64_t data_id;
uint64_t data_size;
char message[kMaxMessageSize];
diff --git a/common/cpp/include/request/request.h b/common/cpp/include/request/request.h
index d386a479d..42f4ea000 100644
--- a/common/cpp/include/request/request.h
+++ b/common/cpp/include/request/request.h
@@ -8,9 +8,9 @@
namespace asapo {
class GenericRequest {
- public:
+ public:
GenericRequest() = delete;
- GenericRequest(GenericRequestHeader h): header{std::move(h)}{};
+ GenericRequest(GenericRequestHeader h): header{std::move(h)} {};
GenericRequestHeader header;
virtual ~GenericRequest() = default;
};
diff --git a/common/cpp/include/request/request_pool.h b/common/cpp/include/request/request_pool.h
index 4b344846e..b1eb65157 100644
--- a/common/cpp/include/request/request_pool.h
+++ b/common/cpp/include/request/request_pool.h
@@ -21,7 +21,7 @@ class RequestPool {
std::unique_lock<std::mutex> lock;
};
public:
- explicit RequestPool(uint8_t n_threads, RequestHandlerFactory* request_handler_factory,AbstractLogger* log);
+ explicit RequestPool(uint8_t n_threads, RequestHandlerFactory* request_handler_factory, AbstractLogger* log);
VIRTUAL Error AddRequest(std::unique_ptr<GenericRequest> request);
~RequestPool();
uint64_t NRequestsInQueue();
diff --git a/common/cpp/src/request/request_pool.cpp b/common/cpp/src/request/request_pool.cpp
index 63f484e6d..a7b78c3c9 100644
--- a/common/cpp/src/request/request_pool.cpp
+++ b/common/cpp/src/request/request_pool.cpp
@@ -4,7 +4,7 @@
namespace asapo {
RequestPool:: RequestPool(uint8_t n_threads,
- RequestHandlerFactory* request_handler_factory,AbstractLogger* log): log__{log},
+ RequestHandlerFactory* request_handler_factory, AbstractLogger* log): log__{log},
request_handler_factory__{request_handler_factory},
threads_{n_threads} {
for(size_t i = 0; i < n_threads; i++) {
diff --git a/common/cpp/unittests/request/test_request.cpp b/common/cpp/unittests/request/test_request.cpp
index c8ed393a8..5e07bdabd 100644
--- a/common/cpp/unittests/request/test_request.cpp
+++ b/common/cpp/unittests/request/test_request.cpp
@@ -41,10 +41,10 @@ TEST(Request, Constructor) {
GenericRequestHeader header{asapo::kOpcodeTransferData, 1, 2, "hello"};
GenericRequest r{header};
- ASSERT_THAT(r.header.data_id,Eq(1));
- ASSERT_THAT(r.header.op_code,Eq(asapo::kOpcodeTransferData));
- ASSERT_THAT(r.header.data_size,Eq(2));
- ASSERT_THAT(r.header.message,testing::StrEq("hello"));
+ ASSERT_THAT(r.header.data_id, Eq(1));
+ ASSERT_THAT(r.header.op_code, Eq(asapo::kOpcodeTransferData));
+ ASSERT_THAT(r.header.data_size, Eq(2));
+ ASSERT_THAT(r.header.message, testing::StrEq("hello"));
}
}
diff --git a/common/cpp/unittests/request/test_request_pool.cpp b/common/cpp/unittests/request/test_request_pool.cpp
index bee5a58e6..8fd7bca7f 100644
--- a/common/cpp/unittests/request/test_request_pool.cpp
+++ b/common/cpp/unittests/request/test_request_pool.cpp
@@ -52,8 +52,8 @@ class MockRequestHandlerFactory : public asapo::RequestHandlerFactory {
};
class TestRequest : public GenericRequest {
- public:
- TestRequest(GenericRequestHeader header):GenericRequest(header){};
+ public:
+ TestRequest(GenericRequestHeader header): GenericRequest(header) {};
};
@@ -63,7 +63,7 @@ class RequestPoolTests : public testing::Test {
NiceMock<asapo::MockLogger> mock_logger;
MockRequestHandlerFactory request_handler_factory{mock_request_handler};
const uint8_t nthreads = 1;
- asapo::RequestPool pool {nthreads, &request_handler_factory,&mock_logger};
+ asapo::RequestPool pool {nthreads, &request_handler_factory, &mock_logger};
std::unique_ptr<GenericRequest> request{new TestRequest{GenericRequestHeader{}}};
void SetUp() override {
}
@@ -79,7 +79,7 @@ TEST(RequestPool, Constructor) {
EXPECT_CALL(mock_logger, Debug(HasSubstr("starting"))).Times(4);
EXPECT_CALL(mock_logger, Debug(HasSubstr("finishing thread"))).Times(4);
- asapo::RequestPool pool{4, &factory,&mock_logger};
+ asapo::RequestPool pool{4, &factory, &mock_logger};
}
TEST_F(RequestPoolTests, AddRequestDoesNotGoFurtherWhenNotReady) {
diff --git a/producer/api/src/producer_impl.cpp b/producer/api/src/producer_impl.cpp
index 20cefa78e..54cdc409c 100644
--- a/producer/api/src/producer_impl.cpp
+++ b/producer/api/src/producer_impl.cpp
@@ -26,7 +26,7 @@ ProducerImpl::ProducerImpl(std::string endpoint, uint8_t n_processing_threads, a
request_handler_factory_.reset(new ProducerRequestHandlerFactory{endpoint});
}
- request_pool__.reset(new RequestPool{n_processing_threads, request_handler_factory_.get(),log__});
+ request_pool__.reset(new RequestPool{n_processing_threads, request_handler_factory_.get(), log__});
}
GenericRequestHeader ProducerImpl::GenerateNextSendRequest(uint64_t file_id, uint64_t file_size,
diff --git a/producer/api/src/producer_request.cpp b/producer/api/src/producer_request.cpp
index fb1ea5dca..3dde2696d 100644
--- a/producer/api/src/producer_request.cpp
+++ b/producer/api/src/producer_request.cpp
@@ -12,11 +12,11 @@ Error ProducerRequest::ReadDataFromFileIfNeeded(const IO* io) {
}
ProducerRequest::ProducerRequest(std::string beamtime_id,
- GenericRequestHeader h,
- FileData data,
- std::string original_filepath,
- RequestCallback callback) : GenericRequest(std::move(h)),beamtime_id{beamtime_id},data{std::move(data)},
- original_filepath{std::move(original_filepath)},callback{callback} {
+ GenericRequestHeader h,
+ FileData data,
+ std::string original_filepath,
+ RequestCallback callback) : GenericRequest(std::move(h)), beamtime_id{beamtime_id}, data{std::move(data)},
+ original_filepath{std::move(original_filepath)}, callback{callback} {
}
}
\ No newline at end of file
diff --git a/producer/api/src/producer_request.h b/producer/api/src/producer_request.h
index ac6ea2f21..d423d7b17 100644
--- a/producer/api/src/producer_request.h
+++ b/producer/api/src/producer_request.h
@@ -10,8 +10,9 @@
namespace asapo {
class ProducerRequest : public GenericRequest {
- public:
- ProducerRequest(std::string beamtime_id,GenericRequestHeader header,FileData data,std::string original_filepath,RequestCallback callback);
+ public:
+ ProducerRequest(std::string beamtime_id, GenericRequestHeader header, FileData data, std::string original_filepath,
+ RequestCallback callback);
std::string beamtime_id;
FileData data;
std::string original_filepath;
diff --git a/producer/api/src/producer_request_handler_factory.cpp b/producer/api/src/producer_request_handler_factory.cpp
index b920226c5..d5d58d498 100644
--- a/producer/api/src/producer_request_handler_factory.cpp
+++ b/producer/api/src/producer_request_handler_factory.cpp
@@ -6,7 +6,8 @@
namespace asapo {
-std::unique_ptr<RequestHandler> ProducerRequestHandlerFactory::NewRequestHandler(uint64_t thread_id, uint64_t* shared_counter) {
+std::unique_ptr<RequestHandler> ProducerRequestHandlerFactory::NewRequestHandler(uint64_t thread_id,
+ uint64_t* shared_counter) {
switch (type_) {
case asapo::RequestHandlerType::kTcp:
return std::unique_ptr<RequestHandler> {new RequestHandlerTcp(discovery_service_, thread_id, shared_counter)};
diff --git a/producer/api/src/producer_request_handler_factory.h b/producer/api/src/producer_request_handler_factory.h
index b111143d3..f1931b83b 100644
--- a/producer/api/src/producer_request_handler_factory.h
+++ b/producer/api/src/producer_request_handler_factory.h
@@ -11,9 +11,9 @@ namespace asapo {
class ProducerRequestHandlerFactory : public RequestHandlerFactory {
public:
- ProducerRequestHandlerFactory(ReceiverDiscoveryService* discovery_service);
- ProducerRequestHandlerFactory(std::string destination_folder);
- VIRTUAL std::unique_ptr<RequestHandler> NewRequestHandler(uint64_t thread_id, uint64_t* shared_counter) override;
+ ProducerRequestHandlerFactory(ReceiverDiscoveryService* discovery_service);
+ ProducerRequestHandlerFactory(std::string destination_folder);
+ VIRTUAL std::unique_ptr<RequestHandler> NewRequestHandler(uint64_t thread_id, uint64_t* shared_counter) override;
private:
RequestHandlerType type_;
ReceiverDiscoveryService* discovery_service_{nullptr};
diff --git a/producer/api/unittests/mocking.h b/producer/api/unittests/mocking.h
index dc81bfe58..e009cd094 100644
--- a/producer/api/unittests/mocking.h
+++ b/producer/api/unittests/mocking.h
@@ -25,7 +25,7 @@ class MockDiscoveryService : public asapo::ReceiverDiscoveryService {
class MockRequestPull : public RequestPool {
public:
MockRequestPull(RequestHandlerFactory* request_handler_factory, AbstractLogger* log) :
- RequestPool{1, request_handler_factory,log} {};
+ RequestPool{1, request_handler_factory, log} {};
asapo::Error AddRequest(std::unique_ptr<asapo::GenericRequest> request) override {
if (request == nullptr) {
return asapo::Error{AddRequest_t(nullptr)};
diff --git a/producer/api/unittests/test_producer_impl.cpp b/producer/api/unittests/test_producer_impl.cpp
index 6152a5efd..ee16aa05d 100644
--- a/producer/api/unittests/test_producer_impl.cpp
+++ b/producer/api/unittests/test_producer_impl.cpp
@@ -51,7 +51,7 @@ class ProducerImplTests : public testing::Test {
testing::NiceMock<MockDiscoveryService> service;
asapo::ProducerRequestHandlerFactory factory{&service};
testing::NiceMock<asapo::MockLogger> mock_logger;
- testing::NiceMock<MockRequestPull> mock_pull{&factory,&mock_logger};
+ testing::NiceMock<MockRequestPull> mock_pull{&factory, &mock_logger};
asapo::ProducerImpl producer{"", 1, asapo::RequestHandlerType::kTcp};
void SetUp() override {
producer.log__ = &mock_logger;
@@ -94,7 +94,7 @@ TEST_F(ProducerImplTests, OKSendingSendDataRequest) {
producer.SetBeamtimeId(expected_beamtimeid);
ProducerRequest request{"", asapo::GenericRequestHeader{asapo::kOpcodeTransferData, expected_id, expected_size, expected_name},
- nullptr, "", nullptr};
+ nullptr, "", nullptr};
EXPECT_CALL(mock_pull, AddRequest_t(M_CheckSendDataRequest(asapo::kOpcodeTransferData,
expected_beamtimeid, expected_id, expected_size, expected_name))).WillOnce(Return(
@@ -114,7 +114,7 @@ TEST_F(ProducerImplTests, OKSendingSendFileRequest) {
producer.SetBeamtimeId(expected_beamtimeid);
ProducerRequest request{"", asapo::GenericRequestHeader{asapo::kOpcodeTransferData, expected_id, 0, expected_name},
- nullptr, "", nullptr};
+ nullptr, "", nullptr};
EXPECT_CALL(mock_pull, AddRequest_t(M_CheckSendDataRequest(asapo::kOpcodeTransferData,
expected_beamtimeid, expected_id, 0, expected_name))).WillOnce(Return(
--
GitLab