Add libjingle-style stream-style logging.
Add a highly stripped-down version of libjingle's base/logging.h. It is
a thin wrapper around WEBRTC_TRACE, maintaining the libjingle log
semantics to ease a transition to that format.
Also add some helper macros for easy API and function failure logging.
Review URL: https://webrtc-codereview.appspot.com/931010
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3099 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/system_wrappers/source/trace_impl.cc b/webrtc/system_wrappers/source/trace_impl.cc
index 09d3eb7..c3c6849 100644
--- a/webrtc/system_wrappers/source/trace_impl.cc
+++ b/webrtc/system_wrappers/source/trace_impl.cc
@@ -199,6 +199,7 @@
// TODO (hellner): is this actually a problem? If so, it should be better to
// clean up WebRtc_Word32
const long int idl = id;
+ const int kMessageLength = 25;
if(idl != -1)
{
const unsigned long int idEngine = id>>16;
@@ -206,6 +207,10 @@
switch (module)
{
+ case kTraceUndefined:
+ // Add the appropriate amount of whitespace.
+ memset(traceMessage, ' ', kMessageLength);
+ break;
case kTraceVoice:
sprintf(traceMessage, " VOICE:%5ld %5ld;", idEngine,
idChannel);
@@ -279,6 +284,10 @@
} else {
switch (module)
{
+ case kTraceUndefined:
+ // Add the appropriate amount of whitespace.
+ memset(traceMessage, ' ', kMessageLength);
+ break;
case kTraceVoice:
sprintf (traceMessage, " VOICE:%11ld;", idl);
break;
@@ -332,8 +341,7 @@
break;
}
}
- // All messages are 25 characters.
- return 25;
+ return kMessageLength;
}
WebRtc_Word32 TraceImpl::SetTraceFileImpl(const char* fileNameUTF8,
@@ -605,44 +613,44 @@
if (TraceCheck(level))
{
char traceMessage[WEBRTC_TRACE_MAX_MESSAGE_SIZE];
- char* meassagePtr = traceMessage;
+ char* messagePtr = traceMessage;
WebRtc_Word32 len = 0;
WebRtc_Word32 ackLen = 0;
- len = AddLevel(meassagePtr, level);
+ len = AddLevel(messagePtr, level);
if(len == -1)
{
return;
}
- meassagePtr += len;
+ messagePtr += len;
ackLen += len;
- len = AddTime(meassagePtr, level);
+ len = AddTime(messagePtr, level);
if(len == -1)
{
return;
}
- meassagePtr += len;
+ messagePtr += len;
ackLen += len;
- len = AddModuleAndId(meassagePtr, module, id);
+ len = AddModuleAndId(messagePtr, module, id);
if(len == -1)
{
return;
}
- meassagePtr += len;
+ messagePtr += len;
ackLen += len;
- len = AddThreadId(meassagePtr);
+ len = AddThreadId(messagePtr);
if(len < 0)
{
return;
}
- meassagePtr += len;
+ messagePtr += len;
ackLen += len;
- len = AddMessage(meassagePtr, msg, (WebRtc_UWord16)ackLen);
+ len = AddMessage(messagePtr, msg, (WebRtc_UWord16)ackLen);
if(len == -1)
{
return;