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

fix: Use std::chrono consistently

Browse Source
This commit is contained in:
Dennis Klein 2023-03-02 17:09:55 +01:00 committed by Dennis Klein
parent 05b734ee0d
commit 8960ce9416
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fairmq/CMakeLists.txt
View File

@ -162,7 +162,10 @@ if(BUILD_FAIRMQ)
############################ ############################
# preprocessor definitions # # preprocessor definitions #
############################ ############################
target_compile_definitions(${target} PUBLIC BOOST_ERROR_CODE_HEADER_ONLY) target_compile_definitions(${target} PUBLIC
BOOST_ERROR_CODE_HEADER_ONLY
BOOST_ASIO_HAS_HAS_STD_CHRONO
)
if(FAIRMQ_DEBUG_MODE) if(FAIRMQ_DEBUG_MODE)
target_compile_definitions(${target} PUBLIC FAIRMQ_DEBUG_MODE) target_compile_definitions(${target} PUBLIC FAIRMQ_DEBUG_MODE)
endif() endif()

2
fairmq/shmem/Manager.h
View File

@ -19,7 +19,6 @@
#include <fairlogger/Logger.h> #include <fairlogger/Logger.h>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/interprocess/ipc/message_queue.hpp> #include <boost/interprocess/ipc/message_queue.hpp>
#include <boost/interprocess/managed_shared_memory.hpp> #include <boost/interprocess/managed_shared_memory.hpp>
#include <boost/interprocess/sync/interprocess_condition.hpp> #include <boost/interprocess/sync/interprocess_condition.hpp>
@ -28,6 +27,7 @@
#include <boost/variant.hpp> #include <boost/variant.hpp>
#include <algorithm> // max #include <algorithm> // max
#include <chrono>
#include <condition_variable> #include <condition_variable>
#include <cstddef> // max_align_t #include <cstddef> // max_align_t
#include <cstdlib> // getenv #include <cstdlib> // getenv

10
fairmq/tools/Process.cxx
View File

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * Copyright (C) 2017-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* * * *
* This software is distributed under the terms of the * * This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, * * GNU Lesser General Public Licence (LGPL) version 3, *
@ -10,8 +10,8 @@
#include <fairmq/tools/Strings.h> #include <fairmq/tools/Strings.h>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/process.hpp> #include <boost/process.hpp>
#include <chrono>
#include <csignal> // kill, signals #include <csignal> // kill, signals
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
@ -77,8 +77,10 @@ execute_result execute(const string& cmd, const string& prefix, const string& in
bp::async_pipe errorPipe(ios); bp::async_pipe errorPipe(ios);
const string delimiter = "\n"; const string delimiter = "\n";
ba::deadline_timer inputTimer(ios, boost::posix_time::milliseconds(1000)); // NOLINT ba::steady_timer inputTimer(ios);
ba::deadline_timer signalTimer(ios, boost::posix_time::milliseconds(2000)); // NOLINT inputTimer.expires_after(std::chrono::milliseconds(1000)); // NOLINT
ba::steady_timer signalTimer(ios);
signalTimer.expires_after(std::chrono::milliseconds(2000)); // NOLINT
// child process // child process
bp::child c(cmd, bp::std_out > outputPipe, bp::std_err > errorPipe, bp::std_in < inputPipe); bp::child c(cmd, bp::std_out > outputPipe, bp::std_err > errorPipe, bp::std_in < inputPipe);