[2831] make sure flushing memory before unmapping.

diff --git a/src/lib/util/memory_segment_mapped.cc b/src/lib/util/memory_segment_mapped.cc
index 1d912d01e8377820c36c79c502803ac0a67d45cd..9aed111b61e7d8ecfad74cdd528e0843fd3ad395 100644 (file)
--- a/src/lib/util/memory_segment_mapped.cc
+++ b/src/lib/util/memory_segment_mapped.cc
@@ -51,6 +51,7 @@ struct MemorySegmentMapped::Impl {
     void growSegment() {
         // We first need to unmap it before calling grow().
         const size_t prev_size = base_sgmt_->get_size();
+        base_sgmt_->flush();
         base_sgmt_.reset();
 
         const size_t new_size = prev_size * 2;
@@ -113,6 +114,9 @@ MemorySegmentMapped::MemorySegmentMapped(const std::string& filename,
 }
 
 MemorySegmentMapped::~MemorySegmentMapped() {
+    if (impl_->base_sgmt_ && !impl_->read_only_) {
+        impl_->base_sgmt_->flush(); // note: this is exception free
+    }
     delete impl_;
 }
 

diff --git a/src/lib/util/memory_segment_mapped.h b/src/lib/util/memory_segment_mapped.h
index a32b5cba3e7b00265d5863653f9f1eb40d4246d0..e569738d01511c0ac0206588779b6ba8f35d5f75 100644 (file)
--- a/src/lib/util/memory_segment_mapped.h
+++ b/src/lib/util/memory_segment_mapped.h
@@ -91,7 +91,12 @@ public:
     MemorySegmentMapped(const std::string& filename, bool create,
                         size_t initial_size = INITIAL_SIZE);
 
-    /// \brief Destructor
+    /// \brief Destructor.
+    ///
+    /// If the object was constructed in the read-write mode and the underlying
+    /// memory segment wasn't broken due to an exceptional event, the
+    /// destructor ensures the content of the mapped memory is written back to
+    /// the corresponding file.
     virtual ~MemorySegmentMapped();
 
     /// \brief Allocate/acquire a segment of memory.