Moved classes DataConsumer, DataFifo, MemException,

MemBlock, MemManager, MemManagerClient, MigrationJob,
TapeReadFileTask, TapeReadTask, TapeSingleThreadInterface,
TapeReadSingleThread, TapeWriteTask, TaskInjector
into castor::tape::tapeserver::daemon

castor/tape/tapeserver/daemon/DataConsumer.hpp

@@ -31,6 +31,12 @@
  * 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 {
+
 class DataConsumer {
 public:
   
@@ -51,3 +57,8 @@ public:
    */
   virtual ~DataConsumer() {}
 };
+
+}
+}
+}
+}

castor/tape/tapeserver/daemon/DataFifo.hpp

@@ -30,6 +30,11 @@
 #include "castor/tape/tapeserver/daemon/Exception.hpp"
 #include "castor/exception/Exception.hpp"
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
+
 /* A fixed payload FIFO: at creation time, we know how many blocks will go through the FIFO.
   The provide block method return true as long as it still needs more block. False when last
   block is provided (and throws an exception after that).
@@ -101,3 +106,8 @@ private:
   castor::tape::threading::BlockingQueue<MemBlock *> m_freeBlocks;
   castor::tape::threading::BlockingQueue<MemBlock *> m_dataBlocks;
 };
+
+}
+}
+}
+}

castor/tape/tapeserver/daemon/Exception.hpp

@@ -30,6 +30,11 @@
 #include <string.h>
 #include <stdio.h>
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
+
 class MemException: public std::exception {
 public:
   MemException(const std::string & what): m_what(what) {}
@@ -42,3 +47,9 @@ private:
 };
 
 void errnoExeptLauncher(int ret, void * obj);
+
+}
+}
+}
+}
+

castor/tape/tapeserver/daemon/MemBlock.hpp

@@ -27,6 +27,11 @@
 #include "castor/tape/tapeserver/daemon/Exception.hpp"
 #include <memory>
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
+
 class Payload
 {
 public:
@@ -81,3 +86,8 @@ public:
   int m_tapeFileBlock;
  
 };
+
+}
+}
+}
+}

castor/tape/tapeserver/daemon/MemManager.hpp

@@ -31,6 +31,10 @@
 #include "castor/exception/Exception.hpp"
 #include <iostream>
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
 /**
  * The memory manager is responsible for allocating memory blocks and distributing
  * the free ones around to any class in need.
@@ -163,3 +167,9 @@ private:
   }
   
 };
+
+}
+}
+}
+}
+

castor/tape/tapeserver/daemon/MemManagerClient.hpp

@@ -28,6 +28,11 @@
 #include "castor/tape/tapeserver/daemon/Exception.hpp"
 #include "castor/exception/Exception.hpp"
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
+
 class MemoryManagerClient {
 public:
   virtual bool endOfWork() throw() = 0;
@@ -36,3 +41,8 @@ public:
   };
   virtual ~MemoryManagerClient() throw() {}
 };
+
+}
+}
+}
+}

castor/tape/tapeserver/daemon/MigrationJob.hpp

@@ -24,6 +24,11 @@
 
 #pragma once
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
+
 class MigrationJob{
 public:
   MigrationJob(int fId, int fs, int bCnt): fileId(fId), fSeq(fs), blockCount(bCnt) {}
@@ -31,3 +36,8 @@ public:
   int fSeq;
   int blockCount;
 };
+
+}
+}
+}
+}

castor/tape/tapeserver/daemon/TapeReadFileTask.hpp

@@ -29,6 +29,11 @@
 #include "castor/tape/tapeserver/daemon/MemManager.hpp"
 #include "castor/tape/tapeserver/daemon/DataConsumer.hpp"
 
+
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
 class TapeReadFileTask: public TapeReadTask {
 public:
   TapeReadFileTask(DataConsumer & destination, int fSeq, int blockCount): m_fSeq(fSeq), 
@@ -52,3 +57,7 @@ private:
   int m_blockCount;
   DataConsumer & m_fifo;
 };
+}
+}
+}
+}

castor/tape/tapeserver/daemon/TapeReadSingleThread.hpp

@@ -32,6 +32,10 @@
 #include <iostream>
 #include <stdio.h>
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
 class TapeReadSingleThread : public TapeSingleThreadInterface<TapeReadTask>{
 public:
   TapeReadSingleThread(castor::tape::drives::DriveInterface & drive): 
@@ -51,3 +55,8 @@ private:
       }
     }  
 };
+}
+}
+}
+}
+

castor/tape/tapeserver/daemon/TapeReadTask.hpp

@@ -27,6 +27,10 @@
 #include "castor/tape/tapeserver/daemon/Exception.hpp"
 #include "castor/tape/tapeserver/drive/Drive.hpp"
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
 class TapeReadTask {
 public:
   virtual bool endOfWork() = 0;
@@ -35,3 +39,7 @@ public:
   };
   virtual ~TapeReadTask() {}
 };
+}
+}
+}
+}

castor/tape/tapeserver/daemon/TapeSingleThreadInterface.hpp

@@ -9,8 +9,13 @@
 #define	TAPESINGLETHREADINTERFACE_HPP
 
 #include "castor/tape/tapeserver/threading/Threading.hpp"
+#include "castor/tape/tapeserver/threading/BlockingQueue.hpp"
 #include "castor/tape/tapeserver/drive/Drive.hpp"
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
 template <class Task> class TapeSingleThreadInterface : private castor::tape::threading::Thread
 {
 protected:
@@ -31,4 +36,9 @@ public:
   {}
 };
 
+}
+}
+}
+}
+
 #endif	/* TAPESINGLETHREADINTERFACE_HPP */

castor/tape/tapeserver/daemon/TapeWriteTask.hpp

@@ -27,6 +27,11 @@
 #include "castor/tape/tapeserver/daemon/Exception.hpp"
 #include "castor/tape/tapeserver/drive/Drive.hpp"
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
+
 /**
  * Abstract class describing the interface for a task that wants to write to disk.
  * This is inherited exclusively by DiskWriteFileTask.
@@ -66,3 +71,7 @@ public:
    */
   virtual ~TapeWriteTask() {};
 };
+}
+}
+}
+}

castor/tape/tapeserver/daemon/TaskInjector.hpp

@@ -24,8 +24,19 @@
 
 #pragma once
 
+namespace castor {
+namespace tape {
+namespace tapeserver {
+namespace daemon {
+
 class TaskInjector{
 public:
   virtual void requestInjection(int maxFiles, int maxBlocks, bool lastCall) = 0;
   virtual ~TaskInjector() {}
 };
+
+}
+}
+}
+}
+