[XrdCl] AsynSocketHandler: enhance OnWrite logging.

xrootd · May 3, 2021 · 1e0f760 · 1e0f760
1 parent 1578f62
commit 1e0f760
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/XrdCl/XrdClAsyncSocketHandler.cc b/src/XrdCl/XrdClAsyncSocketHandler.cc
@@ -492,6 +492,7 @@ namespace XrdCl
     //--------------------------------------------------------------------------
     Message  *msg             = toWrite;
     size_t    leftToBeWritten = msg->GetSize()-msg->GetCursor();
+    if( !leftToBeWritten ) return XRootDStatus();
 
     while( leftToBeWritten )
     {
@@ -525,6 +526,7 @@ namespace XrdCl
   XRootDStatus AsyncSocketHandler::WriteMessageAndRaw( Message *toWrite, Message *&sign )
   {
     XRootDStatus st;
+    Log *log = DefaultEnv::GetLog();
 
     if( sign )
     {
@@ -542,6 +544,8 @@ namespace XrdCl
       uint32_t bytesWritten = 0;
       st = pOutHandler->WriteMessageBody( pSocket, bytesWritten );
       pOutMsgSize += bytesWritten;
+      log->Dump( AsyncSockMsg, "[%s] Wrote %d bytes of message (0x%x) body.",
+                 pStreamName.c_str(), bytesWritten, toWrite );
       if( !st.IsOK() || st.code == suRetry )
         return st;
     }

diff --git a/src/XrdCl/XrdClSocket.cc b/src/XrdCl/XrdClSocket.cc
@@ -484,7 +484,7 @@ namespace XrdCl
   //! @param kbuff : data to be written
   //! @return      : the amount of data actually written
   //------------------------------------------------------------------------
-  XRootDStatus Socket::Send( XrdSys::KernelBuffer &kbuff )
+  XRootDStatus Socket::Send( XrdSys::KernelBuffer &kbuff, int &bytesWritten )
   {
     if( pTls ) return XRootDStatus( stError, errNotSupported, 0,
                                      "Cannot send a kernel-buffer over TLS." );
@@ -493,6 +493,7 @@ namespace XrdCl
 
     if( status <= 0 )
       return ClassifyErrno( errno );
+    bytesWritten += status;
     return XRootDStatus();
   }
 

diff --git a/src/XrdCl/XrdClSocket.hh b/src/XrdCl/XrdClSocket.hh
@@ -171,7 +171,7 @@ namespace XrdCl
       //! @param kbuff : data to be written
       //! @return      : the amount of data actually written
       //------------------------------------------------------------------------
-      XRootDStatus Send( XrdSys::KernelBuffer &kbuff );
+      XRootDStatus Send( XrdSys::KernelBuffer &kbuff, int &bytesWritten );
 
       //----------------------------------------------------------------------------
       //! Read helper for raw socket

diff --git a/src/XrdCl/XrdClXRootDMsgHandler.cc b/src/XrdCl/XrdClXRootDMsgHandler.cc
@@ -1469,11 +1469,12 @@ namespace XrdCl
 
         while( leftToBeWritten )
         {
-          int bytesWritten = 0;
-          Status st = socket->Send( buffer + pAsyncOffset, leftToBeWritten, bytesWritten );
+          int btswrt = 0;
+          Status st = socket->Send( buffer + pAsyncOffset, leftToBeWritten, btswrt );
           if( !st.IsOK() || st.code == suRetry ) return st;
-          pAsyncOffset    += bytesWritten;
-          leftToBeWritten -= bytesWritten;
+          pAsyncOffset    += btswrt;
+          leftToBeWritten -= btswrt;
+          bytesWritten    += btswrt;
         }
         //----------------------------------------------------------------------
         // Remember that we have moved to the next chunk, also clear the offset
@@ -1508,7 +1509,9 @@ namespace XrdCl
       //------------------------------------------------------------------------
       while( !pKBuff->Empty() )
       {
-        Status st = socket->Send( *pKBuff );
+        int btswrt = 0;
+        Status st = socket->Send( *pKBuff, btswrt );
+        bytesWritten += btswrt;
         if( !st.IsOK() || st.code == suRetry ) return st;
       }