Merge pull request #2 from AliceO2Group/rm_locks

Manually remove pda and channel locks after eol

Author: pippohub

src/DmaChannelBase.cxx

@@ -3,6 +3,7 @@
 ///
 /// \author Pascal Boeschoten ([email protected])
 
+#include <boost/filesystem.hpp>
 #include "DmaChannelBase.h"
 #include <iostream>
 #include "ChannelPaths.h"
@@ -85,6 +86,11 @@ DmaChannelBase::DmaChannelBase(CardDescriptor cardDescriptor, const Parameters&
 DmaChannelBase::~DmaChannelBase()
 {
   log("Releasing DMA channel lock", InfoLogger::InfoLogger::Debug);
+
+  std::string channelLockPath = "/dev/shm/AliceO2_RoC_" + std::string(getCardDescriptor().pciAddress.toString()) + "_Channel_" + std::to_string((int) getChannelNumber ()) + ".lock";
+  std::string channelMutexPath = "/dev/shm/sem.AliceO2_RoC_" + std::string(getCardDescriptor().pciAddress.toString()) + "_Channel_" + std::to_string((int) getChannelNumber ()) + "_Mutex";
+  bfs::remove(channelLockPath);
+  bfs::remove(channelMutexPath);
 }
 
 void DmaChannelBase::log(const std::string& message, boost::optional<InfoLogger::InfoLogger::Severity> severity)

src/Pda/PdaLock.h

@@ -7,6 +7,7 @@
 #define ALICEO2_SRC_READOUTCARD_PDA_PDALOCK_H_
 
 #include "InterprocessLock.h"
+#include "boost/filesystem.hpp"
 
 namespace AliceO2 {
 namespace roc {
@@ -27,6 +28,12 @@ class PdaLock
     {
     }
 
+    ~PdaLock()
+    {
+      boost::filesystem::remove("/dev/shm/AliceO2_RoC_Pda.lock");
+      boost::filesystem::remove("/dev/shm/sem.AliceO2_RoC_Pda_Mutex");
+    }
+
   private:
     Interprocess::Lock mLock;
 };
@@ -35,4 +42,4 @@ class PdaLock
 } // namespace roc
 } // namespace AliceO2
 
-#endif // ALICEO2_SRC_READOUTCARD_PDA_PDALOCK_H_
+#endif // ALICEO2_SRC_READOUTCARD_PDA_PDALOCK_H_