Implement review suggestions by @amadio.

osschar · Nov 20, 2024 · 6f6736b · 6f6736b
1 parent c609ebc
commit 6f6736b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/XrdPfc/XrdPfcConfiguration.cc b/src/XrdPfc/XrdPfcConfiguration.cc
@@ -15,6 +15,11 @@
 
 #include <fcntl.h>
 
+namespace XrdPfc
+{
+   const char *trace_what_strings[] = {"","error ","warning ","info ","debug ","dump "};
+}
+
 using namespace XrdPfc;
 
 XrdVERSIONINFO(XrdOucGetCache, XrdPfc);

diff --git a/src/XrdPfc/XrdPfcIO.hh b/src/XrdPfc/XrdPfcIO.hh
@@ -77,7 +77,6 @@ private:
 
    void SetInput(XrdOucCacheIO*);
 
-protected:
    // Variables used by File to store IO-relates state. Managed under
    // File::m_state_cond mutex.
    friend class File;
@@ -87,6 +86,7 @@ protected:
    bool   m_allow_prefetching {true};
    bool   m_in_detach         {false};
 
+protected:
    int                m_incomplete_count {0};
    std::map<int, int> m_error_counts;
    bool register_incomplete_read() {

diff --git a/src/XrdPfc/XrdPfcIOFile.cc b/src/XrdPfc/XrdPfcIOFile.cc
@@ -158,7 +158,6 @@ void IOFile::DetachFinalize()
    m_file->RequestSyncOfDetachStats();
    Cache::GetInstance().ReleaseFile(m_file, this);
 
-#ifndef NODEBUG
    if (( ! m_error_counts.empty() || m_incomplete_count > 0) && XRD_TRACE What >= TRACE_Error) {
       char info[1024];
       int pos = 0, cap = 1024;
@@ -175,7 +174,6 @@ void IOFile::DetachFinalize()
       TRACE(Error, "DetachFinalize() " << this << " n_incomplete_reads=" << m_incomplete_count
             << ", block (error : count) report:" << info << (truncated ? " - truncated" : ""));
    }
-#endif
 
    delete this;
 }

diff --git a/src/XrdPfc/XrdPfcTrace.hh b/src/XrdPfc/XrdPfcTrace.hh
@@ -38,6 +38,11 @@
 #define XRD_TRACE GetTrace()->
 #endif
 
+namespace XrdPfc
+{
+   extern const char *trace_what_strings[];
+}
+
 #define ERRNO_AND_ERRSTR(err_code) ", err_code=" << err_code << ", err_str=" << XrdSysE2T(err_code)
 
 #define TRACE(act, x) \
@@ -46,8 +51,7 @@
 
 #define TRACE_INT(act, x) \
    if (XRD_TRACE What >= act) \
-   {static const char* t_what[]={"","error ","warning ","info ","debug ","dump "};\
-    SYSTRACE(XRD_TRACE, 0, m_traceID, 0, t_what[act] << x)}
+       SYSTRACE(XRD_TRACE, 0, m_traceID, 0, trace_what_strings[act] << x)
 
 #define TRACE_TEST(act, x) \
     SYSTRACE(XRD_TRACE, 0, m_traceID, 0, TRACE_STR_ ## act << x)
@@ -66,8 +70,7 @@
 
 #define TRACEF_INT(act, x) \
    if (XRD_TRACE What >= act) \
-   {static const char* t_what[]={"","error ","warning ","info ","debug ","dump "};\
-    SYSTRACE(XRD_TRACE, 0, m_traceID, 0, t_what[act] << x << " " << GetLocalPath())}
+       SYSTRACE(XRD_TRACE, 0, m_traceID, 0, trace_what_strings[act] << x << " " << GetLocalPath())
 
 #else