Move base IO class to separate file.

xrootd · Jun 30, 2016 · 37ea140 · 37ea140
1 parent 923085a
commit 37ea140
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 53 deletions.
diff --git a/src/XrdFileCache.cmake b/src/XrdFileCache.cmake
@@ -21,6 +21,7 @@ add_library(
   XrdFileCache/XrdFileCacheFile.cc          XrdFileCache/XrdFileCacheFile.hh
   XrdFileCache/XrdFileCacheStats.hh
   XrdFileCache/XrdFileCacheInfo.cc          XrdFileCache/XrdFileCacheInfo.hh
+  XrdFileCache/XrdFileCacheIO.hh
   XrdFileCache/XrdFileCacheIOEntireFile.cc  XrdFileCache/XrdFileCacheIOEntireFile.hh
   XrdFileCache/XrdFileCacheIOFileBlock.cc   XrdFileCache/XrdFileCacheIOFileBlock.hh
   XrdFileCache/XrdFileCacheDecision.hh)

diff --git a/src/XrdFileCache/XrdFileCache.cc b/src/XrdFileCache/XrdFileCache.cc
@@ -100,9 +100,8 @@ void Cache::Detach(XrdOucCacheIO* io)
    delete io;
 }
 
+// XXXX MT: is the following needed ???
 //______________________________________________________________________________
-
-
 void Cache::getFilePathFromURL(const char* iUrl, std::string &result) const
 {
    XrdCl::URL url(iUrl);
@@ -118,7 +117,6 @@ Cache::HaveFreeWritingSlots()
    return s_writeQ.size < maxWriteWaits;
 }
 
-
 //______________________________________________________________________________
 void
 Cache::AddWriteTask(Block* b, bool fromRead)

diff --git a/src/XrdFileCache/XrdFileCache.hh b/src/XrdFileCache/XrdFileCache.hh
@@ -30,6 +30,7 @@ namespace XrdCl {
 }
 namespace XrdFileCache {
 class File;
+class IO;
 }
 
 namespace XrdFileCache
@@ -39,9 +40,6 @@ namespace XrdFileCache
    //----------------------------------------------------------------------------
    class Cache : public XrdOucCache
    {
-      friend class IOEntireFile;
-      friend class IOFileBlock;
-
       public:
          //---------------------------------------------------------------------
          //! Constructor
@@ -93,12 +91,10 @@ namespace XrdFileCache
 
          void Prefetch();
 
-      private:
          //! Decrease attached count. Called from IO::Detach().
          void Detach(XrdOucCacheIO *);
 
-         //! Transfor URL to path on local disk.
-         void getFilePathFromURL(const char* url, std::string& res) const;
+      private:
 
          //! Short log alias.
          XrdCl::Log* clLog() const { return XrdCl::DefaultEnv::GetLog(); }
@@ -114,7 +110,7 @@ namespace XrdFileCache
             WriteQ() : condVar(0), size(0) {}
             XrdSysCondVar         condVar;  //!< write list condVar
             size_t                size;     //!< cache size of a container
-             std::list<Block*>  queue;    //!< container
+            std::list<Block*>     queue;    //!< container
          };
 
          WriteQ s_writeQ;
@@ -124,41 +120,6 @@ namespace XrdFileCache
        FileList  m_files;
    };
 
-   //----------------------------------------------------------------------------
-   //! Base cache-io class that implements XrdOucCacheIO abstract methods.
-   //----------------------------------------------------------------------------
-   class IO : public XrdOucCacheIO
-   {
-      friend class File;
-
-      public:
-         IO (XrdOucCacheIO &io, XrdOucCacheStats &stats, Cache &cache) :
-         m_io(io), m_statsGlobal(stats), m_cache(cache) {}
-
-         //! Original data source.
-         virtual XrdOucCacheIO *Base() { return &m_io; }
-
-         //! Original data source URL.
-         virtual long long FSize() { return m_io.FSize(); }
-
-         //! Original data source URL.
-         virtual const char *Path() { return m_io.Path(); }
-
-         virtual int Sync() { return 0; }
-
-         virtual int Trunc(long long Offset) { errno = ENOTSUP; return -1; }
-
-         virtual int Write(char *Buffer, long long Offset, int Length)
-         { errno = ENOTSUP; return -1; }
-
-
-      protected:
-         XrdCl::Log* clLog() const { return XrdCl::DefaultEnv::GetLog(); }
-
-         XrdOucCacheIO    &m_io;          //!< original data source
-         XrdOucCacheStats &m_statsGlobal; //!< reference to Cache statistics
-         Cache            &m_cache;       //!< reference to Cache needed in detach
-   };
 }
 
 #endif
diff --git a/src/XrdFileCache/XrdFileCacheIOEntireFile.cc b/src/XrdFileCache/XrdFileCacheIOEntireFile.cc
@@ -37,12 +37,11 @@ IOEntireFile::IOEntireFile(XrdOucCacheIO &io, XrdOucCacheStats &stats, Cache & c
      m_file(0)
 {
    clLog()->Info(XrdCl::AppMsg, "IO::IO() [%p] %s", this, m_io.Path());
-
-   std::string fname;
-   m_cache.getFilePathFromURL(io.Path(), fname);
+   
+   XrdCl::URL url(io.Path());
+   std::string fname = Factory::GetInstance().RefConfiguration().m_cache_dir + url.GetPath();
 
    m_file = new File(io, fname, 0, io.FSize());
-
 }
 
 IOEntireFile::~IOEntireFile()

diff --git a/src/XrdFileCache/XrdFileCacheIOEntireFile.hh b/src/XrdFileCache/XrdFileCacheIOEntireFile.hh
@@ -21,6 +21,7 @@
 #include <string>
 
 #include "XrdSys/XrdSysPthread.hh"
+#include "XrdFileCacheIO.hh"
 #include "XrdFileCache.hh"
 #include "XrdFileCacheStats.hh"
 #include "XrdFileCacheFile.hh"

diff --git a/src/XrdFileCache/XrdFileCacheIOFileBlock.cc b/src/XrdFileCache/XrdFileCacheIOFileBlock.cc
@@ -86,8 +86,9 @@ void IOFileBlock::GetBlockSizeFromPath()
 //______________________________________________________________________________
 File* IOFileBlock::newBlockFile(long long off, int blocksize, XrdOucCacheIO*  io)
 {
-   std::string fname;
-   m_cache.getFilePathFromURL(io->Path(), fname);
+   XrdCl::URL url(io->Path());
+   std::string fname = Factory::GetInstance().RefConfiguration().m_cache_dir + url.GetPath();
+
    std::stringstream ss;
    ss << fname;
    char offExt[64];

diff --git a/src/XrdFileCache/XrdFileCacheIOFileBlock.hh b/src/XrdFileCache/XrdFileCacheIOFileBlock.hh
@@ -23,8 +23,7 @@
 #include "XrdOuc/XrdOucCache.hh"
 #include "XrdSys/XrdSysPthread.hh"
 
-#include "XrdFileCache.hh"
-#include "XrdFileCacheFile.hh"
+#include "XrdFileCacheIO.hh"
 
 class XrdSysError;
 class XrdOssDF;