[XrdCl] RawReader: on discard provide correct number of args to logger.

Also, rename AsyncMsgBodyReader to AsyncRawReaderIntfc.
xrootd · May 20, 2022 · dc8abf8 · dc8abf8
1 parent 7056be9
commit dc8abf8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/src/XrdCl/XrdClAsyncDiscardReader.hh b/src/XrdCl/XrdClAsyncDiscardReader.hh
@@ -24,15 +24,15 @@
 #include "XrdCl/XrdClDefaultEnv.hh"
 #include "XrdCl/XrdClLog.hh"
 #include "XrdCl/XrdClConstants.hh"
-#include "XrdCl/XrdClAsyncMsgBodyReader.hh"
+#include "XrdClAsyncRawReaderIntfc.hh"
 
 namespace XrdCl
 {
 
   //----------------------------------------------------------------------------
   //! Object for discarding data
   //----------------------------------------------------------------------------
-  class AsyncDiscardReader : public AsyncMsgBodyReader
+  class AsyncDiscardReader : public AsyncRawReaderIntfc
   {
     public:
       //------------------------------------------------------------------------
@@ -42,7 +42,7 @@ namespace XrdCl
       //! @param request : client request
       //------------------------------------------------------------------------
       AsyncDiscardReader( const URL &url, const Message &request ) :
-        AsyncMsgBodyReader( url, request )
+        AsyncRawReaderIntfc( url, request )
       {
       }
 

diff --git a/src/XrdCl/XrdClAsyncRawReader.hh b/src/XrdCl/XrdClAsyncRawReader.hh
@@ -20,18 +20,18 @@
 #define SRC_XRDCL_XRDCLASYNCRAWREADER_HH_
 
 
-#include "XrdCl/XrdClAsyncMsgBodyReader.hh"
 #include "XrdCl/XrdClXRootDResponses.hh"
 #include "XrdCl/XrdClSocket.hh"
 #include "XrdCl/XrdClStream.hh"
+#include "XrdClAsyncRawReaderIntfc.hh"
 
 namespace XrdCl
 {
 
   //----------------------------------------------------------------------------
   //! Object for reading out data from the kXR_read response
   //----------------------------------------------------------------------------
-  class AsyncRawReader : public AsyncMsgBodyReader
+  class AsyncRawReader : public AsyncRawReaderIntfc
   {
     public:
       //------------------------------------------------------------------------
@@ -41,7 +41,7 @@ namespace XrdCl
       //! @param request : client request
       //------------------------------------------------------------------------
       AsyncRawReader( const URL &url, const Message &request ) :
-        AsyncMsgBodyReader( url, request )
+        AsyncRawReaderIntfc( url, request )
       {
       }
 

diff --git a/src/XrdCl/XrdClAsyncMsgBodyReader.hh → src/XrdCl/XrdClAsyncRawReaderIntfc.hh b/src/XrdCl/XrdClAsyncMsgBodyReader.hh → src/XrdCl/XrdClAsyncRawReaderIntfc.hh
@@ -16,8 +16,8 @@
 // along with XRootD.  If not, see <http://www.gnu.org/licenses/>.
 //------------------------------------------------------------------------------
 
-#ifndef SRC_XRDCL_XRDCLASYNCMSGBODYREADER_HH_
-#define SRC_XRDCL_XRDCLASYNCMSGBODYREADER_HH_
+#ifndef SRC_XRDCL_XRDCLASYNCRAWREADERINTFC_HH_
+#define SRC_XRDCL_XRDCLASYNCRAWREADERINTFC_HH_
 
 #include "XrdCl/XrdClXRootDResponses.hh"
 #include "XrdCl/XrdClSocket.hh"
@@ -31,11 +31,11 @@ namespace XrdCl
   //----------------------------------------------------------------------------
   //! Base class for any message's body reader
   //----------------------------------------------------------------------------
-  class AsyncMsgBodyReader
+  class AsyncRawReaderIntfc
   {
     public:
 
-      AsyncMsgBodyReader( const URL &url, const Message &request ) :
+      AsyncRawReaderIntfc( const URL &url, const Message &request ) :
         readstage( ReadStart ),
         url( url ),
         request( request ),
@@ -53,7 +53,7 @@ namespace XrdCl
       //------------------------------------------------------------------------
       //! Destructor
       //------------------------------------------------------------------------
-      virtual ~AsyncMsgBodyReader()
+      virtual ~AsyncRawReaderIntfc()
       {
       }
 
@@ -139,7 +139,7 @@ namespace XrdCl
         msgbtsrd += btsrd;
         btsret   += btsrd;
 
-        log->Warning( XRootDMsg, "[%s] %s: Discarded %d bytes",
+        log->Warning( XRootDMsg, "[%s] Discarded %d bytes",
                       url.GetHostId().c_str(), btsrd );
 
         if( !st.IsOK() || st.code == suRetry )
@@ -202,4 +202,4 @@ namespace XrdCl
 
 }
 
-#endif /* SRC_XRDCL_XRDCLASYNCMSGBODYREADER_HH_ */
+#endif /* SRC_XRDCL_XRDCLASYNCRAWREADERINTFC_HH_ */
diff --git a/src/XrdCl/XrdClAsyncVectorReader.hh b/src/XrdCl/XrdClAsyncVectorReader.hh
@@ -21,15 +21,15 @@
 
 #include "XrdCl/XrdClXRootDResponses.hh"
 #include "XrdCl/XrdClSocket.hh"
-#include "XrdCl/XrdClAsyncMsgBodyReader.hh"
+#include "XrdClAsyncRawReaderIntfc.hh"
 
 namespace XrdCl
 {
 
   //----------------------------------------------------------------------------
   //! Object for reading out data from the VectorRead response
   //----------------------------------------------------------------------------
-  class AsyncVectorReader : public AsyncMsgBodyReader
+  class AsyncVectorReader : public AsyncRawReaderIntfc
   {
     public:
       //------------------------------------------------------------------------
@@ -38,7 +38,7 @@ namespace XrdCl
       //! @param url : channel URL
       //------------------------------------------------------------------------
       AsyncVectorReader( const URL &url, const Message &request ) :
-        AsyncMsgBodyReader( url, request ),
+        AsyncRawReaderIntfc( url, request ),
         rdlstoff( 0 ),
         rdlstlen( 0 )
       {

diff --git a/src/XrdCl/XrdClXRootDMsgHandler.hh b/src/XrdCl/XrdClXRootDMsgHandler.hh
@@ -33,11 +33,11 @@
 #include "XrdCl/XrdClLog.hh"
 #include "XrdCl/XrdClConstants.hh"
 
-#include "XrdCl/XrdClAsyncMsgBodyReader.hh"
 #include "XrdCl/XrdClAsyncPageReader.hh"
 #include "XrdCl/XrdClAsyncVectorReader.hh"
 #include "XrdCl/XrdClAsyncRawReader.hh"
 #include "XrdCl/XrdClAsyncDiscardReader.hh"
+#include "XrdClAsyncRawReaderIntfc.hh"
 
 #include "XrdSys/XrdSysPthread.hh"
 #include "XrdSys/XrdSysPageSize.hh"
@@ -626,7 +626,7 @@ namespace XrdCl
       uint32_t                               pAsyncChunkIndex;
 
       std::unique_ptr<AsyncPageReader>       pPageReader;
-      std::unique_ptr<AsyncMsgBodyReader>    pBodyReader;
+      std::unique_ptr<AsyncRawReaderIntfc>   pBodyReader;
 
       Buffer                                 pPgWrtCksumBuff;
       uint32_t                               pPgWrtCurrentPageOffset;