Merge pull request #380 from osschar/pssasync-mt-2

XrdPfc: Print data server in info trace
xrootd · Jun 17, 2016 · 72605c1 · 72605c1
2 parents 439ec0c + 1705806
commit 72605c1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/src/XrdFileCache/XrdFileCache.cc b/src/XrdFileCache/XrdFileCache.cc
@@ -155,7 +155,9 @@ XrdOucCacheIO2 *Cache::Attach(XrdOucCacheIO2 *io, int Options)
       else
          cio = new IOEntireFile(io, m_stats, *this);
 
-      TRACE(Info, "Cache::Attach() " << io->Path());
+      TRACE_PC(Info, const char* loc = io->Location(),
+               "Cache::Attach() " << io->Path() << " location: " <<
+               ((loc && loc[0] != 0) ? loc : "<deferred open>"));
       return cio;
    }
    else

diff --git a/src/XrdFileCache/XrdFileCacheIO.cc b/src/XrdFileCache/XrdFileCacheIO.cc
@@ -1,5 +1,5 @@
 #include "XrdFileCacheIO.hh"
-#include "XrdSys/XrdSysAtomics.hh"
+#include "XrdFileCacheTrace.hh"
 #include "XrdPosix/XrdPosixFile.hh"
 
 using namespace XrdFileCache;
@@ -13,19 +13,19 @@ m_statsGlobal(stats), m_cache(cache), m_traceID("IO"), m_io(io)
 void IO::Update(XrdOucCacheIO2 &iocp)
 {
    SetInput(&iocp);
+   TRACE_PC(Info, const char* loc = Location(),
+            "IO::Update() " << Path() << " location: " <<
+            ((loc && loc[0] != 0) ? loc : "<not set>"));
 }
 
-
 void IO::SetInput(XrdOucCacheIO2* x)
 {
-   updMutex.Lock();
+   XrdSysMutexHelper lock(&updMutex);
    m_io = x;
-   updMutex.UnLock();
 }
 
 XrdOucCacheIO2* IO::GetInput()
 {
-   AtomicBeg(updMutex);
+   XrdSysMutexHelper lock(&updMutex);
    return m_io;
-   AtomicEnd(updMutex);
 }
diff --git a/src/XrdFileCache/XrdFileCacheIO.hh b/src/XrdFileCache/XrdFileCacheIO.hh
@@ -52,7 +52,7 @@ namespace XrdFileCache
 
       private:
          XrdOucCacheIO2   *m_io;          //!< original data source
-         XrdSysRecMutex   updMutex;
+         XrdSysMutex       updMutex;
          void SetInput(XrdOucCacheIO2*);
    };
 }

diff --git a/src/XrdFileCache/XrdFileCacheTrace.hh b/src/XrdFileCache/XrdFileCacheTrace.hh
@@ -31,6 +31,10 @@
    if (XRD_TRACE What >= TRACE_ ## act) \
       {XRD_TRACE Beg(m_traceID);   cerr << TRACE_STR_##act  <<x; XRD_TRACE End();}
 
+#define TRACE_PC(act, pre_code, x)           \
+   if (XRD_TRACE What >= TRACE_ ## act) \
+   {pre_code; XRD_TRACE Beg(m_traceID);   cerr << TRACE_STR_##act  <<x; XRD_TRACE End();}
+
 #define TRACEIO(act, x) \
    if (XRD_TRACE What >= TRACE_ ## act) \
    {XRD_TRACE Beg(m_traceID);   cerr << TRACE_STR_##act <<x << " " <<  GetPath(); XRD_TRACE End();}
@@ -39,12 +43,13 @@
    if (XRD_TRACE What >= TRACE_ ## act) \
    {XRD_TRACE Beg(m_traceID);   cerr << TRACE_STR_##act << x << " " <<  GetLocalPath(); XRD_TRACE End();}
 
-
-
-
 #else
 
 #define TRACE(act,x)
+#define TRACE_PC(act, pre_code, x)
+#define TRACEIO(act, x)
+#define TRACEF(act, x)
+
 #endif
 
 #endif
diff --git a/src/XrdPosix/XrdPosixPrepIO.cc b/src/XrdPosix/XrdPosixPrepIO.cc
@@ -95,6 +95,6 @@ bool XrdPosixPrepIO::Init(XrdOucCacheIOCB *iocbP)
 
 // Inform the cache that we have now have a new I/O object
 //
-   fileP->XCio->Update((XrdOucCacheIO2 &)*fileP);
+   fileP->XCio->Update(*fileP);
    return true;
 }