Reformatted trace* files.

BUG=
TEST=Trybots.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3329 4adac7df-926f-26a2-2b94-8c16560cd09d

1 files changed, 66 insertions, 75 deletions

diff --git a/system_wrappers/source/trace_posix.cc b/system_wrappers/source/trace_posix.cc
index 1b8dd934..49659690 100644
--- a/system_wrappers/source/trace_posix.cc
+++ b/system_wrappers/source/trace_posix.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "trace_posix.h"
+#include "webrtc/system_wrappers/source/trace_posix.h"
 
 #include <cassert>
 #include <stdarg.h>
@@ -17,19 +17,19 @@
 #include <sys/time.h>
 #include <time.h>
 #ifdef WEBRTC_ANDROID
-    #include <pthread.h>
+#include <pthread.h>
 #else
-    #include <iostream>
+#include <iostream>
 #endif
 
 #if defined(_DEBUG)
-    #define BUILDMODE "d"
+#define BUILDMODE "d"
 #elif defined(DEBUG)
-    #define BUILDMODE "d"
+#define BUILDMODE "d"
 #elif defined(NDEBUG)
-    #define BUILDMODE "r"
+#define BUILDMODE "r"
 #else
-    #define BUILDMODE "?"
+#define BUILDMODE "?"
 #endif
 #define BUILDTIME __TIME__
 #define BUILDDATE __DATE__
@@ -37,84 +37,75 @@
 #define BUILDINFO BUILDDATE " " BUILDTIME " " BUILDMODE
 
 namespace webrtc {
-TracePosix::TracePosix()
-{
-    struct timeval systemTimeHighRes;
-    gettimeofday(&systemTimeHighRes, 0);
-    _prevAPITickCount = _prevTickCount = systemTimeHighRes.tv_sec;
+
+TracePosix::TracePosix() {
+  struct timeval system_time_high_res;
+  gettimeofday(&system_time_high_res, 0);
+  prev_api_tick_count_ = prev_tick_count_ = system_time_high_res.tv_sec;
 }
 
-TracePosix::~TracePosix()
-{
-    StopThread();
+TracePosix::~TracePosix() {
+  StopThread();
 }
 
-WebRtc_Word32 TracePosix::AddTime(char* traceMessage,
-                                  const TraceLevel level) const
-{
-    struct timeval systemTimeHighRes;
-    if (gettimeofday(&systemTimeHighRes, 0) == -1)
-    {
-        return -1;
-    }
-    struct tm buffer;
-    const struct tm* systemTime =
-        localtime_r(&systemTimeHighRes.tv_sec, &buffer);
+WebRtc_Word32 TracePosix::AddTime(char* trace_message,
+                                  const TraceLevel level) const {
+  struct timeval system_time_high_res;
+  if (gettimeofday(&system_time_high_res, 0) == -1) {
+    return -1;
+  }
+  struct tm buffer;
+  const struct tm* system_time =
+    localtime_r(&system_time_high_res.tv_sec, &buffer);
 
-    const WebRtc_UWord32 ms_time = systemTimeHighRes.tv_usec / 1000;
-    WebRtc_UWord32 prevTickCount = 0;
-    if (level == kTraceApiCall)
-    {
-        prevTickCount = _prevTickCount;
-        _prevTickCount = ms_time;
-    } else {
-        prevTickCount = _prevAPITickCount;
-        _prevAPITickCount = ms_time;
-    }
-    WebRtc_UWord32 dwDeltaTime = ms_time - prevTickCount;
-    if (prevTickCount == 0)
-    {
-        dwDeltaTime = 0;
-    }
-    if (dwDeltaTime > 0x0fffffff)
-    {
-        // Either wraparound or data race.
-        dwDeltaTime = 0;
-    }
-    if(dwDeltaTime > 99999)
-    {
-        dwDeltaTime = 99999;
-    }
+  const WebRtc_UWord32 ms_time = system_time_high_res.tv_usec / 1000;
+  WebRtc_UWord32 prev_tickCount = 0;
+  if (level == kTraceApiCall) {
+    prev_tickCount = prev_tick_count_;
+    prev_tick_count_ = ms_time;
+  } else {
+    prev_tickCount = prev_api_tick_count_;
+    prev_api_tick_count_ = ms_time;
+  }
+  WebRtc_UWord32 dw_delta_time = ms_time - prev_tickCount;
+  if (prev_tickCount == 0) {
+    dw_delta_time = 0;
+  }
+  if (dw_delta_time > 0x0fffffff) {
+    // Either wraparound or data race.
+    dw_delta_time = 0;
+  }
+  if (dw_delta_time > 99999) {
+    dw_delta_time = 99999;
+  }
 
-    sprintf(traceMessage, "(%2u:%2u:%2u:%3u |%5lu) ", systemTime->tm_hour,
-            systemTime->tm_min, systemTime->tm_sec, ms_time,
-            static_cast<unsigned long>(dwDeltaTime));
-    // Messages are 22 characters.
-    return 22;
+  sprintf(trace_message, "(%2u:%2u:%2u:%3u |%5lu) ", system_time->tm_hour,
+          system_time->tm_min, system_time->tm_sec, ms_time,
+          static_cast<unsigned long>(dw_delta_time));
+  // Messages are 22 characters.
+  return 22;
 }
 
-WebRtc_Word32 TracePosix::AddBuildInfo(char* traceMessage) const
-{
-    sprintf(traceMessage, "Build info: %s", BUILDINFO);
-    // Include NULL termination (hence + 1).
-    return strlen(traceMessage) + 1;
+WebRtc_Word32 TracePosix::AddBuildInfo(char* trace_message) const {
+  sprintf(trace_message, "Build info: %s", BUILDINFO);
+  // Include NULL termination (hence + 1).
+  return strlen(trace_message) + 1;
 }
 
-WebRtc_Word32 TracePosix::AddDateTimeInfo(char* traceMessage) const
-{
-    time_t t;
-    time(&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 TracePosix::AddDateTimeInfo(char* trace_message) const {
+  time_t t;
+  time(&t);
+  char buffer[26];  // man ctime says buffer should have room for >=26 bytes.
+  sprintf(trace_message, "Local Date: %s", ctime_r(&t, buffer));
+  WebRtc_Word32 len = static_cast<WebRtc_Word32>(strlen(trace_message));
 
-    if ('\n' == traceMessage[len - 1])
-    {
-        traceMessage[len - 1] = '\0';
-        --len;
-    }
+  if ('\n' == trace_message[len - 1]) {
+    trace_message[len - 1] = '\0';
+    --len;
+  }
 
-    // Messages is 12 characters.
-    return len + 1;
+  // Messages is 12 characters.
+  return len + 1;
 }
-} // namespace webrtc
+
+}  // namespace webrtc