Skip to content

Commit 428bee6

Browse files
zchuangozchuango
committed
format the code, remove indentation for top class and variables in new file
1 parent 6f7ab09 commit 428bee6

12 files changed

Lines changed: 392 additions & 393 deletions

‎src/brpc/acceptor.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Acceptor::Acceptor(bthread_keytable_pool_t* pool)
4040
, _empty_cond(&_map_mutex)
4141
, _force_ssl(false)
4242
, _ssl_ctx(NULL)
43-
, socket_mode(SOCKET_MODE_TCP)
43+
, _socket_mode(SOCKET_MODE_TCP)
4444
, _bthread_tag(BTHREAD_TAG_DEFAULT) {
4545
}
4646

@@ -285,7 +285,7 @@ void Acceptor::OnNewConnectionsUntilEAGAIN(Socket* acception) {
285285
options.need_on_edge_trigger = true;
286286
options.force_ssl = am->_force_ssl;
287287
options.initial_ssl_ctx = am->_ssl_ctx;
288-
options.socket_mode = am->socket_mode;
288+
options.socket_mode = am->_socket_mode;
289289
options.bthread_tag = am->_bthread_tag;
290290
if (Socket::Create(options, &socket_id) != 0) {
291291
LOG(ERROR) << "Fail to create Socket";

‎src/brpc/acceptor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ friend class Server;
112112
std::shared_ptr<SocketSSLContext> _ssl_ctx;
113113

114114
// Choose to use a certain socket: 0 TCP, 1 RDMA
115-
SocketMode socket_mode;
115+
SocketMode _socket_mode;
116116

117117
// Acceptor belongs to this tag
118118
bthread_tag_t _bthread_tag;

‎src/brpc/rdma/rdma_endpoint.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -240,15 +240,15 @@ void RdmaEndpoint::Reset() {
240240
void RdmaConnect::StartConnect(const Socket* socket,
241241
void (*done)(int err, void* data),
242242
void* data) {
243-
auto* rdmaTransport = static_cast<RdmaTransport*>(socket->_transport.get());
244-
CHECK(rdmaTransport->_rdma_ep != NULL);
243+
auto* rdma_transport = static_cast<RdmaTransport*>(socket->_transport.get());
244+
CHECK(rdma_transport->_rdma_ep != NULL);
245245
SocketUniquePtr s;
246246
if (Socket::Address(socket->id(), &s) != 0) {
247247
return;
248248
}
249249
if (!IsRdmaAvailable()) {
250-
rdmaTransport->_rdma_ep->_state = RdmaEndpoint::FALLBACK_TCP;
251-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_OFF;
250+
rdma_transport->_rdma_ep->_state = RdmaEndpoint::FALLBACK_TCP;
251+
rdma_transport->_rdma_state = RdmaTransport::RDMA_OFF;
252252
done(0, data);
253253
return;
254254
}
@@ -258,7 +258,7 @@ void RdmaConnect::StartConnect(const Socket* socket,
258258
bthread_attr_t attr = BTHREAD_ATTR_NORMAL;
259259
bthread_attr_set_name(&attr, "RdmaProcessHandshakeAtClient");
260260
if (bthread_start_background(&tid, &attr,
261-
RdmaEndpoint::ProcessHandshakeAtClient, rdmaTransport->_rdma_ep) < 0) {
261+
RdmaEndpoint::ProcessHandshakeAtClient, rdma_transport->_rdma_ep) < 0) {
262262
LOG(FATAL) << "Fail to start handshake bthread";
263263
Run();
264264
} else {
@@ -301,8 +301,8 @@ static void TryReadOnTcpDuringRdmaEst(Socket* s) {
301301
}
302302

303303
void RdmaEndpoint::OnNewDataFromTcp(Socket* m) {
304-
auto* rdmaTransport = static_cast<RdmaTransport*>(m->_transport.get());
305-
RdmaEndpoint* ep = rdmaTransport->GetRdmaEp();
304+
auto* rdma_transport = static_cast<RdmaTransport*>(m->_transport.get());
305+
RdmaEndpoint* ep = rdma_transport->GetRdmaEp();
306306
CHECK(ep != NULL);
307307

308308
int progress = Socket::PROGRESS_INIT;
@@ -311,7 +311,7 @@ void RdmaEndpoint::OnNewDataFromTcp(Socket* m) {
311311
if (!m->CreatedByConnect()) {
312312
if (!IsRdmaAvailable()) {
313313
ep->_state = FALLBACK_TCP;
314-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_OFF;
314+
rdma_transport->_rdma_state = RdmaTransport::RDMA_OFF;
315315
continue;
316316
}
317317
bthread_t tid;
@@ -436,10 +436,10 @@ void* RdmaEndpoint::ProcessHandshakeAtClient(void* arg) {
436436

437437
// First initialize CQ and QP resources
438438
ep->_state = C_ALLOC_QPCQ;
439-
auto* rdmaTransport = static_cast<RdmaTransport*>(s->_transport.get());
439+
auto* rdma_transport = static_cast<RdmaTransport*>(s->_transport.get());
440440
if (ep->AllocateResources() < 0) {
441441
LOG(WARNING) << "Fallback to tcp:" << s->description();
442-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_OFF;
442+
rdma_transport->_rdma_state = RdmaTransport::RDMA_OFF;
443443
ep->_state = FALLBACK_TCP;
444444
return NULL;
445445
}
@@ -518,7 +518,7 @@ void* RdmaEndpoint::ProcessHandshakeAtClient(void* arg) {
518518
if (!HelloNegotiationValid(remote_msg)) {
519519
LOG(WARNING) << "Fail to negotiate with server, fallback to tcp:"
520520
<< s->description();
521-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_OFF;
521+
rdma_transport->_rdma_state = RdmaTransport::RDMA_OFF;
522522
} else {
523523
ep->_remote_recv_block_size = remote_msg.block_size;
524524
ep->_local_window_capacity =
@@ -534,16 +534,16 @@ void* RdmaEndpoint::ProcessHandshakeAtClient(void* arg) {
534534
ep->_state = C_BRINGUP_QP;
535535
if (ep->BringUpQp(remote_msg.lid, remote_msg.gid, remote_msg.qp_num) < 0) {
536536
LOG(WARNING) << "Fail to bringup QP, fallback to tcp:" << s->description();
537-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_OFF;
537+
rdma_transport->_rdma_state = RdmaTransport::RDMA_OFF;
538538
} else {
539-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_ON;
539+
rdma_transport->_rdma_state = RdmaTransport::RDMA_ON;
540540
}
541541
}
542542

543543
// Send ACK message to server
544544
ep->_state = C_ACK_SEND;
545545
uint32_t flags = 0;
546-
if (rdmaTransport->_rdma_state != RdmaTransport::RDMA_OFF) {
546+
if (rdma_transport->_rdma_state != RdmaTransport::RDMA_OFF) {
547547
flags |= ACK_MSG_RDMA_OK;
548548
}
549549
uint32_t* tmp = (uint32_t*)data; // avoid GCC warning on strict-aliasing
@@ -557,7 +557,7 @@ void* RdmaEndpoint::ProcessHandshakeAtClient(void* arg) {
557557
return NULL;
558558
}
559559

560-
if (rdmaTransport->_rdma_state == RdmaTransport::RDMA_ON) {
560+
if (rdma_transport->_rdma_state == RdmaTransport::RDMA_ON) {
561561
ep->_state = ESTABLISHED;
562562
LOG_IF(INFO, FLAGS_rdma_trace_verbose)
563563
<< "Client handshake ends (use rdma) on " << s->description();
@@ -590,15 +590,15 @@ void* RdmaEndpoint::ProcessHandshakeAtServer(void* arg) {
590590
ep->_state = FAILED;
591591
return NULL;
592592
}
593-
auto* rdmaTransport = static_cast<RdmaTransport*>(s->_transport.get());
593+
auto* rdma_transport = static_cast<RdmaTransport*>(s->_transport.get());
594594
if (memcmp(data, MAGIC_STR, MAGIC_STR_LEN) != 0) {
595595
LOG_IF(INFO, FLAGS_rdma_trace_verbose) << "It seems that the "
596596
<< "client does not use RDMA, fallback to TCP:"
597597
<< s->description();
598598
// we need to copy data read back to _socket->_read_buf
599599
s->_read_buf.append(data, MAGIC_STR_LEN);
600600
ep->_state = FALLBACK_TCP;
601-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_OFF;
601+
rdma_transport->_rdma_state = RdmaTransport::RDMA_OFF;
602602
ep->TryReadOnTcp();
603603
return NULL;
604604
}
@@ -630,7 +630,7 @@ void* RdmaEndpoint::ProcessHandshakeAtServer(void* arg) {
630630
if (!HelloNegotiationValid(remote_msg)) {
631631
LOG(WARNING) << "Fail to negotiate with client, fallback to tcp:"
632632
<< s->description();
633-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_OFF;
633+
rdma_transport->_rdma_state = RdmaTransport::RDMA_OFF;
634634
} else {
635635
ep->_remote_recv_block_size = remote_msg.block_size;
636636
ep->_local_window_capacity =
@@ -647,13 +647,13 @@ void* RdmaEndpoint::ProcessHandshakeAtServer(void* arg) {
647647
if (ep->AllocateResources() < 0) {
648648
LOG(WARNING) << "Fail to allocate rdma resources, fallback to tcp:"
649649
<< s->description();
650-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_OFF;
650+
rdma_transport->_rdma_state = RdmaTransport::RDMA_OFF;
651651
} else {
652652
ep->_state = S_BRINGUP_QP;
653653
if (ep->BringUpQp(remote_msg.lid, remote_msg.gid, remote_msg.qp_num) < 0) {
654654
LOG(WARNING) << "Fail to bringup QP, fallback to tcp:"
655655
<< s->description();
656-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_OFF;
656+
rdma_transport->_rdma_state = RdmaTransport::RDMA_OFF;
657657
}
658658
}
659659
}
@@ -662,7 +662,7 @@ void* RdmaEndpoint::ProcessHandshakeAtServer(void* arg) {
662662
ep->_state = S_HELLO_SEND;
663663
HelloMessage local_msg;
664664
local_msg.msg_len = g_rdma_hello_msg_len;
665-
if (rdmaTransport->_rdma_state == RdmaTransport::RDMA_OFF) {
665+
if (rdma_transport->_rdma_state == RdmaTransport::RDMA_OFF) {
666666
local_msg.impl_ver = 0;
667667
local_msg.hello_ver = 0;
668668
} else {
@@ -706,21 +706,21 @@ void* RdmaEndpoint::ProcessHandshakeAtServer(void* arg) {
706706
uint32_t* tmp = (uint32_t*)data; // avoid GCC warning on strict-aliasing
707707
uint32_t flags = butil::NetToHost32(*tmp);
708708
if (flags & ACK_MSG_RDMA_OK) {
709-
if (rdmaTransport->_rdma_state == RdmaTransport::RDMA_OFF) {
709+
if (rdma_transport->_rdma_state == RdmaTransport::RDMA_OFF) {
710710
LOG(WARNING) << "Fail to parse Hello Message length from client:"
711711
<< s->description();
712712
s->SetFailed(EPROTO, "Fail to complete rdma handshake from %s: %s",
713713
s->description().c_str(), berror(EPROTO));
714714
ep->_state = FAILED;
715715
return NULL;
716716
} else {
717-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_ON;
717+
rdma_transport->_rdma_state = RdmaTransport::RDMA_ON;
718718
ep->_state = ESTABLISHED;
719719
LOG_IF(INFO, FLAGS_rdma_trace_verbose)
720720
<< "Server handshake ends (use rdma) on " << s->description();
721721
}
722722
} else {
723-
rdmaTransport->_rdma_state = RdmaTransport::RDMA_OFF;
723+
rdma_transport->_rdma_state = RdmaTransport::RDMA_OFF;
724724
ep->_state = FALLBACK_TCP;
725725
LOG_IF(INFO, FLAGS_rdma_trace_verbose)
726726
<< "Server handshake ends (use tcp) on " << s->description();
@@ -1459,8 +1459,8 @@ void RdmaEndpoint::PollCq(Socket* m) {
14591459
if (Socket::Address(ep->_socket->id(), &s) < 0) {
14601460
return;
14611461
}
1462-
auto* rdmaTransport = static_cast<RdmaTransport*>(s->_transport.get());
1463-
CHECK(ep == rdmaTransport->_rdma_ep);
1462+
auto* rdma_transport = static_cast<RdmaTransport*>(s->_transport.get());
1463+
CHECK(ep == rdma_transport->_rdma_ep);
14641464

14651465
bool send = false;
14661466
ibv_cq* cq = ep->_resource->recv_cq;

0 commit comments

Comments
 (0)