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

Add proper cleanup

Browse Source
This commit is contained in:
babic_a
2020-09-02 14:00:30 +02:00
parent 5b9b650803
commit 20f5557cc1
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/RamBufferWriter.hpp
+2
View File
@@ -8,6 +8,8 @@ class RamBufferWriter {
const std::string detector_name_;
int shm_fd_;
size_t buffer_size_;
void* buffer_;
public:
RamBufferWriter(const std::string& detector_name,
core-buffer/src/RamBufferWriter.cpp
+10 -5
View File
@@ -25,19 +25,24 @@ RamBufferWriter::RamBufferWriter(
}
size_t slot_size = MODULE_N_BYTES + sizeof(ModuleFrame);
size_t buffer_size = slot_size * n_modules * n_slots;
buffer_size_ = slot_size * n_modules * n_slots;
if ((ftruncate(shm_fd_, buffer_size)) == -1) {
if ((ftruncate(shm_fd_, buffer_size_)) == -1) {
throw runtime_error(strerror(errno));
}
void* buffer = mmap(NULL, buffer_size, PROT_WRITE, MAP_SHARED, shm_fd_, 0);
if (buffer == (void*)-1) {
// TODO: Test with MAP_HUGETLB
void* ptr = mmap(NULL, buffer_size_, PROT_WRITE, MAP_SHARED, shm_fd_, 0);
if (ptr == MAP_FAILED) {
throw runtime_error(strerror(errno));
}
buffer_ = ptr;
}
RamBufferWriter::~RamBufferWriter()
{
shm_unlink(detector_name_.c_str());
munmap(buffer_, buffer_size_);
shm_unlink(detector_name_.c_str());
close(shm_fd_);
}