Refine Transport Debug method param and RdmaTransport WaitEpollOut code

Author: zchuango

src/brpc/rdma_transport.cpp

@@ -118,15 +118,7 @@ namespace brpc {
                                                             }
             }
         } else {
-            g_vars->nwaitepollout << 1;
-            const int rc = _socket->WaitEpollOut(_socket->fd(), pollin, &duetime);
-            if (rc < 0 && errno != ETIMEDOUT) {
-                const int saved_errno = errno;
-                PLOG(WARNING) << "Fail to wait epollout of " << _socket;
-                _socket->SetFailed(saved_errno, "Fail to wait epollout of %s: %s",
-                                                 _socket->description().c_str(), berror(saved_errno));
-                return 1;
-            }
+            return _tcp_transport->WaitEpollOut(_epollout_butex, pollin, duetime);
         }
         return 0;
     }
@@ -180,7 +172,7 @@ namespace brpc {
         }
     }
 
-    void RdmaTransport::Debug(std::ostream &os, Socket* ptr) {
+    void RdmaTransport::Debug(std::ostream &os) {
         if (_rdma_state == RDMA_ON && _rdma_ep) {
             _rdma_ep->DebugInfo(os);
         }

src/brpc/rdma_transport.h

@@ -38,7 +38,7 @@ namespace brpc {
         int WaitEpollOut(butil::atomic<int>* _epollout_butex, bool pollin, const timespec duetime) override;
         void ProcessEvent(bthread_attr_t attr) override;
         void QueueMessage(InputMessageClosure& inputMsg, int* num_bthread_created, bool last_msg) override;
-        void Debug(std::ostream &os, Socket* ptr) override;
+        void Debug(std::ostream &os) override;
         rdma::RdmaEndpoint* GetRdmaEp() {
             CHECK(_rdma_ep != NULL);
             return _rdma_ep;

src/brpc/socket.cpp

@@ -2493,7 +2493,7 @@ void Socket::DebugSocket(std::ostream& os, SocketId id) {
            << "\n}";
     }
 #endif
-    ptr->_transport->Debug(os, ptr.get());
+    ptr->_transport->Debug(os);
     { os << "\nbthread_tag=" << ptr->_io_event.bthread_tag(); }
 }
 

src/brpc/tcp_transport.cpp

@@ -90,5 +90,5 @@ namespace brpc {
             ProcessInputMessage(to_run_msg);
         }
     }
-    void TcpTransport::Debug(std::ostream &os, Socket* ptr) {}
+    void TcpTransport::Debug(std::ostream &os) {}
 }

src/brpc/tcp_transport.h

@@ -34,7 +34,7 @@ namespace brpc {
         int WaitEpollOut(butil::atomic<int>* _epollout_butex, bool pollin, const timespec duetime) override;
         void ProcessEvent(bthread_attr_t attr) override;
         void QueueMessage(InputMessageClosure& input_msg, int* num_bthread_created, bool last_msg) override;
-        void Debug(std::ostream &os, Socket* ptr) override;
+        void Debug(std::ostream &os) override;
     };
 }
 

src/brpc/transport.h

@@ -49,7 +49,7 @@ namespace brpc {
         virtual int WaitEpollOut(butil::atomic<int>* _epollout_butex, bool pollin, const timespec duetime) = 0;
         virtual void ProcessEvent(bthread_attr_t attr) = 0;
         virtual void QueueMessage(InputMessageClosure& input_msg, int* num_bthread_created, bool last_msg) = 0;
-        virtual void Debug(std::ostream &os, Socket* ptr) = 0;
+        virtual void Debug(std::ostream &os) = 0;
 
         bool HasOnEdgeTrigger() {
             return _on_edge_trigger != NULL;