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

Improve DEBUG outout

Browse Source
This commit is contained in:
babic_a
2018-01-09 08:10:22 +01:00
parent 3585013d33
commit 1cbd68ad89
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/H5ChunkedWriter.cpp
+8 -8
View File
@@ -14,7 +14,7 @@ hsize_t expand_dataset(const H5::DataSet& dataset, hsize_t frame_index, hsize_t
dataset_dimension[0] = frame_index + dataset_increase_step;
#ifdef DEBUG
std::cout << "Expanding dataspace to size (";
std::cout << "[H5ChunkedWriter] Expanding dataspace to size (";
for (hsize_t i=0; i<dataset_rank; ++i) {
std::cout << dataset_dimension[i] << ",";
}
@@ -35,7 +35,7 @@ void compact_dataset(const H5::DataSet& dataset, hsize_t max_frame_index)
dataset_dimension[0] = max_frame_index + 1;
#ifdef DEBUG
std::cout << "Compacting dataspace to size (";
std::cout << "[H5ChunkedWriter] Compacting dataspace to size (";
for (hsize_t i=0; i<dataset_rank; ++i) {
std::cout << dataset_dimension[i] << ",";
}
@@ -62,7 +62,7 @@ void HDF5ChunkedWriter::close_file()
{
if (file.getId() == -1) {
#ifdef DEBUG
std::cout << "Trying to close an already closed file." << std::endl;
std::cout << "[H5ChunkedWriter] Trying to close an already closed file." << std::endl;
#endif
return;
@@ -87,7 +87,7 @@ void HDF5ChunkedWriter::close_file()
auto image_nr_high = max_frame_in_dataset + 1;
#ifdef DEBUG
std::cout << "Setting dataset attribute image_nr_low=" << image_nr_low << " and image_nr_high=" << image_nr_high << std::endl;
std::cout << "[H5ChunkedWriter] Setting dataset attribute image_nr_low=" << image_nr_low << " and image_nr_high=" << image_nr_high << std::endl;
#endif
// H5::IntType int_type(H5::PredType::NATIVE_UINT32);
@@ -136,7 +136,7 @@ void HDF5ChunkedWriter::create_file(size_t* frame_shape, hsize_t frame_chunk) {
// In case frames_per_file is > 0, the filename variable is a template for the filename.
if (frames_per_file) {
#ifdef DEBUG
std::cout << "Frames per file is defined. Format " << filename << " with frame_chunk " << frame_chunk << std::endl;
std::cout << "[H5ChunkedWriter] Frames per file is defined. Format " << filename << " with frame_chunk " << frame_chunk << std::endl;
#endif
// Space for 10 digits should be enough.
@@ -147,7 +147,7 @@ void HDF5ChunkedWriter::create_file(size_t* frame_shape, hsize_t frame_chunk) {
}
#ifdef DEBUG
std::cout << "Creating filename " << target_filename << std::endl;
std::cout << "[H5ChunkedWriter] Creating filename " << target_filename << std::endl;
#endif
// TODO: Create folder if it does not exist.
@@ -163,7 +163,7 @@ void HDF5ChunkedWriter::create_file(size_t* frame_shape, hsize_t frame_chunk) {
H5::DataSpace dataspace(dataset_rank, dataset_dimension, max_dataset_dimension);
#ifdef DEBUG
std::cout << "Creating dataspace of size (";
std::cout << "[H5ChunkedWriter] Creating dataspace of size (";
for (hsize_t i=0; i<dataset_rank; ++i) {
std::cout << dataset_dimension[i] << ",";
}
@@ -202,7 +202,7 @@ hsize_t HDF5ChunkedWriter::prepare_storage_for_frame(size_t frame_index, size_t*
}
#ifdef DEBUG
std::cout << "Received frame index " << frame_index << " and processed as relative frame index " << relative_frame_index << std::endl;
std::cout << "[H5ChunkedWriter] Received frame index " << frame_index << " and processed as relative frame index " << relative_frame_index << std::endl;
#endif
// Open the file if needed.
src/RingBuffer.cpp
+7 -7
View File
@@ -2,7 +2,7 @@
RingBuffer::RingBuffer(size_t n_slots) : n_slots(n_slots), ringbuffer_slots(n_slots, 0){
#ifdef DEBUG
std::cout << "Creating ring buffer with n_slots " << n_slots << std::endl;
std::cout << "[RingBuffer] Creating ring buffer with n_slots " << n_slots << std::endl;
#endif
}
@@ -25,7 +25,7 @@ void RingBuffer::initialize(size_t slot_size)
}
#ifdef DEBUG
std::cout << "Initializing ring buffer with slot_size " << slot_size << std::endl;
std::cout << "[RingBuffer] Initializing ring buffer with slot_size " << slot_size << std::endl;
#endif
this->write_index = 0;
@@ -55,7 +55,7 @@ void RingBuffer::write(FrameMetadata &metadata, char* data)
metadata.buffer_slot_index = write_index;
#ifdef DEBUG
std::cout << "Ring buffer slot " << metadata.buffer_slot_index << " reserved for frame_index " << metadata.frame_index << std::endl;
std::cout << "[RingBuffer] Ring buffer slot " << metadata.buffer_slot_index << " reserved for frame_index " << metadata.frame_index << std::endl;
#endif
// Increase and wrap the write index around if needed.
@@ -75,7 +75,7 @@ void RingBuffer::write(FrameMetadata &metadata, char* data)
std::memcpy(slot_memory_address, data, metadata.frame_bytes_size);
#ifdef DEBUG
std::cout << "Copied " << metadata.frame_bytes_size << " frame bytes to buffer_slot_index " << metadata.buffer_slot_index << std::endl;
std::cout << "[RingBuffer] Copied " << metadata.frame_bytes_size << " frame bytes to buffer_slot_index " << metadata.buffer_slot_index << std::endl;
#endif
frame_metadata_queue_mutex.lock();
@@ -86,7 +86,7 @@ void RingBuffer::write(FrameMetadata &metadata, char* data)
frame_metadata_queue_mutex.unlock();
#ifdef DEBUG
std::cout << "Metadata for frame_index " << metadata.frame_index << " added to metadata queue." << std::endl;
std::cout << "[RingBuffer] Metadata for frame_index " << metadata.frame_index << " added to metadata queue." << std::endl;
#endif
}
@@ -102,7 +102,7 @@ char* RingBuffer::get_buffer_slot_address(size_t buffer_slot_index) {
}
#ifdef DEBUG
std::cout << "For buffer_slot_index " << buffer_slot_index << " the calculated memory address is " << long(slot_memory_address) << std::endl;
std::cout << "[RingBuffer] For buffer_slot_index " << buffer_slot_index << " the calculated memory address is " << long(slot_memory_address) << std::endl;
#endif
return slot_memory_address;
@@ -127,7 +127,7 @@ std::pair<FrameMetadata, char*> RingBuffer::read()
frame_metadata_queue_mutex.unlock();
#ifdef DEBUG
std::cout << "Received metadata for frame_index " << frame_metadata.frame_index << std::endl;
std::cout << "[RingBuffer] Received metadata for frame_index " << frame_metadata.frame_index << std::endl;
#endif
}