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

Enable tracing on rtcstats_integrationtest.cc

Browse Source 
BUG=chromium:653087

Review-Url: https://codereview.webrtc.org/2979203002
Cr-Commit-Position: refs/heads/master@{#19076}
This commit is contained in:
ehmaldonado 2017-07-18 07:35:19 -07:00 committed by Commit Bot
parent b878575bec
commit 80c829f253
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/pc/rtcstats_integrationtest.cc
View File

@ -20,6 +20,7 @@
#include "webrtc/pc/test/peerconnectiontestwrapper.h"
#include "webrtc/pc/test/rtcstatsobtainer.h"
#include "webrtc/rtc_base/checks.h"
#include "webrtc/rtc_base/event_tracer.h"
#include "webrtc/rtc_base/gunit.h"
#include "webrtc/rtc_base/refcountedobject.h"
#include "webrtc/rtc_base/scoped_ref_ptr.h"
@ -31,11 +32,29 @@ namespace {
const int64_t kGetStatsTimeoutMs = 10000;
const unsigned char* GetCategoryEnabledHandler(const char* name) {
return reinterpret_cast<const unsigned char*>("webrtc_stats");
}
void AddTraceEventHandler(char phase,
const unsigned char* category_enabled,
const char* name,
unsigned long long id,
int num_args,
const char** arg_names,
const unsigned char* arg_types,
const unsigned long long* arg_values,
unsigned char flags) {
// Do nothing
}
class RTCStatsIntegrationTest : public testing::Test {
public:
RTCStatsIntegrationTest()
: network_thread_(new rtc::Thread(&virtual_socket_server_)),
worker_thread_(rtc::Thread::Create()) {
SetupEventTracer(&GetCategoryEnabledHandler, &AddTraceEventHandler);
RTC_CHECK(network_thread_->Start());
RTC_CHECK(worker_thread_->Start());

2
webrtc/pc/rtcstatscollector.cc
View File

@ -32,7 +32,7 @@ namespace webrtc {
namespace {
const int kStatTypeMemberNameAndIdMaxLen = 512;
const int kStatTypeMemberNameAndIdMaxLen = 1024;
std::string GetStatTypeMemberNameAndId(const RTCStats& stats,
const RTCStatsMemberInterface* member) {