Merge pull request #258 from zyearn/master

Add LOG_AT macro when linking with glog

CMakeLists.txt

@@ -129,6 +129,9 @@ set(DYNAMIC_LIB
     dl
     z
     )
+if(BRPC_WITH_GLOG)
+    set(DYNAMIC_LIB ${DYNAMIC_LIB} ${GLOG_LIB})
+endif()
 
 # for *.so
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/lib)

src/CMakeLists.txt

@@ -21,7 +21,7 @@ add_library(brpc-static STATIC $<TARGET_OBJECTS:BUTIL_LIB> $<TARGET_OBJECTS:OBJ_
 
 target_link_libraries(brpc-shared ${DYNAMIC_LIB})
 
-if(WITH_GLOG)
+if(BRPC_WITH_GLOG)
     target_link_libraries(brpc-shared ${GLOG_LIB})
 endif()
 

src/butil/logging.h

@@ -53,6 +53,9 @@
 #  define DVPLOG(...) DVLOG(__VA_ARGS__)
 # endif
 
+#define LOG_AT(severity, file, line)                                    \
+    google::LogMessage(file, line, google::severity).stream()
+
 #else
 
 #ifdef BAIDU_INTERNAL

test/bthread_butex_unittest.cpp

@@ -43,7 +43,7 @@ void* joiner(void* arg) {
             LOG(FATAL) << "fail to join thread_" << th - (bthread_t*)arg;
         }
         long elp = butil::gettimeofday_us() - t1;
-        EXPECT_LE(labs(elp - (th - (bthread_t*)arg + 1) * 100000L), 10000L)
+        EXPECT_LE(labs(elp - (th - (bthread_t*)arg + 1) * 100000L), 15000L)
             << "timeout when joining thread_" << th - (bthread_t*)arg;
         LOG(INFO) << "Joined thread " << *th << " at " << elp << "us ["
                   << bthread_self() << "]";
@@ -208,7 +208,7 @@ TEST(ButexTest, wait_without_stop) {
         ASSERT_EQ(0, bthread_join(th, NULL));
         tm.stop();
         
-        ASSERT_LT(labs(tm.m_elapsed() - WAIT_MSEC), 20);
+        ASSERT_LT(labs(tm.m_elapsed() - WAIT_MSEC), 40);
     }
     bthread::butex_destroy(butex);
 }
@@ -232,7 +232,7 @@ TEST(ButexTest, stop_after_running) {
         ASSERT_EQ(0, bthread_join(th, NULL));
         tm.stop();
 
-        ASSERT_LT(labs(tm.m_elapsed() - SLEEP_MSEC), 10);
+        ASSERT_LT(labs(tm.m_elapsed() - SLEEP_MSEC), 25);
         // ASSERT_TRUE(bthread::get_task_control()->
         //             timer_thread()._idset.empty());
         ASSERT_EQ(EINVAL, bthread_stop(th));

test/bthread_fd_unittest.cpp

@@ -385,7 +385,7 @@ TEST(FDTest, timeout) {
     ASSERT_EQ(0, pthread_join(th, NULL));
     ASSERT_EQ(0, bthread_join(bth, NULL));
     tm.stop();
-    ASSERT_LT(tm.m_elapsed(), 60);
+    ASSERT_LT(tm.m_elapsed(), 80);
     ASSERT_EQ(0, bthread_close(fds[0]));
     ASSERT_EQ(0, bthread_close(fds[1]));
 }

test/bthread_timer_thread_unittest.cpp

@@ -68,7 +68,7 @@ public:
     {
         ASSERT_TRUE(!_run_times.empty());
         long diff = timespec_diff_us(_run_times[0], expect_run_time);
-        EXPECT_LE(labs(diff), 10000);
+        EXPECT_LE(labs(diff), 50000);
     }
     
     void expect_not_run() {

test/string_number_conversions_unittest.cc

@@ -739,8 +739,9 @@ TEST(StringNumberConversionsTest, StringToDouble) {
     double output;
     errno = 1;
     EXPECT_EQ(cases[i].success, StringToDouble(cases[i].input, &output));
-    if (cases[i].success)
+    if (cases[i].success) {
       EXPECT_EQ(1, errno) << i;  // confirm that errno is unchanged.
+    }
     EXPECT_DOUBLE_EQ(cases[i].output, output);
   }
 

test/string_split_unittest.cc

@@ -322,10 +322,12 @@ TEST(StringSplitTest, SplitStringAlongWhitespace) {
     std::vector<std::string> results;
     SplitStringAlongWhitespace(data[i].input, &results);
     ASSERT_EQ(data[i].expected_result_count, results.size());
-    if (data[i].expected_result_count > 0)
+    if (data[i].expected_result_count > 0) {
       ASSERT_EQ(data[i].output1, results[0]);
-    if (data[i].expected_result_count > 1)
+    }
+    if (data[i].expected_result_count > 1) {
       ASSERT_EQ(data[i].output2, results[1]);
+    }
   }
 }