Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: webrtc/pc/rtcstatscollector.cc

Issue 2986453002: Trace the stats report as JSON instead of each stat separately. (Closed)
Patch Set: Nits. Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/pc/rtcstats_integrationtest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2016 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 14 matching lines...) Expand all
25 #include "webrtc/pc/webrtcsession.h" 25 #include "webrtc/pc/webrtcsession.h"
26 #include "webrtc/rtc_base/checks.h" 26 #include "webrtc/rtc_base/checks.h"
27 #include "webrtc/rtc_base/stringutils.h" 27 #include "webrtc/rtc_base/stringutils.h"
28 #include "webrtc/rtc_base/timeutils.h" 28 #include "webrtc/rtc_base/timeutils.h"
29 #include "webrtc/rtc_base/trace_event.h" 29 #include "webrtc/rtc_base/trace_event.h"
30 30
31 namespace webrtc { 31 namespace webrtc {
32 32
33 namespace { 33 namespace {
34 34
35 const int kStatTypeMemberNameAndIdMaxLen = 1024;
36
37 std::string GetStatTypeMemberNameAndId(const RTCStats& stats,
38 const RTCStatsMemberInterface* member) {
39 RTC_DCHECK(strlen(stats.type()) + strlen(member->name())
40 + stats.id().size() + 3 < kStatTypeMemberNameAndIdMaxLen);
41 char buffer[kStatTypeMemberNameAndIdMaxLen];
42 rtc::sprintfn(&buffer[0], sizeof(buffer), "%s.%s.%s", stats.type(),
43 member->name(), stats.id().c_str());
44 return buffer;
45 }
46
47 std::string RTCCertificateIDFromFingerprint(const std::string& fingerprint) { 35 std::string RTCCertificateIDFromFingerprint(const std::string& fingerprint) {
48 return "RTCCertificate_" + fingerprint; 36 return "RTCCertificate_" + fingerprint;
49 } 37 }
50 38
51 std::string RTCCodecStatsIDFromDirectionMediaAndPayload( 39 std::string RTCCodecStatsIDFromDirectionMediaAndPayload(
52 bool inbound, bool audio, uint32_t payload_type) { 40 bool inbound, bool audio, uint32_t payload_type) {
53 // TODO(hbos): The present codec ID assignment is not sufficient to support 41 // TODO(hbos): The present codec ID assignment is not sufficient to support
54 // Unified Plan or unbundled connections in all cases. When we are able to 42 // Unified Plan or unbundled connections in all cases. When we are able to
55 // handle multiple m= lines of the same media type (and multiple BaseChannels 43 // handle multiple m= lines of the same media type (and multiple BaseChannels
56 // for the same type is possible?) this needs to be updated to differentiate 44 // for the same type is possible?) this needs to be updated to differentiate
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 if (!num_pending_partial_reports_) { 756 if (!num_pending_partial_reports_) {
769 cache_timestamp_us_ = partial_report_timestamp_us_; 757 cache_timestamp_us_ = partial_report_timestamp_us_;
770 cached_report_ = partial_report_; 758 cached_report_ = partial_report_;
771 partial_report_ = nullptr; 759 partial_report_ = nullptr;
772 channel_name_pairs_.reset(); 760 channel_name_pairs_.reset();
773 track_media_info_map_.reset(); 761 track_media_info_map_.reset();
774 track_to_id_.clear(); 762 track_to_id_.clear();
775 // Trace WebRTC Stats when getStats is called on Javascript. 763 // Trace WebRTC Stats when getStats is called on Javascript.
776 // This allows access to WebRTC stats from trace logs. To enable them, 764 // This allows access to WebRTC stats from trace logs. To enable them,
777 // select the "webrtc_stats" category when recording traces. 765 // select the "webrtc_stats" category when recording traces.
778 for (const RTCStats& stats : *cached_report_) { 766 TRACE_EVENT_INSTANT1("webrtc_stats", "webrtc_stats", "report",
779 for (const RTCStatsMemberInterface* member : stats.Members()) { 767 cached_report_->ToJson());
780 if (member->is_defined()) {
781 TRACE_EVENT_INSTANT2("webrtc_stats", "webrtc_stats",
782 "value", member->ValueToString(),
783 "type.name.id", GetStatTypeMemberNameAndId(
784 stats, member));
785 }
786 }
787 }
788 DeliverCachedReport(); 768 DeliverCachedReport();
789 } 769 }
790 } 770 }
791 771
792 void RTCStatsCollector::DeliverCachedReport() { 772 void RTCStatsCollector::DeliverCachedReport() {
793 RTC_DCHECK(signaling_thread_->IsCurrent()); 773 RTC_DCHECK(signaling_thread_->IsCurrent());
794 RTC_DCHECK(!callbacks_.empty()); 774 RTC_DCHECK(!callbacks_.empty());
795 RTC_DCHECK(cached_report_); 775 RTC_DCHECK(cached_report_);
796 for (const rtc::scoped_refptr<RTCStatsCollectorCallback>& callback : 776 for (const rtc::scoped_refptr<RTCStatsCollectorCallback>& callback :
797 callbacks_) { 777 callbacks_) {
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 const std::string& type) { 1255 const std::string& type) {
1276 return CandidateTypeToRTCIceCandidateType(type); 1256 return CandidateTypeToRTCIceCandidateType(type);
1277 } 1257 }
1278 1258
1279 const char* DataStateToRTCDataChannelStateForTesting( 1259 const char* DataStateToRTCDataChannelStateForTesting(
1280 DataChannelInterface::DataState state) { 1260 DataChannelInterface::DataState state) {
1281 return DataStateToRTCDataChannelState(state); 1261 return DataStateToRTCDataChannelState(state);
1282 } 1262 }
1283 1263
1284 } // namespace webrtc 1264 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/rtcstats_integrationtest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698