christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

JobClient/Server fixes

Browse Source 
- Retain original CLIENT_RETRY_COUNT semantics after Boost::Asio
  switch
- JobClient is C++11 now, too
- Message reception copy/paste error fixes

Change-Id: I19c474b2a79cd2ac8657e8d58d6170202d096fb0
This commit is contained in:
Horst Schirmeier
2017-12-06 10:31:47 +01:00
parent 9272c5cbed
commit baaa6c3ce8
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/cpn/JobServer.cc
View File

@ -92,7 +92,7 @@ static bool rcvMsg(tcp::socket &socket, google::protobuf::Message &msg,
std::vector<char> buf(msg_size); std::vector<char> buf(msg_size);
len = async_read(socket, buffer(buf), yield[ec]); len = async_read(socket, buffer(buf), yield[ec]);
if (ec || len != sizeof(size)) { if (ec || len != msg_size) {
std::cerr << ec.message() << std::endl; std::cerr << ec.message() << std::endl;
std::cerr << "Read " << len << " instead of " << msg_size std::cerr << "Read " << len << " instead of " << msg_size
<< " bytes from socket" << std::endl; << " bytes from socket" << std::endl;

2
src/core/efw/CMakeLists.txt
View File

@ -8,6 +8,8 @@ set(SRCS
DatabaseExperiment.cc DatabaseExperiment.cc
) )
set_source_files_properties(JobClient.cc PROPERTIES COMPILE_FLAGS -std=c++11)
add_library(fail-efw ${SRCS}) add_library(fail-efw ${SRCS})
add_dependencies(fail-efw fail-protoc) add_dependencies(fail-efw fail-protoc)
target_link_libraries(fail-efw fail-comm) target_link_libraries(fail-efw fail-comm)

4
src/core/efw/JobClient.cc
View File

@ -53,7 +53,7 @@ bool JobClient::connectToServer()
// random engine for backoff. // random engine for backoff.
std::mt19937_64 engine(time(NULL)); std::mt19937_64 engine(time(NULL));
for (int retries = CLIENT_RETRY_COUNT; retries > 0; --retries) { for (int tries = CLIENT_RETRY_COUNT + 1; tries > 0; --tries) {
for (ip::tcp::resolver::iterator end, for (ip::tcp::resolver::iterator end,
addrs = resolver.resolve(query); addrs = resolver.resolve(query);
addrs != end; ++addrs) { addrs != end; ++addrs) {
@ -147,7 +147,7 @@ bool rcvMsg(Socket &s, google::protobuf::Message &msg)
const auto msglen = ntohl(size); const auto msglen = ntohl(size);
std::vector<char> buf(msglen); std::vector<char> buf(msglen);
len = boost::asio::read(s, buffer(buf), ec); len = boost::asio::read(s, buffer(buf), ec);
if (ec || len != sizeof(size)) { if (ec || len != msglen) {
std::cerr << ec.message() << std::endl; std::cerr << ec.message() << std::endl;
std::cerr << "Read " << len << " instead of " << msglen std::cerr << "Read " << len << " instead of " << msglen
<< " bytes from socket" << std::endl; << " bytes from socket" << std::endl;