From 3d9b4a0aeeec4e6c595d4682946074e77f324e52 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Mon, 22 Jan 2018 10:43:53 +0100 Subject: [PATCH] Moved to boost::thread --- Makefile | 2 +- src/h5_zmq_writer.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 492c148..aea05bc 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ MKDIR = mkdir -p CPP = g++ CPPFLAGS = -Wall -std=c++1y -I./include -I${CONDA_PREFIX}/include -LDLIBS = -L${CONDA_PREFIX}/lib -lzmq -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lboost_system -lboost_regex +LDLIBS = -L${CONDA_PREFIX}/lib -lzmq -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lboost_system -lboost_regex -lboost_thread LDFLAGS = -g HEADERS = $(wildcard $(SRC_DIR)/*.hpp) diff --git a/src/h5_zmq_writer.cpp b/src/h5_zmq_writer.cpp index 682f501..e65ee66 100644 --- a/src/h5_zmq_writer.cpp +++ b/src/h5_zmq_writer.cpp @@ -2,9 +2,9 @@ #include #include #include -#include #include #include +#include #include "config.hpp" #include "WriterManager.hpp" @@ -24,7 +24,7 @@ void write_h5(WriterManager *manager, RingBuffer *ring_buffer, string output_fil while(manager->is_running() || !ring_buffer->is_empty()) { if (ring_buffer->is_empty()) { - this_thread::sleep_for(chrono::milliseconds(config::ring_buffer_read_retry_interval)); + boost::this_thread::sleep_for(boost::chrono::milliseconds(config::ring_buffer_read_retry_interval)); continue; } @@ -223,8 +223,8 @@ void run_writer(string connect_address, string output_file, uint64_t n_images, u cout << endl; #endif - thread receiver_thread(receive_zmq, &manager, &ring_buffer, connect_address, n_io_threads, receive_timeout); - thread writer_thread(write_h5, &manager, &ring_buffer, output_file); + boost::thread receiver_thread(receive_zmq, &manager, &ring_buffer, connect_address, n_io_threads, receive_timeout); + boost::thread writer_thread(write_h5, &manager, &ring_buffer, output_file); start_rest_api(manager, rest_port, get_input_value_type());