generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add an option to override the TestToStderr trace printout time.

Browse Source 
This is useful for offline file-based tests.

R=kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3960 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2013-05-05 19:44:19 +00:00
parent f9c289bafe
commit 59aaebc3cd
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
webrtc/test/testsupport/trace_to_stderr.cc
View File

@ -20,7 +20,17 @@ namespace test {
static const int kLevelFilter = kTraceError | kTraceWarning | kTraceTerseInfo;
TraceToStderr::TraceToStderr() {
TraceToStderr::TraceToStderr()
: override_time_(false),
time_seconds_(0) {
Trace::CreateTrace();
Trace::SetTraceCallback(this);
Trace::SetLevelFilter(kLevelFilter);
}
TraceToStderr::TraceToStderr(bool override_time)
: override_time_(override_time),
time_seconds_(0) {
Trace::CreateTrace();
Trace::SetTraceCallback(this);
Trace::SetLevelFilter(kLevelFilter);
@ -35,10 +45,14 @@ void TraceToStderr::Print(TraceLevel level, const char* msg_array, int length) {
if (level & kLevelFilter) {
assert(length > Trace::kBoilerplateLength);
std::string msg = msg_array;
std::string msg_time = msg.substr(Trace::kTimestampPosition,
Trace::kTimestampLength);
std::string msg_log = msg.substr(Trace::kBoilerplateLength);
fprintf(stderr, "%s %s\n", msg_time.c_str(), msg_log.c_str());
if (override_time_) {
fprintf(stderr, "%.2fs %s\n", time_seconds_, msg_log.c_str());
} else {
std::string msg_time = msg.substr(Trace::kTimestampPosition,
Trace::kTimestampLength);
fprintf(stderr, "%s %s\n", msg_time.c_str(), msg_log.c_str());
}
fflush(stderr);
}
}

20
webrtc/test/testsupport/trace_to_stderr.h
View File

@ -21,9 +21,29 @@ namespace test {
class TraceToStderr : public TraceCallback {
public:
TraceToStderr();
// Set |override_time| to true to control the time printed with each trace
// through SetTimeSeconds(). Otherwise, the trace's usual wallclock time is
// used.
//
// This is useful for offline test tools, where the file time is much more
// informative than the real time.
explicit TraceToStderr(bool override_time);
virtual ~TraceToStderr();
// Every subsequent trace printout will use |time|. Has no effect if
// |override_time| in the constructor was set to false.
//
// No attempt is made to ensure thread-safety between the trace writing and
// time updating. In tests, since traces will normally be triggered by the
// main thread doing the time updating, this should be of no concern.
virtual void SetTimeSeconds(float time) { time_seconds_ = time; }
// Implements TraceCallback.
virtual void Print(TraceLevel level, const char* msg_array, int length);
private:
bool override_time_;
float time_seconds_;
};
} // namespace test