Merge pull request #1270 from gydong/master

coding style fix in brpc/trackme.cpp

src/brpc/trackme.cpp

@@ -43,11 +43,11 @@ static const int32_t TRACKME_MIN_INTERVAL = 30;
 static const int32_t TRACKME_MAX_INTERVAL = 600;
 static int32_t s_trackme_interval = TRACKME_MIN_INTERVAL;
 // Protecting global vars on trackme
-static pthread_mutex_t g_trackme_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t s_trackme_mutex = PTHREAD_MUTEX_INITIALIZER;
 // For contacting with trackme_server.
-static Channel* g_trackme_chan = NULL;
+static Channel* s_trackme_chan = NULL;
 // Any server address in this process.
-static std::string* g_trackme_addr = NULL;
+static std::string* s_trackme_addr = NULL;
 
 // Information of bugs.
 // Notice that this structure may be a combination of all affected bugs.
@@ -65,7 +65,7 @@ struct BugInfo {
 // can avoid showing the same bug repeatly.
 static BugInfo* g_bug_info = NULL;
 // The timestamp(microseconds) that we sent TrackMeRequest.
-static int64_t g_trackme_last_time = 0;
+static int64_t s_trackme_last_time = 0;
 
 // version of RPC.
 // Since the code for getting BRPC_REVISION often fails,
@@ -116,8 +116,8 @@ int ReadJPaasHostPort(int container_port) {
 
 // Called in server.cpp
 void SetTrackMeAddress(butil::EndPoint pt) {
-    BAIDU_SCOPED_LOCK(g_trackme_mutex);
-    if (g_trackme_addr == NULL) {
+    BAIDU_SCOPED_LOCK(s_trackme_mutex);
+    if (s_trackme_addr == NULL) {
         // JPAAS has NAT capabilities, read its log to figure out the open port
         // accessible from outside.
         const int jpaas_port = ReadJPaasHostPort(pt.port);
@@ -126,7 +126,7 @@ void SetTrackMeAddress(butil::EndPoint pt) {
                      << " instead of jpaas_container_port=" << pt.port;
             pt.port = jpaas_port;
         }
-        g_trackme_addr = new std::string(butil::endpoint2str(pt).c_str());
+        s_trackme_addr = new std::string(butil::endpoint2str(pt).c_str());
     }
 }
 
@@ -139,7 +139,7 @@ static void HandleTrackMeResponse(Controller* cntl, TrackMeResponse* res) {
         cur_info.error_text = res->error_text();
         bool already_reported = false;
         {
-            BAIDU_SCOPED_LOCK(g_trackme_mutex);
+            BAIDU_SCOPED_LOCK(s_trackme_mutex);
             if (g_bug_info != NULL && *g_bug_info == cur_info) {
                 // we've shown the bug.
                 already_reported = true;
@@ -187,10 +187,10 @@ static void HandleTrackMeResponse(Controller* cntl, TrackMeResponse* res) {
 }
 
 static void TrackMeNow(std::unique_lock<pthread_mutex_t>& mu) {
-    if (g_trackme_addr == NULL) {
+    if (s_trackme_addr == NULL) {
         return;
     }
-    if (g_trackme_chan == NULL) {
+    if (s_trackme_chan == NULL) {
         Channel* chan = new (std::nothrow) Channel;
         if (chan == NULL) {
             LOG(FATAL) << "Fail to new trackme channel";
@@ -204,16 +204,16 @@ static void TrackMeNow(std::unique_lock<pthread_mutex_t>& mu) {
             delete chan;
             return;
         }
-        g_trackme_chan = chan;
+        s_trackme_chan = chan;
     }
     mu.unlock();
-    TrackMeService_Stub stub(g_trackme_chan);
+    TrackMeService_Stub stub(s_trackme_chan);
     TrackMeRequest req;
     req.set_rpc_version(g_rpc_version);
-    req.set_server_addr(*g_trackme_addr);
+    req.set_server_addr(*s_trackme_addr);
     TrackMeResponse* res = new TrackMeResponse;
     Controller* cntl = new Controller;
-    cntl->set_request_code(policy::MurmurHash32(g_trackme_addr->data(), g_trackme_addr->size()));
+    cntl->set_request_code(policy::MurmurHash32(s_trackme_addr->data(), s_trackme_addr->size()));
     google::protobuf::Closure* done =
         ::brpc::NewCallback(&HandleTrackMeResponse, cntl, res);
     stub.TrackMe(cntl, &req, res, done);
@@ -226,15 +226,15 @@ void TrackMe() {
         return;
     }
     int64_t now = butil::gettimeofday_us();
-    std::unique_lock<pthread_mutex_t> mu(g_trackme_mutex);
-    if (g_trackme_last_time == 0) {
+    std::unique_lock<pthread_mutex_t> mu(s_trackme_mutex);
+    if (s_trackme_last_time == 0) {
         // Delay the first ping randomly within s_trackme_interval. This
         // protects trackme_server from ping storms.
-        g_trackme_last_time =
+        s_trackme_last_time =
             now + butil::fast_rand_less_than(s_trackme_interval) * 1000000L;
     }
-    if (now > g_trackme_last_time + 1000000L * s_trackme_interval) {
-        g_trackme_last_time = now;
+    if (now > s_trackme_last_time + 1000000L * s_trackme_interval) {
+        s_trackme_last_time = now;
         return TrackMeNow(mu);
     }
 }

src/bthread/task_group.cpp

@@ -169,7 +169,6 @@ void TaskGroup::run_main_task() {
                              (name, &cumulated_cputime, 1));
         }
     }
-    // stop_main_task() was called.
     // Don't forget to add elapse of last wait_task.
     current_task()->stat.cputime_ns += butil::cpuwide_time_ns() - _last_run_ns;
 }