From 6db671215ac5051f191ade7a5746102416284edc Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 29 Oct 2013 18:52:13 +0100 Subject: [PATCH] warn if shared memory segment could not be allocated properly --- datastore.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/datastore.cpp b/datastore.cpp index c01373a52..8817d699e 100644 --- a/datastore.cpp +++ b/datastore.cpp @@ -370,13 +370,21 @@ int main( const int argc, const char * argv[] ) { if(use_first_segment) { BOOST_ASSERT( DATA == DATA_1 ); BOOST_ASSERT( LAYOUT == LAYOUT_1 ); - SharedMemory::Remove(DATA_2); - SharedMemory::Remove(LAYOUT_2); + if( !SharedMemory::Remove(DATA_2) ) { + SimpleLogger().Write(logWARNING) << "could not delete DATA_2"; + } + if( !SharedMemory::Remove(LAYOUT_2) ) { + SimpleLogger().Write(logWARNING) << "could not delete LAYOUT_2"; + } } else { BOOST_ASSERT( DATA == DATA_2 ); BOOST_ASSERT( LAYOUT == LAYOUT_2 ); - SharedMemory::Remove(DATA_1); - SharedMemory::Remove(LAYOUT_1); + if( !SharedMemory::Remove(DATA_1) ) { + SimpleLogger().Write(logWARNING) << "could not delete DATA_1"; + } + if( !SharedMemory::Remove(LAYOUT_1) ) { + SimpleLogger().Write(logWARNING) << "could not delete LAYOUT_1"; + } } SimpleLogger().Write() << "all data loaded"; } catch(const std::exception & e) {