sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-04-24 23:30:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved to boost::thread

Browse Source
This commit is contained in:
babic_a
2018-01-22 10:43:53 +01:00
parent d40c86948c
commit 3d9b4a0aee
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -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)
src/h5_zmq_writer.cpp
+4 -4
View File
@@ -2,9 +2,9 @@
#include <sstream>
#include <zmq.hpp>
#include <cstdlib>
#include <thread>
#include <chrono>
#include <boost/property_tree/json_parser.hpp>
#include <boost/thread.hpp>
#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());