Merge pull request #381 from alja/access-stat-bytes

pfc-V2 Save and print access statistics in bytes
xrootd · Jun 20, 2016 · 0d9117c · 0d9117c
2 parents 72605c1 + 8dfb6d8
commit 0d9117c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 27 deletions.
diff --git a/src/XrdFileCache/XrdFileCacheFile.cc b/src/XrdFileCache/XrdFileCacheFile.cc
@@ -421,10 +421,10 @@ int File::ReadBlocksFromDisk(std::list<int>& blocks,
 
       total += rs;
 
-
       CheckPrefetchStatDisk(*ii);
    } 
 
+   m_stats.m_BytesDisk += total;
    return total;
 }
 
@@ -468,14 +468,12 @@ int File::Read(char* iUserBuff, long long iUserOff, int iUserSize)
          inc_ref_count(bi->second);
          TRACEF(Dump, "File::Read() " << iUserBuff << "inc_ref_count for existing block << " << bi->second << " idx = " <<  block_idx);
          blks_to_process.push_front(bi->second);
-         m_stats.m_BytesRam++; // AMT what if block fails
       }
       // On disk?
       else if (m_cfi.TestBit(offsetIdx(block_idx)))
       {
          TRACEF(Dump, "File::Read()  read from disk " <<  (void*)iUserBuff << " idx = " << block_idx);
          blks_on_disk.push_back(block_idx);
-         m_stats.m_BytesDisk++;
       }
       // Then we have to get it ...
       else
@@ -492,14 +490,12 @@ int File::Read(char* iUserBuff, long long iUserOff, int iUserSize)
             }
             inc_ref_count(b);
             blks_to_process.push_back(b);
-            m_stats.m_BytesRam++;
          }
          // Nope ... read this directly without caching.
          else
          {
             TRACEF(Dump, "File::Read() direct block " << block_idx);
             blks_direct.push_back(block_idx);
-            m_stats.m_BytesMissed++;
          }
       } 
 
@@ -604,7 +600,7 @@ int File::Read(char* iUserBuff, long long iUserOff, int iUserSize)
             TRACEF(Dump, "File::Read() ub=" << (void*)iUserBuff  << " from finished block  " << (*bi)->m_offset/BS << " size " << size_to_copy);
             memcpy(&iUserBuff[user_off], &((*bi)->m_buff[off_in_block]), size_to_copy);
             bytes_read += size_to_copy;
-
+            m_stats.m_BytesRam += size_to_copy;
             CheckPrefetchStatRAM(*bi);
          }
          else // it has failed ... krap up.
@@ -635,6 +631,7 @@ int File::Read(char* iUserBuff, long long iUserOff, int iUserSize)
       if (direct_handler->m_errno == 0)
       {
          bytes_read += direct_size;
+         m_stats.m_BytesMissed += direct_size;
       }
       else
       {

diff --git a/src/XrdFileCache/XrdFileCacheIOEntireFile.cc b/src/XrdFileCache/XrdFileCacheIOEntireFile.cc
@@ -157,11 +157,6 @@ XrdOucCacheIO *IOEntireFile::Detach()
    return io;
 }
 
-void IOEntireFile::Read (XrdOucCacheIOCB &iocb, char *buff, long long offs, int rlen)
-{
-   iocb.Done(IOEntireFile::Read(buff, offs, rlen));
-}
-
 int IOEntireFile::Read (char *buff, long long off, int size)
 {
    TRACEIO(Dump, "IOEntireFile::Read() "<< this << " off: " << off << " size: " << size );

diff --git a/src/XrdFileCache/XrdFileCacheIOEntireFile.hh b/src/XrdFileCache/XrdFileCacheIOEntireFile.hh
@@ -61,19 +61,6 @@ namespace XrdFileCache
          //---------------------------------------------------------------------
          virtual int Read(char *Buffer, long long Offset, int Length);
 
-         //---------------------------------------------------------------------
-         //! Asynchronous read.
-         //!
-         //! @param callback
-         //! @param Buffer
-         //! @param Offset
-         //! @param Length
-         //!
-         //! @return number of bytes read
-         //---------------------------------------------------------------------
-         virtual void Read (XrdOucCacheIOCB &iocb, char *buff, long long offs, int rlen);
-
-
          //---------------------------------------------------------------------
          //! Pass ReadV request to the corresponding File object.
          //!

diff --git a/src/XrdFileCache/XrdFileCacheIOFileBlock.cc b/src/XrdFileCache/XrdFileCacheIOFileBlock.cc
@@ -44,9 +44,7 @@ IOFileBlock::IOFileBlock(XrdOucCacheIO2 *io, XrdOucCacheStats &statsGlobal, Cach
 //______________________________________________________________________________
 XrdOucCacheIO* IOFileBlock::Detach()
 {
-    TRACEIO(Info, "IOFileBlock::Detach() " );
-    XrdOucCacheIO * io = GetInput();
-
+   XrdOucCacheIO * io = GetInput();
 
    for (std::map<int, File*>::iterator it = m_blocks.begin(); it != m_blocks.end(); ++it)
    {

diff --git a/src/XrdFileCache/XrdFileCacheVRead.cc b/src/XrdFileCache/XrdFileCacheVRead.cc
@@ -125,7 +125,10 @@ int File::ReadV (const XrdOucIOVec *readV, int n)
       if (direct_handler->m_errno == 0)
       {
          for (std::vector<XrdOucIOVec>::iterator i = chunkVec.begin(); i != chunkVec.end(); ++i)
+         {
             bytesRead += i->size;
+            m_stats.m_BytesMissed += i->size;
+         }  
       }
       else
       {
@@ -234,6 +237,7 @@ int File::VReadFromDisk(const XrdOucIOVec *readV, int n, ReadVBlockListDisk& blo
          int rs = m_output->Read(readV[chunkIdx].data + off,  blockIdx*m_cfi.GetBufferSize() + blk_off - m_offset, size);
          if (rs >=0 ) {
             bytes_read += rs;
+            m_stats.m_BytesDisk += rs;
          }
          else {
             // ofs read should set the errno
@@ -295,6 +299,7 @@ int File::VReadProcessBlocks(const XrdOucIOVec *readV, int n,
                overlap(block_idx, m_cfi.GetBufferSize(), readV[*chunkIt].offset, readV[*chunkIt].size, off, blk_off, size);
                memcpy(readV[*chunkIt].data + off,  &(bi->block->m_buff[blk_off]), size);
                bytes_read += size;
+               m_stats.m_BytesRam += size;
             }
          }
          else {