From 67699bb7cf64ec7a9ecfcf00b4336da5fb1f3903 Mon Sep 17 00:00:00 2001
From: Matevz Tadel <mtadel@ucsd.edu>
Date: Wed, 20 Nov 2024 12:36:52 -0800
Subject: [PATCH] [Pfc] Add num bytes written to disk and bytes prefetched to
 the gstream record.

---
 src/XrdPfc/XrdPfc.cc     | 6 ++++--
 src/XrdPfc/XrdPfcFile.cc | 2 ++
 src/XrdPfc/XrdPfcFile.hh | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/XrdPfc/XrdPfc.cc b/src/XrdPfc/XrdPfc.cc
index 9d411ced2c6..c074fbb2f68 100644
--- a/src/XrdPfc/XrdPfc.cc
+++ b/src/XrdPfc/XrdPfc.cc
@@ -648,12 +648,14 @@ void Cache::dec_ref_cnt(File* f, bool high_debug)
             int  len = snprintf(buf, 4096, "{\"event\":\"file_close\","
                                  "\"lfn\":\"%s\",\"size\":%lld,\"blk_size\":%d,\"n_blks\":%d,\"n_blks_done\":%d,"
                                  "\"access_cnt\":%lu,\"attach_t\":%lld,\"detach_t\":%lld,\"remotes\":%s,"
-                                 "\"b_hit\":%lld,\"b_miss\":%lld,\"b_bypass\":%lld,\"n_cks_errs\":%d}",
+                                 "\"b_hit\":%lld,\"b_miss\":%lld,\"b_bypass\":%lld,"
+                                 "\"b_todisk\":%lld,\"b_prefetch\":%lld,\"n_cks_errs\":%d}",
                                  f->GetLocalPath().c_str(), f->GetFileSize(), f->GetBlockSize(),
                                  f->GetNBlocks(), f->GetNDownloadedBlocks(),
                                  (unsigned long) f->GetAccessCnt(), (long long) as->AttachTime, (long long) as->DetachTime,
                                  f->GetRemoteLocations().c_str(),
-                                 as->BytesHit, as->BytesMissed, as->BytesBypassed, st.m_NCksumErrors
+                                 as->BytesHit, as->BytesMissed, as->BytesBypassed,
+                                 st.m_BytesWritten, f->GetPrefetchedBytes(), st.m_NCksumErrors
             );
             bool suc = false;
             if (len < 4096)
diff --git a/src/XrdPfc/XrdPfcFile.cc b/src/XrdPfc/XrdPfcFile.cc
index 178d1205c5b..e42aa911beb 100644
--- a/src/XrdPfc/XrdPfcFile.cc
+++ b/src/XrdPfc/XrdPfcFile.cc
@@ -68,6 +68,7 @@ File::File(const std::string& path, long long iOffset, long long iFileSize) :
    m_block_size(0),
    m_num_blocks(0),
    m_prefetch_state(kOff),
+   m_prefetch_bytes(0),
    m_prefetch_read_cnt(0),
    m_prefetch_hit_cnt(0),
    m_prefetch_score(0)
@@ -1320,6 +1321,7 @@ void File::ProcessBlockResponse(Block *b, int res)
             m_state_cond.UnLock();
             return;
          }
+         m_prefetch_bytes += b->get_size();
       }
       else
       {
diff --git a/src/XrdPfc/XrdPfcFile.hh b/src/XrdPfc/XrdPfcFile.hh
index 608e5dd73e3..a95a8b67cf5 100644
--- a/src/XrdPfc/XrdPfcFile.hh
+++ b/src/XrdPfc/XrdPfcFile.hh
@@ -291,6 +291,7 @@ public:
    int                GetBlockSize()         const { return m_cfi.GetBufferSize(); }
    int                GetNBlocks()           const { return m_cfi.GetNBlocks(); }
    int                GetNDownloadedBlocks() const { return m_cfi.GetNDownloadedBlocks(); }
+   long long          GetPrefetchedBytes()   const { return m_prefetch_bytes; }
    const Stats&       RefStats()             const { return m_stats; }
 
    // These three methods are called under Cache's m_active lock
@@ -364,6 +365,7 @@ private:
 
    PrefetchState_e m_prefetch_state;
 
+   long long m_prefetch_bytes;
    int   m_prefetch_read_cnt;
    int   m_prefetch_hit_cnt;
    float m_prefetch_score;              // cached