Use rtc::StringBuilder in stats/

This removes the dependency on sstream which will reduce binary size.

Bug: webrtc:8982
Change-Id: I153390f2d8baf3e15875c39d1f5027b3575bca31
Reviewed-on: https://webrtc-review.googlesource.com/c/115748
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26127}
This commit is contained in:
Steve Anton
2018-12-27 15:44:25 -08:00
committed by Commit Bot
parent d9ac058464
commit a29b3a6f34
2 changed files with 52 additions and 49 deletions

View File

@ -10,10 +10,11 @@
#include "api/stats/rtcstats.h" #include "api/stats/rtcstats.h"
#include <iomanip> #include <cstdio>
#include <sstream>
#include "rtc_base/arraysize.h"
#include "rtc_base/stringencode.h" #include "rtc_base/stringencode.h"
#include "rtc_base/strings/string_builder.h"
namespace webrtc { namespace webrtc {
@ -23,53 +24,54 @@ namespace {
// types. // types.
template <typename T> template <typename T>
std::string VectorToString(const std::vector<T>& vector) { std::string VectorToString(const std::vector<T>& vector) {
if (vector.empty()) rtc::StringBuilder sb;
return "[]"; sb << "[";
std::ostringstream oss; const char* separator = "";
oss << "[" << rtc::ToString(vector[0]); for (const T& element : vector) {
for (size_t i = 1; i < vector.size(); ++i) { sb << separator << rtc::ToString(element);
oss << "," << rtc::ToString(vector[i]); separator = ",";
} }
oss << "]"; sb << "]";
return oss.str(); return sb.Release();
} }
// Produces "[\"a\",\"b\",\"c\"]". Works for vectors of both const char* and // Produces "[\"a\",\"b\",\"c\"]". Works for vectors of both const char* and
// std::string element types. // std::string element types.
template <typename T> template <typename T>
std::string VectorOfStringsToString(const std::vector<T>& strings) { std::string VectorOfStringsToString(const std::vector<T>& strings) {
if (strings.empty()) rtc::StringBuilder sb;
return "[]"; sb << "[";
std::ostringstream oss; const char* separator = "";
oss << "[\"" << rtc::ToString(strings[0]) << '\"'; for (const T& element : strings) {
for (size_t i = 1; i < strings.size(); ++i) { sb << separator << "\"" << rtc::ToString(element) << "\"";
oss << ",\"" << rtc::ToString(strings[i]) << '\"'; separator = ",";
} }
oss << "]"; sb << "]";
return oss.str(); return sb.Release();
} }
template <typename T> template <typename T>
std::string ToStringAsDouble(const T value) { std::string ToStringAsDouble(const T value) {
// JSON represents numbers as floating point numbers with about 15 decimal // JSON represents numbers as floating point numbers with about 15 decimal
// digits of precision. // digits of precision.
const int JSON_PRECISION = 16; char buf[32];
std::ostringstream oss; const int len = std::snprintf(&buf[0], arraysize(buf), "%.16g",
oss << std::setprecision(JSON_PRECISION) << static_cast<double>(value); static_cast<double>(value));
return oss.str(); RTC_DCHECK_LE(len, arraysize(buf));
return std::string(&buf[0], len);
} }
template <typename T> template <typename T>
std::string VectorToStringAsDouble(const std::vector<T>& vector) { std::string VectorToStringAsDouble(const std::vector<T>& vector) {
if (vector.empty()) rtc::StringBuilder sb;
return "[]"; sb << "[";
std::ostringstream oss; const char* separator = "";
oss << "[" << ToStringAsDouble<T>(vector[0]); for (const T& element : vector) {
for (size_t i = 1; i < vector.size(); ++i) { sb << separator << ToStringAsDouble<T>(element);
oss << "," << ToStringAsDouble<T>(vector[i]); separator = ",";
} }
oss << "]"; sb << "]";
return oss.str(); return sb.Release();
} }
} // namespace } // namespace
@ -96,21 +98,21 @@ bool RTCStats::operator!=(const RTCStats& other) const {
} }
std::string RTCStats::ToJson() const { std::string RTCStats::ToJson() const {
std::ostringstream oss; rtc::StringBuilder sb;
oss << "{\"type\":\"" << type() << "\"," sb << "{\"type\":\"" << type() << "\","
<< "\"id\":\"" << id_ << "\"," << "\"id\":\"" << id_ << "\","
<< "\"timestamp\":" << timestamp_us_; << "\"timestamp\":" << timestamp_us_;
for (const RTCStatsMemberInterface* member : Members()) { for (const RTCStatsMemberInterface* member : Members()) {
if (member->is_defined()) { if (member->is_defined()) {
oss << ",\"" << member->name() << "\":"; sb << ",\"" << member->name() << "\":";
if (member->is_string()) if (member->is_string())
oss << '"' << member->ValueToJson() << '"'; sb << "\"" << member->ValueToJson() << "\"";
else else
oss << member->ValueToJson(); sb << member->ValueToJson();
} }
} }
oss << "}"; sb << "}";
return oss.str(); return sb.Release();
} }
std::vector<const RTCStatsMemberInterface*> RTCStats::Members() const { std::vector<const RTCStatsMemberInterface*> RTCStats::Members() const {

View File

@ -10,11 +10,11 @@
#include "api/stats/rtcstatsreport.h" #include "api/stats/rtcstatsreport.h"
#include <sstream>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/strings/string_builder.h"
namespace webrtc { namespace webrtc {
@ -119,16 +119,17 @@ RTCStatsReport::ConstIterator RTCStatsReport::end() const {
} }
std::string RTCStatsReport::ToJson() const { std::string RTCStatsReport::ToJson() const {
std::ostringstream oss; if (begin() == end()) {
ConstIterator it = begin(); return "";
if (it != end()) {
oss << '[' << it->ToJson();
for (++it; it != end(); ++it) {
oss << "," << it->ToJson();
} }
oss << ']'; rtc::StringBuilder sb;
sb << "[";
const char* separator = "";
for (ConstIterator it = begin(); it != end(); ++it) {
sb << separator << it->ToJson();
} }
return oss.str(); sb << "]";
return sb.Release();
} }
} // namespace webrtc } // namespace webrtc