opt(util): 使用GetUtcSeconds(),GetUtcMilliseconds(),GetUtcMicroseconds()替代长的函数

Author: hevake

modules/base/defines.h

@@ -100,4 +100,8 @@
 #define UNUSED_VAR(x) (void)(x)
 #endif
 
+#ifndef DEPRECATED
+#define DEPRECATED  __attribute__((deprecated))
+#endif
+
 #endif //TBOX_BASE_DEFINES_H_20171030

modules/trace/sink_test.cpp

@@ -98,7 +98,7 @@ TEST(Sink, MultiThread) {
 
   auto test_func = [&ts] (const std::string name) {
     for (int i = 0; i < 1000; ++i) {
-      ts.commitRecord(name.c_str(), "A", 100, util::GetCurrentMicrosecondsFrom1970(), 10);
+      ts.commitRecord(name.c_str(), "A", 100, util::GetUtcMicroseconds(), 10);
     }
   };
 

modules/util/timestamp.cpp

@@ -24,36 +24,61 @@
 namespace tbox {
 namespace util {
 
-uint32_t GetCurrentSecondsFrom1970()
+uint32_t GetUtcSeconds()
 {
     struct timeval tv;
     struct timezone tz;
-    gettimeofday(&tv, &tz);
+
+    if (gettimeofday(&tv, &tz) != 0)
+        return 0;
 
     return tv.tv_sec;
 }
 
-uint64_t GetCurrentMillisecondsFrom1970()
+uint32_t GetCurrentSecondsFrom1970() { return GetUtcSeconds(); }
+
+uint64_t GetUtcMilliseconds()
 {
     struct timeval tv;
     struct timezone tz;
-    gettimeofday(&tv, &tz);
+
+    if (gettimeofday(&tv, &tz) != 0)
+        return 0;
 
     return tv.tv_sec * 1000 + tv.tv_usec / 1000;
 }
 
-uint64_t GetCurrentMicrosecondsFrom1970()
+uint64_t GetCurrentMillisecondsFrom1970() { return GetUtcMilliseconds(); }
+
+uint64_t GetUtcMicroseconds()
 {
     struct timeval tv;
     struct timezone tz;
-    gettimeofday(&tv, &tz);
+
+    if (gettimeofday(&tv, &tz) != 0)
+        return 0;
 
     return tv.tv_sec * 1000000 + tv.tv_usec;
 }
 
-std::string GetUtcTimeString(uint32_t sec)
+uint64_t GetCurrentMicrosecondsFrom1970() { return GetUtcMicroseconds(); }
+
+bool GetUtc(uint32_t &sec, uint64_t &usec)
 {
-    time_t ts_sec = sec;
+    struct timeval tv;
+    struct timezone tz;
+
+    if (gettimeofday(&tv, &tz) != 0)
+        return false;
+
+    sec = tv.tv_sec;
+    usec = tv.tv_usec;
+    return true;
+}
+
+std::string GetUtcTimeString(uint32_t utc_sec)
+{
+    time_t ts_sec = utc_sec;
     struct tm tm;
     gmtime_r(&ts_sec, &tm);
 
@@ -63,9 +88,11 @@ std::string GetUtcTimeString(uint32_t sec)
     return timestamp_str;
 }
 
-std::string GetLocalTimeString(uint32_t sec)
+std::string GetUtcTimeString() { return GetUtcTimeString(GetUtcSeconds()); }
+
+std::string GetLocalTimeString(uint32_t utc_sec)
 {
-    time_t ts_sec = sec;
+    time_t ts_sec = utc_sec;
     struct tm tm;
     localtime_r(&ts_sec, &tm);
 
@@ -75,5 +102,7 @@ std::string GetLocalTimeString(uint32_t sec)
     return timestamp_str;
 }
 
+std::string GetLocalTimeString() { return GetLocalTimeString(GetUtcSeconds()); }
+
 }
 }

modules/util/timestamp.h

@@ -27,19 +27,29 @@ namespace tbox {
 namespace util {
 
 //! 获取当前的时间戳，精确到秒
+uint32_t GetUtcSeconds();
 uint32_t GetCurrentSecondsFrom1970();
 
 //! 获取当前的时间戳，精确到毫秒
+uint64_t GetUtcMilliseconds();
 uint64_t GetCurrentMillisecondsFrom1970();
 
 //! 获取当前的时间戳，精确到微秒
+uint64_t GetUtcMicroseconds();
 uint64_t GetCurrentMicrosecondsFrom1970();
 
+//! 获取当前的时间戳，秒 + 微秒
+bool GetUtc(uint32_t &sec, uint64_t &usec);
+
 //! 获取指定时间戳的0时区时间字串
 std::string GetUtcTimeString(uint32_t utc_sec);
+//! 获取当前时间戳的0时区时间字串
+std::string GetUtcTimeString();
 
 //! 获取指定时间戳的本地时间字串
 std::string GetLocalTimeString(uint32_t utc_sec);
+//! 获取当前时间戳的本地时间字串
+std::string GetLocalTimeString();
 
 }
 }