[XrdCl] PostMaster::Receive: use smart ptr.

xrootd · Nov 23, 2021 · 9487494 · 9487494
1 parent 194e398
commit 9487494
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/src/XrdCl/XrdClChannel.cc b/src/XrdCl/XrdClChannel.cc
@@ -110,9 +110,9 @@ namespace
       //------------------------------------------------------------------------
       // Wait for the arrival of the message
       //------------------------------------------------------------------------
-      XrdCl::Message *GetMessage()
+      std::shared_ptr<XrdCl::Message> GetMessage()
       {
-        return pMsg.get();
+        return pMsg;
       }
 
       //------------------------------------------------------------------------
@@ -319,9 +319,9 @@ namespace XrdCl
   //----------------------------------------------------------------------------
   // Synchronously receive a message - blocks until a message matching
   //----------------------------------------------------------------------------
-  Status Channel::Receive( Message       *&msg,
-                           MessageFilter  *filter,
-                           time_t          expires )
+  Status Channel::Receive( std::shared_ptr<Message> &msg,
+                           MessageFilter            *filter,
+                           time_t                    expires )
   {
     FilterHandler fh( filter );
     Status sc = Receive( &fh, expires );

diff --git a/src/XrdCl/XrdClChannel.hh b/src/XrdCl/XrdClChannel.hh
@@ -120,7 +120,7 @@ namespace XrdCl
       //! @return        success when the message has been received
       //!                successfully, failure otherwise
       //------------------------------------------------------------------------
-      Status Receive( Message *&msg, MessageFilter *filter, time_t expires );
+      Status Receive( std::shared_ptr<Message> &msg, MessageFilter *filter, time_t expires );
 
       //------------------------------------------------------------------------
       //! Listen to incoming messages, the listener is notified when a new

diff --git a/src/XrdCl/XrdClPostMaster.cc b/src/XrdCl/XrdClPostMaster.cc
@@ -257,10 +257,10 @@ namespace XrdCl
   //----------------------------------------------------------------------------
   // Synchronously receive a message
   //----------------------------------------------------------------------------
-  Status PostMaster::Receive( const URL      &url,
-                              Message       *&msg,
-                              MessageFilter  *filter,
-                              time_t          expires )
+  Status PostMaster::Receive( const URL                &url,
+                              std::shared_ptr<Message> &msg,
+                              MessageFilter            *filter,
+                              time_t                    expires )
   {
     XrdSysRWLockHelper scopedLock( pImpl->pDisconnectLock );
     Channel *channel = GetChannel( url );

diff --git a/src/XrdCl/XrdClPostMaster.hh b/src/XrdCl/XrdClPostMaster.hh
@@ -144,10 +144,10 @@ namespace XrdCl
       //! @return        success when the message has been received
       //!                successfully, failure otherwise
       //------------------------------------------------------------------------
-      Status Receive( const URL      &url,
-                      Message       *&msg,
-                      MessageFilter *filter,
-                      time_t         expires );
+      Status Receive( const URL                &url,
+                      std::shared_ptr<Message> &msg,
+                      MessageFilter            *filter,
+                      time_t                    expires );
 
       //------------------------------------------------------------------------
       //! Listen to incoming messages, the listener is notified when a new

diff --git a/tests/XrdClTests/PostMasterTest.cc b/tests/XrdClTests/PostMasterTest.cc
@@ -154,14 +154,13 @@ void *TestThreadFunc( void *arg )
   //----------------------------------------------------------------------------
   for( int i = 0; i < 100; ++i )
   {
-    Message *m = 0;
+    std::shared_ptr<Message> m;
     f.streamId[1] = i;
     CPPUNIT_ASSERT_XRDST( a->pm->Receive( host, m, &f, expires ) );
     ServerResponse *resp = (ServerResponse *)m->GetBuffer();
     CPPUNIT_ASSERT( resp != 0 );
     CPPUNIT_ASSERT( resp->hdr.status == kXR_ok );
     CPPUNIT_ASSERT( m->GetSize() == 8 );
-    delete m;
   }
   return 0;
 }
@@ -218,7 +217,8 @@ void PostMasterTest::FunctionalTest()
   // Send a message and wait for the answer
   //----------------------------------------------------------------------------
   time_t    expires = ::time(0)+1200;
-  Message   m1, *m2 = 0;
+  Message   m1;
+  std::shared_ptr<Message> m2;
   XrdFilter f1( 1, 2 );
   URL       host( address );
 
@@ -285,7 +285,7 @@ void PostMasterTest::FunctionalTest()
   postMaster.Initialize();
   postMaster.Start();
 
-  m2 = 0;
+  m2.reset();
   m1.Zero();
 
   request = (ClientPingRequest *)m1.GetBuffer();
@@ -454,7 +454,7 @@ void PostMasterTest::MultiIPConnectionTest()
   //----------------------------------------------------------------------------
   // Try on a good one
   //----------------------------------------------------------------------------
-  Message   *m2 = 0;
+  std::shared_ptr<Message> m2 = 0;
   XrdFilter  f1( 1, 2 );
 
   CPPUNIT_ASSERT_XRDST( postMaster.Send( url3, m, false, expires ) );