Merge branch 'pssasync-mt-4' into merge-master

xrootd · Oct 27, 2016 · 3aefdcc · 3aefdcc
2 parents 224ebcc + cfd51dc
commit 3aefdcc
Show file tree

Hide file tree

Showing 53 changed files with 6,211 additions and 3,085 deletions.
diff --git a/src/XrdCl/XrdClMessageUtils.hh b/src/XrdCl/XrdClMessageUtils.hh
@@ -44,14 +44,13 @@ namespace XrdCl
       SyncResponseHandler():
         pStatus(0),
         pResponse(0),
-        pSem( new Semaphore(0) ) {}
+        pCondVar(0) {}
 
       //------------------------------------------------------------------------
       //! Destructor
       //------------------------------------------------------------------------
       virtual ~SyncResponseHandler()
       {
-        delete pSem;
       }
 
 
@@ -61,9 +60,10 @@ namespace XrdCl
       virtual void HandleResponse( XRootDStatus *status,
                                    AnyObject    *response )
       {
+        XrdSysCondVarHelper scopedLock(pCondVar);
         pStatus = status;
         pResponse = response;
-        pSem->Post();
+        pCondVar.Broadcast();
       }
 
       //------------------------------------------------------------------------
@@ -87,7 +87,10 @@ namespace XrdCl
       //------------------------------------------------------------------------
       void WaitForResponse()
       {
-        pSem->Wait();
+        XrdSysCondVarHelper scopedLock(pCondVar);
+        while (pStatus == 0) {
+          pCondVar.Wait();
+        }
       }
 
     private:
@@ -96,9 +99,10 @@ namespace XrdCl
 
       XRootDStatus    *pStatus;
       AnyObject       *pResponse;
-      Semaphore       *pSem;
+      XrdSysCondVar    pCondVar;
   };
 
+
   //----------------------------------------------------------------------------
   // We're not interested in the response just commit suicide
   //----------------------------------------------------------------------------

diff --git a/src/XrdFileCache.cmake b/src/XrdFileCache.cmake
@@ -17,10 +17,13 @@ add_library(
   ${LIB_XRD_FILECACHE}
   MODULE
   XrdFileCache/XrdFileCache.cc              XrdFileCache/XrdFileCache.hh
-  XrdFileCache/XrdFileCacheFactory.cc       XrdFileCache/XrdFileCacheFactory.hh
-  XrdFileCache/XrdFileCachePrefetch.cc      XrdFileCache/XrdFileCachePrefetch.hh
+  XrdFileCache/XrdFileCacheConfiguration.cc
+  XrdFileCache/XrdFileCachePurge.cc
+  XrdFileCache/XrdFileCacheFile.cc          XrdFileCache/XrdFileCacheFile.hh
+  XrdFileCache/XrdFileCacheVRead.cc
   XrdFileCache/XrdFileCacheStats.hh
   XrdFileCache/XrdFileCacheInfo.cc          XrdFileCache/XrdFileCacheInfo.hh
+  XrdFileCache/XrdFileCacheIO.cc            XrdFileCache/XrdFileCacheIO.hh
   XrdFileCache/XrdFileCacheIOEntireFile.cc  XrdFileCache/XrdFileCacheIOEntireFile.hh
   XrdFileCache/XrdFileCacheIOFileBlock.cc   XrdFileCache/XrdFileCacheIOFileBlock.hh
   XrdFileCache/XrdFileCacheDecision.hh)

diff --git a/src/XrdFileCache/README b/src/XrdFileCache/README
@@ -114,12 +114,11 @@ CONFIGURATION
 
 pfc.blocksize: prefetch buffer size, default 1M
 
-pfc.nread: number of in memory cached blocks reserved for read tasks
+pfc.ram [bytes[g]]: maximum allowed RAM usage for caching proxy 
 
-pfc.nprefetch: number of in memory cached blocks reserved for prefetch tasks
+pfc.prefetch <n>: prefetch level, default is 10. Value zero disables prefetching.
 
-pfc.diskusage <lwm fraction> <hwm fraction>: high / low watermarks for disk cache
-purge operation (default 0.9 and 0.95)
+pfc.diskusage <low> <hig> diskusage boundaries, can be specified relative in percantage or in g or T bytes
 
 pfc.user <username>: username used by XrdOss plugin
 
@@ -130,12 +129,14 @@ pfc.osslib <lpath> [<params>] path to alternative plign for output file system
 
 pfc.decisionlib <lpath> [<prams>] path to decision library and plugin parameters
 
+pfc.trace <none|error|warning|info|debug|dump> default level is warning, xrootd option -d sets debug level
+
 Examples 
 
 a) Enable proxy file prefetching:
 pps.cachelib libXrdFileCache.so
 pfc.localroot  /data/xrd-file-cache
-pfc.nprefetch 1
+pfc.ram 5g
 
 
 b) enable file block mode, with block size 64 MB: