From 52d060728c83fdd8140b6ba16fe5425f9f777095 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Mon, 25 May 2020 14:32:45 +0200 Subject: [PATCH] Rename function to buffer --- sf-writer/include/WriterZmqReceiver.hpp | 2 +- sf-writer/src/WriterZmqReceiver.cpp | 2 +- sf-writer/src/main.cpp | 2 +- sf-writer/test/test_WriterZmqReceiver.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sf-writer/include/WriterZmqReceiver.hpp b/sf-writer/include/WriterZmqReceiver.hpp index 58ccbd6..f9fddfd 100644 --- a/sf-writer/include/WriterZmqReceiver.hpp +++ b/sf-writer/include/WriterZmqReceiver.hpp @@ -22,7 +22,7 @@ public: virtual ~WriterZmqReceiver(); - void get_next_batch( + void get_next_buffer( const uint64_t pulse_id, ImageMetadataBuffer* image_metadata, char* image_buffer); diff --git a/sf-writer/src/WriterZmqReceiver.cpp b/sf-writer/src/WriterZmqReceiver.cpp index a51af4c..c1fdf2d 100644 --- a/sf-writer/src/WriterZmqReceiver.cpp +++ b/sf-writer/src/WriterZmqReceiver.cpp @@ -46,7 +46,7 @@ WriterZmqReceiver::~WriterZmqReceiver() } } -void WriterZmqReceiver::get_next_batch( +void WriterZmqReceiver::get_next_buffer( const uint64_t pulse_id, ImageMetadataBuffer* image_metadata, char* image_buffer) diff --git a/sf-writer/src/main.cpp b/sf-writer/src/main.cpp index 13d0463..930d154 100644 --- a/sf-writer/src/main.cpp +++ b/sf-writer/src/main.cpp @@ -41,7 +41,7 @@ void receive_replay( auto metadata = queue.get_metadata_buffer(slot_id); auto buffer = queue.get_data_buffer(slot_id); - receiver.get_next_batch( + receiver.get_next_buffer( current_pulse_id, metadata, buffer); queue.commit(); diff --git a/sf-writer/test/test_WriterZmqReceiver.cpp b/sf-writer/test/test_WriterZmqReceiver.cpp index 90996c2..402e409 100644 --- a/sf-writer/test/test_WriterZmqReceiver.cpp +++ b/sf-writer/test/test_WriterZmqReceiver.cpp @@ -70,7 +70,7 @@ TEST(WriterZmqReceiver, basic_test) 0); } - receiver.get_next_batch(pulse_id, &image_metadata, image_buffer.get()); + receiver.get_next_buffer(pulse_id, &image_metadata, image_buffer.get()); EXPECT_EQ(pulse_id, image_metadata.pulse_id); EXPECT_EQ(image_metadata.is_good_frame, 1); EXPECT_EQ(image_metadata.daq_rec, 4);