review code

Author: wenjiecn

src/brpc/channel.cpp

@@ -78,6 +78,8 @@ ChannelSSLOptions* ChannelOptions::mutable_ssl_options() {
 static ChannelSignature ComputeChannelSignature(const ChannelOptions& opt) {
     if (opt.auth == NULL &&
         !opt.has_ssl_options() &&
+        opt.client_host.empty() &&
+        opt.device_name.empty() &&
         opt.connection_group.empty() &&
         opt.hc_option.health_check_path.empty()) {
         // Returning zeroized result by default is more intuitive for users.
@@ -95,6 +97,14 @@ static ChannelSignature ComputeChannelSignature(const ChannelOptions& opt) {
             buf.append("|conng=");
             buf.append(opt.connection_group);
         }
+        if (!opt.client_host.empty()) {
+            buf.append("|clih=");
+            buf.append(opt.client_host);
+        }
+        if (!opt.device_name.empty()) {
+            buf.append("|devn=");
+            buf.append(opt.device_name);
+        }
         if (opt.auth) {
             buf.append("|auth=");
             buf.append((char*)&opt.auth, sizeof(opt.auth));

src/brpc/rdma_transport.cpp

@@ -89,7 +89,7 @@ ssize_t RdmaTransport::CutFromIOBufList(butil::IOBuf **buf, size_t ndata) {
     if (_rdma_ep && _rdma_state != RDMA_OFF) {
         return _rdma_ep->CutFromIOBufList(buf, ndata);
     }
-    return butil::IOBuf::cut_multiple_into_file_descriptor(_socket->fd(), buf, ndata);
+    return _tcp_transport->CutFromIOBufList(buf, ndata);
 }
 
 int RdmaTransport::WaitEpollOut(butil::atomic<int> *_epollout_butex,
@@ -104,8 +104,10 @@ int RdmaTransport::WaitEpollOut(butil::atomic<int> *_epollout_butex,
                 if (errno != EAGAIN && errno != ETIMEDOUT) {
                     const int saved_errno = errno;
                     PLOG(WARNING) << "Fail to wait rdma window of " << _socket;
-                    _socket->SetFailed(saved_errno, "Fail to wait rdma window of %s: %s",
-                                                             _socket->description().c_str(), berror(saved_errno));
+                    _socket->SetFailed(saved_errno,
+                                "Fail to wait rdma window of %s: %s",
+                                _socket->description().c_str(),
+                                berror(saved_errno));
                 }
                 if (_socket->Failed()) {
                     // NOTE:
@@ -114,7 +116,7 @@ int RdmaTransport::WaitEpollOut(butil::atomic<int> *_epollout_butex,
                     // is already failed here.
                     return 1;
                 }
-                                                        }
+            }
         }
     } else {
         return _tcp_transport->WaitEpollOut(_epollout_butex, pollin, duetime);

src/brpc/socket.cpp

@@ -474,7 +474,7 @@ Socket::Socket(Forbidden f)
     , _ssl_state(SSL_UNKNOWN)
     , _ssl_session(NULL)
     , _socket_mode(SOCKET_MODE_TCP)
-    , _transport(NULL)
+    , _transport(nullptr)
     , _connection_type_for_progressive_read(CONNECTION_TYPE_UNKNOWN)
     , _controller_released_socket(false)
     , _overcrowded(false)
@@ -2203,7 +2203,7 @@ int Socket::OnInputEvent(void* user_data, uint32_t events,
         g_vars->neventthread << 1;
 
         // transfer ownership as well, don't use s anymore!
-        Socket *const p = s.release();
+        Socket* const p = s.release();
 
         bthread_attr_t attr = thread_attr;
         attr.keytable_pool = p->_keytable_pool;

src/brpc/transport_factory.cpp

@@ -36,12 +36,11 @@ int TransportFactory::ContextInitOrDie(SocketMode mode, bool serverOrNot, const
 
 std::shared_ptr<Transport> TransportFactory::CreateTransport(SocketMode mode) {
     if (mode == SOCKET_MODE_TCP) {
-        // 使用共享指针创建对象
-        return std::make_shared<TcpTransport>();
+        return std::unique_ptr<TcpTransport>(new TcpTransport());
     }
 #if BRPC_WITH_RDMA
     else if (mode == SOCKET_MODE_RDMA) {
-        return std::make_shared<RdmaTransport>();
+        return std::unique_ptr<RdmaTransport>(new RdmaTransport());
     }
 #endif
     else {