From 2512cf386d584e495e3f178ea891bb62606e7bc5 Mon Sep 17 00:00:00 2001
From: Patrick Niklaus <patrick.niklaus@student.kit.edu>
Date: Fri, 7 Oct 2016 14:14:06 +0200
Subject: [PATCH] Add better debug log output

---
 include/storage/shared_memory.hpp | 8 ++++++--
 src/storage/storage.cpp           | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/storage/shared_memory.hpp b/include/storage/shared_memory.hpp
index 579b17edb..0a5703106 100644
--- a/include/storage/shared_memory.hpp
+++ b/include/storage/shared_memory.hpp
@@ -93,6 +93,8 @@ class SharedMemory
         { // read_only
             shm = boost::interprocess::xsi_shared_memory(boost::interprocess::open_only, key);
 
+            util::SimpleLogger().Write(logDEBUG) << "opening " << shm.get_shmid() << " from id "
+                                                 << id;
             region = boost::interprocess::mapped_region(
                 shm,
                 (read_write ? boost::interprocess::read_write : boost::interprocess::read_only));
@@ -106,6 +108,8 @@ class SharedMemory
             }
             shm = boost::interprocess::xsi_shared_memory(
                 boost::interprocess::open_or_create, key, size);
+            util::SimpleLogger().Write(logDEBUG) << "opening/creating " << shm.get_shmid()
+                                                 << " from id " << id << " with size " << size;
 #ifdef __linux__
             if (-1 == shmctl(shm.get_shmid(), SHM_LOCK, nullptr))
             {
@@ -166,8 +170,8 @@ class SharedMemory
         bool ret = false;
         try
         {
-            util::SimpleLogger().Write(logDEBUG) << "deallocating prev memory";
             boost::interprocess::xsi_shared_memory xsi(boost::interprocess::open_only, key);
+            util::SimpleLogger().Write(logDEBUG) << "deallocating prev memory " << xsi.get_shmid();
             ret = boost::interprocess::xsi_shared_memory::remove(xsi.get_shmid());
         }
         catch (const boost::interprocess::interprocess_exception &e)
@@ -306,7 +310,7 @@ class SharedMemory
         bool ret = false;
         try
         {
-            util::SimpleLogger().Write(logDEBUG) << "deallocating prev memory";
+            util::SimpleLogger().Write(logDEBUG) << "deallocating prev memory for key " << key;
             ret = boost::interprocess::shared_memory_object::remove(key);
         }
         catch (const boost::interprocess::interprocess_exception &e)
diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp
index 5adfe3a8f..982715575 100644
--- a/src/storage/storage.cpp
+++ b/src/storage/storage.cpp
@@ -739,7 +739,9 @@ int Storage::Run()
         static_cast<SharedDataTimestamp *>(data_type_memory->Ptr());
 
     {
+        util::SimpleLogger().Write(logDEBUG) << "waiting for all queries to finish";
         boost::interprocess::scoped_lock<boost::interprocess::named_sharable_mutex> query_lock(barrier.query_mutex);
+        util::SimpleLogger().Write(logDEBUG) << "all queries complete, switching over.";
 
         data_timestamp_ptr->layout = layout_region;
         data_timestamp_ptr->data = data_region;