From 8b96e28bb3191ee7f30e57ba19248cc9df5aeddf Mon Sep 17 00:00:00 2001 From: Babicaa Date: Thu, 25 Apr 2019 11:49:35 +0200 Subject: [PATCH] Move writing functions to PSIWriter --- lib/src/ProcessManager.cpp | 223 ------------------------------------- lib/src/ProcessManager.hpp | 9 -- 2 files changed, 232 deletions(-) diff --git a/lib/src/ProcessManager.cpp b/lib/src/ProcessManager.cpp index 07d835d..7901b34 100644 --- a/lib/src/ProcessManager.cpp +++ b/lib/src/ProcessManager.cpp @@ -22,61 +22,6 @@ ProcessManager::ProcessManager(WriterManager& writer_manager, ZmqReceiver& recei { } -void ProcessManager::notify_first_pulse_id(uint64_t pulse_id) -{ - string request_address(bsread_rest_address); - - // First pulse_id should be an async operation - we do not want to make the writer wait. - async(launch::async, [pulse_id, &request_address]{ - try { - - cout << "Sending first received pulse_id " << pulse_id << " to bsread_rest_address " << request_address << endl; - - stringstream request; - request << "curl -X PUT " << request_address << "/start_pulse_id/" << pulse_id; - - string request_call(request.str()); - - #ifdef DEBUG_OUTPUT - using namespace date; - cout << "[" << std::chrono::system_clock::now() << "]"; - cout << "[ProcessManager::notify_first_pulse_id] Sending request (" << request_call << ")." << endl; - #endif - - system(request_call.c_str()); - } catch (...){} - - }); -} - -void ProcessManager::notify_last_pulse_id(uint64_t pulse_id) -{ - // Last pulse_id should be a sync operation - we do not want to terminate the process to quickly. - cout << "Sending last received pulse_id " << pulse_id << " to bsread address " << bsread_rest_address << endl; - - try { - stringstream request; - request << "curl -X PUT " << bsread_rest_address << "/stop_pulse_id/" << pulse_id; - - cout << "Request: " << request.str() << endl; - - string request_call(request.str()); - - #ifdef DEBUG_OUTPUT - using namespace date; - cout << "[" << std::chrono::system_clock::now() << "]"; - cout << "[ProcessManager::notify_last_pulse_id] Sending request (" << request_call << ")." << endl; - #endif - - system(request_call.c_str()); - } catch (...){} -} - -void ProcessManager::run_writer(std::string output_file, uint64_t n_frames) -{ - - -} void ProcessManager::run_receivers(uint8_t n_receiving_threads) { @@ -152,171 +97,3 @@ void ProcessManager::receive_zmq() #endif } -void ProcessManager::write_h5 (string output_file, uint64_t n_frames) -{ - try { - - size_t metadata_buffer_size = frames_per_file != 0 ? frames_per_file : n_frames; - auto metadata_buffer = unique_ptr(new MetadataBuffer(metadata_buffer_size, receiver.get_header_values_type())); - - auto writer = get_buffered_writer(output_file, n_frames, move(metadata_buffer), - frames_per_file, config::dataset_increase_step); - - writer->create_file(); - - auto raw_frames_dataset_name = config::raw_image_dataset_name; - - uint64_t last_pulse_id = 0; - - while(writer_manager.is_writing() || !ring_buffer.is_empty()) { - - if (ring_buffer.is_empty()) { - boost::this_thread::sleep_for(boost::chrono::milliseconds(config::ring_buffer_read_retry_interval)); - continue; - } - - const pair< shared_ptr, char* > received_data = ring_buffer.read(); - - // NULL pointer means that the ringbuffer->read() timeouted. Faster than rising an exception. - if(!received_data.first) { - continue; - } - - // The acquisition stops when there are no more frames to write. - if (!writer_manager.write_frame()) { - break; - } - - // When using file roll over, write the file format before switching to the next file. - if (!writer->is_data_for_current_file(received_data.first->frame_index)) { - #ifdef DEBUG_OUTPUT - using namespace date; - cout << "[" << std::chrono::system_clock::now() << "]"; - cout << "[ProcessManager::write_h5] Frame index " << received_data.first->frame_index; - cout << " does not belong to current file. Write format before the file will be closed." << endl; - #endif - - writer->write_metadata_to_file(); - - write_h5_format(writer->get_h5_file()); - } - - #ifdef PERF_OUTPUT - using namespace date; - auto start_time_frame = std::chrono::system_clock::now(); - #endif - - // Write image data. - writer->write_data(raw_frames_dataset_name, - received_data.first->frame_index, - received_data.second, - received_data.first->frame_shape, - received_data.first->frame_bytes_size, - received_data.first->type, - received_data.first->endianness); - - #ifdef PERF_OUTPUT - using namespace date; - using namespace std::chrono; - - auto frame_time_difference = std::chrono::system_clock::now() - start_time_frame; - auto frame_diff_ms = duration(frame_time_difference).count(); - - cout << "[" << std::chrono::system_clock::now() << "]"; - cout << "[ProcessManager::write_h5] Frame index "; - cout << received_data.first->frame_index << " written in " << frame_diff_ms << " ms." << endl; - #endif - - ring_buffer.release(received_data.first->buffer_slot_index); - - #ifdef PERF_OUTPUT - using namespace date; - auto start_time_metadata = std::chrono::system_clock::now(); - #endif - - // Write image metadata if mapping specified. - auto header_values_type = receiver.get_header_values_type(); - if (header_values_type) { - - for (const auto& header_type : *header_values_type) { - - auto& name = header_type.first; - auto value = received_data.first->header_values.at(name); - - // TODO: Ugly hack until we get the start sequence in the bsread stream itself. - if (name == "pulse_id") { - if (!last_pulse_id) { - last_pulse_id = *(reinterpret_cast(value.get())); - notify_first_pulse_id(last_pulse_id); - } else { - last_pulse_id = *(reinterpret_cast(value.get())); - } - } - - writer->cache_metadata(name, received_data.first->frame_index, value.get()); - } - } - - #ifdef PERF_OUTPUT - using namespace date; - using namespace std::chrono; - - auto metadata_time_difference = std::chrono::system_clock::now() - start_time_metadata; - auto metadata_diff_ms = duration(metadata_time_difference).count(); - - cout << "[" << std::chrono::system_clock::now() << "]"; - cout << "[ProcessManager::write_h5] Frame metadata index "; - cout << received_data.first->frame_index << " written in " << metadata_diff_ms << " ms." << endl; - #endif - } - - // Send the last_pulse_id only if it was set. - if (last_pulse_id) { - notify_last_pulse_id(last_pulse_id); - } - - if (writer->is_file_open()) { - #ifdef DEBUG_OUTPUT - using namespace date; - cout << "[" << std::chrono::system_clock::now() << "]"; - cout << "[ProcessManager::write] Writing file format." << endl; - #endif - - writer->write_metadata_to_file(); - - write_h5_format(writer->get_h5_file()); - } - - #ifdef DEBUG_OUTPUT - using namespace date; - cout << "[" << std::chrono::system_clock::now() << "]"; - cout << "[ProcessManager::write] Closing file " << writer_manager.get_output_file() << endl; - #endif - - writer->close_file(); - - #ifdef DEBUG_OUTPUT - using namespace date; - cout << "[" << std::chrono::system_clock::now() << "]"; - cout << "[ProcessManager::write] Writer thread stopped." << endl; - #endif - - writer_manager.writing_completed(); - - } catch (const exception& ex) { - writer_manager.writing_error(ex.what()); - } -} - -void ProcessManager::write_h5_format(H5::H5File& file) { - - const auto parameters = writer_manager.get_parameters(); - - try { - H5FormatUtils::write_format(file, format, parameters); - } catch (const runtime_error& ex) { - using namespace date; - std::cout << "[" << std::chrono::system_clock::now() << "]"; - std::cout << "[ProcessManager::write_h5_format] Error while trying to write file format: "<< ex.what() << endl; - } -} diff --git a/lib/src/ProcessManager.hpp b/lib/src/ProcessManager.hpp index 2bfac48..a54baba 100644 --- a/lib/src/ProcessManager.hpp +++ b/lib/src/ProcessManager.hpp @@ -19,14 +19,6 @@ class ProcessManager const std::string& bsread_rest_address; hsize_t frames_per_file; - void notify_first_pulse_id(uint64_t pulse_id); - void notify_last_pulse_id(uint64_t pulse_id); - - protected: - void receive_zmq(); - void write_h5(std::string output_file, uint64_t n_frames); - void write_h5_format(H5::H5File& file); - public: ProcessManager(WriterManager& writer_manager, ZmqReceiver& receiver, @@ -37,7 +29,6 @@ class ProcessManager hsize_t frames_per_file=0); void run_receivers(uint8_t n_receiving_threads); - void run_writer(std::string output_file, uint64_t n_frames); };