From 5788f187ee74bc654a7632ef60b231ec1e244cbb Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Mon, 27 Apr 2020 17:32:00 +0200 Subject: [PATCH] Revert back to single frame writing --- core-buffer/src/SFWriter.cpp | 13 +------------ core-buffer/test/perf_SFWriter.cpp | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/core-buffer/src/SFWriter.cpp b/core-buffer/src/SFWriter.cpp index 1f9f12c..5d16254 100644 --- a/core-buffer/src/SFWriter.cpp +++ b/core-buffer/src/SFWriter.cpp @@ -100,16 +100,7 @@ void SFWriter::write(shared_ptr metadata, char* data) { // buffer_space, // disk_space); - if (image_buffer_count_ < WRITER_BUFFER_SIZE) { - char* buffer = image_buffer_.get(); - memcpy( - (buffer + image_buffer_count_), - data, - MODULE_N_BYTES * n_modules_); - - image_buffer_count_++; - } else { hsize_t offset[] = {current_write_index_, 0, 0}; if( H5DOwrite_chunk( @@ -129,7 +120,5 @@ void SFWriter::write(shared_ptr metadata, char* data) { throw runtime_error(error_message.str()); } - current_write_index_ += WRITER_BUFFER_SIZE; - image_buffer_count_ = 0; - } + current_write_index_ += 1; } diff --git a/core-buffer/test/perf_SFWriter.cpp b/core-buffer/test/perf_SFWriter.cpp index dfff35a..8f75f88 100644 --- a/core-buffer/test/perf_SFWriter.cpp +++ b/core-buffer/test/perf_SFWriter.cpp @@ -75,7 +75,7 @@ int main (int argc, char *argv[]) if (i_write==100) { cout << "avg_write_ms " << total_ms / 100; - cout << " min_write_ms" << min_ms; + cout << " min_write_ms " << min_ms; cout << " max_write_ms " << max_ms << endl; i_write = 0;