diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2009-04-02 13:58:11 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2009-04-02 13:58:11 +0200 |
| commit | a84d45498bd861c9225080232948a99c2e317bb8 (patch) | |
| tree | 8f1f5fb7bf7ffbf6f24cf4a4fd6888a235dbcc08 /lib/common/BoxTime.cpp | |
| parent | 25db897553a0db0f912602b375029e724f51556e (diff) | |
Import upstream version 0.11~rc3~r2491
Diffstat (limited to 'lib/common/BoxTime.cpp')
| -rw-r--r-- | lib/common/BoxTime.cpp | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/lib/common/BoxTime.cpp b/lib/common/BoxTime.cpp index 1ddcffd4..d05c0a6c 100644 --- a/lib/common/BoxTime.cpp +++ b/lib/common/BoxTime.cpp @@ -39,8 +39,8 @@ box_time_t GetCurrentBoxTime() struct timeval tv; if (gettimeofday(&tv, NULL) != 0) { - BOX_ERROR("Failed to gettimeofday(), dropping " - "precision: " << strerror(errno)); + BOX_LOG_SYS_ERROR("Failed to gettimeofday(), " + "dropping precision"); } else { @@ -52,3 +52,45 @@ box_time_t GetCurrentBoxTime() return SecondsToBoxTime(time(0)); } + +std::string FormatTime(box_time_t time, bool includeDate, bool showMicros) +{ + std::ostringstream buf; + + time_t seconds = BoxTimeToSeconds(time); + int micros = BoxTimeToMicroSeconds(time) % MICRO_SEC_IN_SEC; + + struct tm tm_now, *tm_ptr = &tm_now; + + #ifdef WIN32 + if ((tm_ptr = localtime(&seconds)) != NULL) + #else + if (localtime_r(&seconds, &tm_now) != NULL) + #endif + { + buf << std::setfill('0'); + + if (includeDate) + { + buf << std::setw(4) << (tm_ptr->tm_year + 1900) << "-" << + std::setw(2) << (tm_ptr->tm_mon + 1) << "-" << + std::setw(2) << (tm_ptr->tm_mday) << " "; + } + + buf << std::setw(2) << tm_ptr->tm_hour << ":" << + std::setw(2) << tm_ptr->tm_min << ":" << + std::setw(2) << tm_ptr->tm_sec; + + if (showMicros) + { + buf << "." << std::setw(6) << micros; + } + } + else + { + buf << strerror(errno); + } + + return buf.str(); +} + |