admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced 2 time functions with thread-safe equivalents

Browse Source 
This does not fix bug 544, but changes where it reports issues.

BUG=
TEST=

Review URL: https://webrtc-codereview.appspot.com/578008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2279 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
hta@webrtc.org 2012-05-23 15:39:17 +00:00
parent aa5f410db5
commit 1484ac07cb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/system_wrappers/source/trace_posix.cc
View File

@ -57,8 +57,9 @@ WebRtc_Word32 TracePosix::AddTime(char* traceMessage,
{ {
return -1; return -1;
} }
struct tm buffer;
const struct tm* systemTime = const struct tm* systemTime =
localtime(&systemTimeHighRes.tv_sec); localtime_r(&systemTimeHighRes.tv_sec, &buffer);
const WebRtc_UWord32 ms_time = systemTimeHighRes.tv_usec / 1000; const WebRtc_UWord32 ms_time = systemTimeHighRes.tv_usec / 1000;
WebRtc_UWord32 prevTickCount = 0; WebRtc_UWord32 prevTickCount = 0;
@ -103,7 +104,8 @@ WebRtc_Word32 TracePosix::AddDateTimeInfo(char* traceMessage) const
{ {
time_t t; time_t t;
time(&t); time(&t);
sprintf(traceMessage, "Local Date: %s", ctime(&t)); char buffer[26]; // man ctime says buffer should have room for >=26 bytes.
sprintf(traceMessage, "Local Date: %s", ctime_r(&t, buffer));
WebRtc_Word32 len = static_cast<WebRtc_Word32>(strlen(traceMessage)); WebRtc_Word32 len = static_cast<WebRtc_Word32>(strlen(traceMessage));
if ('\n' == traceMessage[len - 1]) if ('\n' == traceMessage[len - 1])