Removed interface class MemoryManagerClient

Split the memory managers into headers and implementation.
Cut the number of includes by forward declaring classes.

castor/tape/tapeserver/daemon/CMakeLists.txt

@@ -42,7 +42,9 @@ add_library(tapeserver
   TapeWriteTask.cpp
   DiskReadTask.cpp
   DiskWriteTask.cpp
-  MigrationTaskInjector.cpp) 
+  MigrationTaskInjector.cpp
+  MigrationMemoryManager.cpp
+  RecallMemoryManager.cpp) 
 
 
 add_library(tapeserverdTest 

castor/tape/tapeserver/daemon/DataConsumer.hpp

@@ -24,18 +24,18 @@
 
 #pragma once
 
-#include "castor/tape/tapeserver/daemon/MemBlock.hpp"
-
 /**
  * Abstract class used as a base class for the disk/tape write file tasks. The data consumer
  * has two methods: "pushDataBlock" used to put in the consumer's fifo a new full memory block
  * to consume, and "getFreeBlock" used by client code two reclaim the consumed memory block.
  */
-
 namespace castor {
 namespace tape {
 namespace tapeserver {
 namespace daemon {
+  
+// Antcipated declaration to hasten compilation
+class MemBlock;
 
 class DataConsumer {
 public:

castor/tape/tapeserver/daemon/DataFifo.hpp

@@ -26,7 +26,6 @@
 
 #include "castor/tape/tapeserver/threading/BlockingQueue.hpp"
 #include "castor/tape/tapeserver/daemon/MemBlock.hpp"
-#include "castor/tape/tapeserver/daemon/MemManagerClient.hpp"
 #include "castor/tape/tapeserver/exception/Exception.hpp"
 #include "castor/exception/Exception.hpp"
 
@@ -51,7 +50,7 @@ namespace daemon {
   pushDataBlock +------------------------------+  getDataBlock 
                                                                  
  */
-class DataFifo : public MemoryManagerClient {
+class DataFifo {
 public:
  /**
   * Constructor

castor/tape/tapeserver/daemon/DiskWriteTaskTest.cpp

@@ -8,7 +8,8 @@
 #include "castor/tape/tapeserver/client/ClientInterface.hpp"
 #include "castor/log/LogContext.hpp"
 #include "castor/log/StringLogger.hpp"
-#include "castor/tape/tapeserver/daemon/MemManager.hpp"
+#include "castor/tape/tapeserver/daemon/MigrationMemoryManager.hpp"
+#include "castor/tape/tapeserver/daemon/MemBlock.hpp"
 #include <gtest/gtest.h>
 
 namespace unitTests{

castor/tape/tapeserver/daemon/DiskWriteThreadPoolTest.cpp

@@ -8,7 +8,8 @@
 #include "castor/tape/tapeserver/client/ClientInterface.hpp"
 #include "castor/log/LogContext.hpp"
 #include "castor/log/StringLogger.hpp"
-#include "castor/tape/tapeserver/daemon/MemManager.hpp"
+#include "castor/tape/tapeserver/daemon/MigrationMemoryManager.hpp"
+#include "castor/tape/tapeserver/daemon/MemBlock.hpp"
 #include <gtest/gtest.h>
 
 namespace unitTests{

castor/tape/tapeserver/daemon/MigrationMemoryManager.cpp

+/******************************************************************************
+ *                      MigrationMemoryManager.cpp
+ *
+ * This file is part of the Castor project.
+ * See http://castor.web.cern.ch/castor
+ *
+ * Copyright (C) 2003  CERN
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * 
+ *
+ * @author Castor Dev team, castor-dev@cern.ch
+ *****************************************************************************/
+
+#include "castor/tape/tapeserver/daemon/MigrationMemoryManager.hpp"
+#include "castor/tape/tapeserver/daemon/MemBlock.hpp"
+#include "castor/tape/tapeserver/daemon/DataFifo.hpp"
+
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
+
+//------------------------------------------------------------------------------
+// Constructor
+//------------------------------------------------------------------------------
+MigrationMemoryManager::MigrationMemoryManager(const size_t numberOfBlocks, 
+    const size_t blockSize, castor::log::LogContext lc)
+throw(castor::exception::Exception):
+    m_blockCapacity(blockSize), m_totalNumberOfBlocks(0),
+    m_totalMemoryAllocated(0), m_blocksProvided(0), 
+    m_blocksReturned(0), m_lc(lc)
+{
+  for (size_t i = 0; i < numberOfBlocks; i++) {
+    m_freeBlocks.push(new MemBlock(i, blockSize));
+    m_totalNumberOfBlocks++;
+    m_totalMemoryAllocated += blockSize;
+
+    m_lc.pushOrReplace(log::Param("blockId", i));
+    m_lc.log(LOG_DEBUG, "MigrationMemoryManager Created a block");
+  }
+  m_lc.log(LOG_INFO, "MigrationMemoryManager: all blocks have been created");
+}
+
+//------------------------------------------------------------------------------
+// MigrationMemoryManager::~MigrationMemoryManager
+//------------------------------------------------------------------------------
+MigrationMemoryManager::~MigrationMemoryManager() throw() {
+  // Make sure the thread is finished: this should be done by the caller,
+  // who should have called waitThreads.
+  // castor::tape::threading::Thread::wait();
+  // we expect to be called after all users are finished. Just "free"
+  // the memory blocks we still have.
+  castor::tape::threading::BlockingQueue<MemBlock*>::valueRemainingPair ret;
+  do {
+    ret = m_freeBlocks.popGetSize();
+    delete ret.value;
+  } while (ret.remaining > 0);
+
+  m_lc.log(LOG_INFO, "MigrationMemoryManager destruction : all memory blocks have been deleted");
+}
+
+//------------------------------------------------------------------------------
+// MigrationMemoryManager::startThreads
+//------------------------------------------------------------------------------
+void MigrationMemoryManager::startThreads() throw(castor::exception::Exception) {
+  castor::tape::threading::Thread::start();
+  m_lc.log(LOG_INFO, "MigrationMemoryManager starting thread");
+}
+
+//------------------------------------------------------------------------------
+// MigrationMemoryManager::waitThreads
+//------------------------------------------------------------------------------
+void MigrationMemoryManager::waitThreads() throw(castor::exception::Exception) {
+  castor::tape::threading::Thread::wait();
+}
+
+//------------------------------------------------------------------------------
+// MigrationMemoryManager::addClient
+//------------------------------------------------------------------------------
+void MigrationMemoryManager::addClient(DataFifo* c)
+throw(castor::exception::Exception) {
+  m_clientQueue.push(c);
+}
+
+//------------------------------------------------------------------------------
+// MigrationMemoryManager::areBlocksAllBack
+//------------------------------------------------------------------------------
+bool MigrationMemoryManager::areBlocksAllBack()
+throw(){
+  return m_totalNumberOfBlocks == m_freeBlocks.size();
+}
+
+//------------------------------------------------------------------------------
+// MigrationMemoryManager::blockCapacity
+//------------------------------------------------------------------------------
+size_t MigrationMemoryManager::blockCapacity() {
+  return m_blockCapacity;
+}
+
+//------------------------------------------------------------------------------
+// MigrationMemoryManager::finish
+//------------------------------------------------------------------------------
+void MigrationMemoryManager::finish()
+throw(castor::exception::Exception) {
+  addClient(NULL);
+}
+
+//------------------------------------------------------------------------------
+// MigrationMemoryManager::releaseBlock
+//------------------------------------------------------------------------------
+void MigrationMemoryManager::releaseBlock(MemBlock* mb)
+throw(castor::exception::Exception) {
+  mb->reset();
+  m_freeBlocks.push(mb);
+  {
+    castor::tape::threading::MutexLocker ml(&m_countersMutex);
+    m_blocksReturned++;
+  }
+}
+
+//------------------------------------------------------------------------------
+// MigrationMemoryManager::run
+//------------------------------------------------------------------------------
+void MigrationMemoryManager::run() throw(castor::exception::Exception) {
+  while (true) {
+    DataFifo* c = m_clientQueue.pop();
+    // If the c is a NULL pointer, that means end of clients
+    if (!c) return;
+    // Spin on the the client. We rely on the fact that he will want
+    // at least one block (which is the case currently)
+    while (c->provideBlock(m_freeBlocks.pop())) {
+      castor::tape::threading::MutexLocker ml(&m_countersMutex);
+      m_blocksProvided++;
+    }
+  }
+}
+
+}
+}
+}
+}

castor/tape/tapeserver/daemon/MemManager.hpp → castor/tape/tapeserver/daemon/MigrationMemoryManager.hpp

 /******************************************************************************
- *                      MemManager.hpp
+ *                      MigrationMemoryManager.hpp
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
@@ -24,18 +24,22 @@
 
 #pragma once
 
-#include "castor/tape/tapeserver/daemon/MemBlock.hpp"
-#include "castor/tape/tapeserver/daemon/MemManagerClient.hpp"
 #include "castor/tape/tapeserver/threading/BlockingQueue.hpp"
 #include "castor/tape/tapeserver/threading/Threading.hpp"
-#include "castor/exception/Exception.hpp"
 #include "castor/log/LogContext.hpp"
-#include <iostream>
 
 namespace castor {
+namespace exception {
+// Forward declaration  
+class Exception;
+}
 namespace tape {
 namespace tapeserver {
 namespace daemon {
+// Forward declaration
+class TapeWriteTask;
+class MemBlock;
+class DataFifo;
 /**
  * The memory manager is responsible for allocating memory blocks and distributing
  * the free ones around to any class in need. The distribution is actively run in
@@ -49,98 +53,54 @@ public:
    * @param numberOfBlocks: number of blocks to allocate
    * @param blockSize: size of each block
    */
-  MigrationMemoryManager(const size_t numberOfBlocks, const size_t blockSize, castor::log::LogContext lc) 
-          throw(castor::exception::Exception) : 
-  m_blockCapacity(blockSize), m_totalNumberOfBlocks(0),
-  m_totalMemoryAllocated(0), m_blocksProvided(0), m_blocksReturned(0),m_lc(lc) {
-    for (size_t i = 0; i < numberOfBlocks; i++) {
-      m_freeBlocks.push(new MemBlock(i, blockSize));
-      m_totalNumberOfBlocks++;
-      m_totalMemoryAllocated+=blockSize;
-      
-      m_lc.pushOrReplace(log::Param("blockId",i));
-      m_lc.log(LOG_DEBUG,"MigrationMemoryManager Created a block");
-    }
-    m_lc.log(LOG_INFO,"MigrationMemoryManager: all blocks have been created");
-  }
+  MigrationMemoryManager(const size_t numberOfBlocks, const size_t blockSize, 
+          castor::log::LogContext lc) 
+          throw(castor::exception::Exception);
   
   /**
    * 
    * @return the nominal capacity of one block 
    */
-  size_t blockCapacity(){
-    return m_blockCapacity;
-  }
+  size_t blockCapacity();
   
   /**
    * Are all sheep back to the farm?
    * @return 
    */
-  bool areBlocksAllBack() throw() {
-    return m_totalNumberOfBlocks==m_freeBlocks.size();
-  }
+  bool areBlocksAllBack() throw();
   
   /**
    * Start serving clients (in the dedicated thread)
    */
-  void startThreads() throw(castor::exception::Exception) {
-    castor::tape::threading::Thread::start();
-    m_lc.log(LOG_INFO,"MigrationMemoryManager starting thread");
-  }
+  void startThreads() throw(castor::exception::Exception);
   
   /**
    * Waiting for clients to finish (in the dedicated thread)
    */
-  void waitThreads() throw(castor::exception::Exception) {
-    castor::tape::threading::Thread::wait();
-  }
+  void waitThreads() throw(castor::exception::Exception);
   
   /**
    * Adds a new client in need for free memory blocks
    * @param c: the new client
    */
-  void addClient(MemoryManagerClient* c) throw(castor::exception::Exception) {
-    m_clientQueue.push(c);
-  }
+  void addClient(DataFifo* c) throw(castor::exception::Exception);
   
   /**
    * Takes back a block which has been released by one of the clients
    * @param mb: the pointer to the block
    */
-  void releaseBlock(MemBlock *mb) throw(castor::exception::Exception) {
-    mb->reset();
-    m_freeBlocks.push(mb);
-    {
-      castor::tape::threading::MutexLocker ml(&m_countersMutex);
-      m_blocksReturned++;
-    }
-  }
+  void releaseBlock(MemBlock *mb) throw(castor::exception::Exception);
   
   /**
    * Function used to specify that there are no more clients for this memory manager.
    * See the definition of endOfClients below.
    */
-  void finish() throw(castor::exception::Exception) {
-    addClient(NULL);
-  }
+  void finish() throw(castor::exception::Exception);
 
   /**
    * Destructor
    */
-  ~MigrationMemoryManager() throw() {
-    // Make sure the thread is finished: this should be done by the caller,
-    // who should have called waitThreads.
-    // castor::tape::threading::Thread::wait();
-    // we expect to be called after all users are finished. Just "free"
-    // the memory blocks we still have.
-    castor::tape::threading::BlockingQueue<MemBlock*>::valueRemainingPair ret;
-    do{
-      ret=m_freeBlocks.popGetSize();
-      delete ret.value;
-    }while(ret.remaining>0);
-    
-    m_lc.log(LOG_INFO,"MigrationMemoryManager destruction : all memory blocks have been deleted");
-  }
+  ~MigrationMemoryManager() throw();
 private:
   
   
@@ -180,7 +140,7 @@ private:
    * The client queue: we will feed them as soon as blocks
    * become free. This is done in a dedicated thread.
    */
-   castor::tape::threading::BlockingQueue<MemoryManagerClient *> m_clientQueue;
+   castor::tape::threading::BlockingQueue<DataFifo *> m_clientQueue;
 
    /**
     * Logging purpose. Given the fact the class is threaded, the LogContext
@@ -191,27 +151,7 @@ private:
   /**
    * Thread routine: pops a client and provides him blocks until he is happy!
    */
-  void run() throw(castor::exception::Exception) {
-    while(true) {
-      MemoryManagerClient* c = m_clientQueue.pop();
-    
-      // If the c is a NULL pointer, that means end of client 
-      if (!c) {
-        return;
-      };
-      
-      /* Spin on the the client. We rely on the fact that he will want
-       at least one block (which is the case currently) */
-      while (c->provideBlock(m_freeBlocks.pop())) {
-        {
-          castor::tape::threading::MutexLocker ml (&m_countersMutex);
-          m_blocksProvided++;
-        }
-        
-      }
-        
-    }
-  }
+  void run() throw(castor::exception::Exception);
   
 };
 

castor/tape/tapeserver/daemon/MigrationTaskInjector.hpp

@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "castor/tape/tapeserver/daemon/MemManager.hpp"
+#include "castor/tape/tapeserver/daemon/MigrationMemoryManager.hpp"
 #include "castor/tape/tapeserver/daemon/TapeWriteSingleThread.hpp"
 #include "castor/tape/tapeserver/daemon/TapeWriteTask.hpp"
 #include "castor/tape/tapeserver/daemon/DiskReadThreadPool.hpp"

castor/tape/tapeserver/daemon/MemManagerClient.hpp → castor/tape/tapeserver/daemon/RecallMemoryManager.cpp

 /******************************************************************************
- *                      MemManagerClient.hpp
+ *                      RecallMemoryManager.hpp
  *
  * This file is part of the Castor project.
  * See http://castor.web.cern.ch/castor
@@ -22,22 +22,71 @@
  * @author Castor Dev team, castor-dev@cern.ch
  *****************************************************************************/
 
-#pragma once
-
+#include "castor/tape/tapeserver/daemon/RecallMemoryManager.hpp"
 #include "castor/tape/tapeserver/daemon/MemBlock.hpp"
-#include "castor/tape/tapeserver/exception/Exception.hpp"
-#include "castor/exception/Exception.hpp"
+
 
 namespace castor {
 namespace tape {
 namespace tapeserver {
 namespace daemon {
 
-class MemoryManagerClient {
-public:
-  virtual bool provideBlock(MemBlock */*mb*/) =0;
-  virtual ~MemoryManagerClient() throw() {}
-};
+//------------------------------------------------------------------------------
+// Constructor
+//------------------------------------------------------------------------------
+RecallMemoryManager::RecallMemoryManager(const size_t numberOfBlocks, const size_t blockSize, castor::log::LogContext& lc)
+: m_totalNumberOfBlocks(numberOfBlocks), m_lc(lc) {
+  for (size_t i = 0; i < numberOfBlocks; i++) {
+    m_freeBlocks.push(new MemBlock(i, blockSize));
+
+    m_lc.pushOrReplace(log::Param("blockId", i));
+    m_lc.log(LOG_DEBUG, "RecallMemoryManager created a block");
+  }
+  m_lc.log(LOG_INFO, "RecallMemoryManager: all blocks have been created");
+}
+
+//------------------------------------------------------------------------------
+// RecallMemoryManager::~RecallMemoryManager
+//------------------------------------------------------------------------------
+RecallMemoryManager::~RecallMemoryManager() {
+  // Make sure the thread is finished: this should be done by the caller,
+  // who should have called waitThreads.
+  // castor::tape::threading::Thread::wait();
+  // we expect to be called after all users are finished. Just "free"
+  // the memory blocks we still have.
+
+  castor::tape::threading::BlockingQueue<MemBlock*>::valueRemainingPair ret;
+  do {
+    ret = m_freeBlocks.popGetSize();
+    delete ret.value;
+  } while (ret.remaining > 0);
+
+  m_lc.log(LOG_INFO, "RecallMemoryManager destruction : all memory blocks have been deleted");
+}
+
+//------------------------------------------------------------------------------
+// RecallMemoryManager::~RecallMemoryManager
+//------------------------------------------------------------------------------
+bool RecallMemoryManager::areBlocksAllBack() throw() {
+  return m_totalNumberOfBlocks == m_freeBlocks.size();
+}
+
+//------------------------------------------------------------------------------
+// RecallMemoryManager::~RecallMemoryManager
+//------------------------------------------------------------------------------
+MemBlock* RecallMemoryManager::getFreeBlock() {
+  return m_freeBlocks.pop();
+}
+
+//------------------------------------------------------------------------------
+// RecallMemoryManager::~RecallMemoryManager
+//------------------------------------------------------------------------------
+void RecallMemoryManager::releaseBlock(MemBlock* mb) {
+  m_lc.pushOrReplace(log::Param("blockId", mb->m_memoryBlockId));
+  m_lc.log(LOG_DEBUG, "RecallMemoryManager A block has been released");
+  mb->reset();
+  m_freeBlocks.push(mb);
+}
 
 }
 }

castor/tape/tapeserver/daemon/RecallMemoryManager.hpp

@@ -24,19 +24,20 @@
 
 #pragma once
 
-
-#include "castor/tape/tapeserver/daemon/MemBlock.hpp"
-#include "castor/tape/tapeserver/daemon/MemManagerClient.hpp"
 #include "castor/tape/tapeserver/threading/BlockingQueue.hpp"
 #include "castor/tape/tapeserver/threading/Threading.hpp"
-#include "castor/exception/Exception.hpp"
 #include "castor/log/LogContext.hpp"
-#include <iostream>
 
 namespace castor {
+namespace exception {
+// Forward declaration  
+class Exception;    
+}
 namespace tape {
 namespace tapeserver {
 namespace daemon {
+// Forward declaration  
+class MemBlock;
 /**
  * The memory manager is responsible for allocating memory blocks and distributing
  * the free ones around to any class in need.
@@ -50,62 +51,32 @@ public:
    * @param blockSize: size of each block
    */
   RecallMemoryManager(const size_t numberOfBlocks, const size_t blockSize,
-          castor::log::LogContext& lc) 
-  : m_totalNumberOfBlocks(numberOfBlocks),m_lc(lc) {
-    for (size_t i = 0; i < numberOfBlocks; i++) {
-      m_freeBlocks.push(new MemBlock(i, blockSize));
-      
-      m_lc.pushOrReplace(log::Param("blockId",i));
-      m_lc.log(LOG_DEBUG,"RecallMemoryManager created a block");
-    }
-    m_lc.log(LOG_INFO,"RecallMemoryManager: all blocks have been created");
-  }
+          castor::log::LogContext& lc);
   
   /**
    * Are all sheep back to the farm?
    * @return 
    */
-  bool areBlocksAllBack() throw() {
-    return m_totalNumberOfBlocks==m_freeBlocks.size();
-  }
+  bool areBlocksAllBack() throw();
   
   /**
    * Takes back a block which has been released by one of the clients
    * @param mb: the pointer to the block
    */
-  void releaseBlock(MemBlock *mb)  {
-    m_lc.pushOrReplace(log::Param("blockId",mb->m_memoryBlockId));
-    m_lc.log(LOG_DEBUG,"RecallMemoryManager A block has been released");
-    mb->reset();
-    m_freeBlocks.push(mb);
-  }
+  void releaseBlock(MemBlock *mb);
   
-  MemBlock* getFreeBlock(){
-    return m_freeBlocks.pop();
-  }
+  /**
+   * Pop a free block from the free block queue of the memory manager
+   * @return pointer to a free block
+   */
+  MemBlock* getFreeBlock();
   
   /**
    * Destructor
    */
-  ~RecallMemoryManager() {
-    // Make sure the thread is finished: this should be done by the caller,
-    // who should have called waitThreads.
-    // castor::tape::threading::Thread::wait();
-    // we expect to be called after all users are finished. Just "free"
-    // the memory blocks we still have.
-    
-    castor::tape::threading::BlockingQueue<MemBlock*>::valueRemainingPair ret;
-    do{
-      ret=m_freeBlocks.popGetSize();
-      delete ret.value;
-    }while(ret.remaining>0);
-    
-    m_lc.log(LOG_INFO,"RecallMemoryManager destruction : all memory blocks have been deleted");
-  }
+  ~RecallMemoryManager();
   
 private:
-  
-  
   /**
    * Total number of allocated memory blocks
    */

castor/tape/tapeserver/daemon/RecallTaskInjector.hpp

@@ -27,7 +27,7 @@