Remove all remaining non-test uses of std::stringstream.

Bug: webrtc:8982 Change-Id: I635a8545c46dc8c89663d64af351e22e65cbcb33 Reviewed-on: https://webrtc-review.googlesource.com/98880 Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24715}
JamesTerm · Sep 13, 2018 · 941a07c · 941a07c
1 parent 0961933
commit 941a07c
Show file tree

Hide file tree

Showing 25 changed files with 74 additions and 126 deletions.
diff --git a/api/rtcerror.cc b/api/rtcerror.cc
@@ -36,61 +36,20 @@ static_assert(static_cast<int>(webrtc::RTCErrorType::INTERNAL_ERROR) ==
 
 namespace webrtc {
 
-RTCError::RTCError(RTCError&& other)
-    : type_(other.type_), have_string_message_(other.have_string_message_) {
-  if (have_string_message_) {
-    new (&string_message_) std::string(std::move(other.string_message_));
-  } else {
-    static_message_ = other.static_message_;
-  }
-}
-
-RTCError& RTCError::operator=(RTCError&& other) {
-  type_ = other.type_;
-  if (other.have_string_message_) {
-    set_message(std::move(other.string_message_));
-  } else {
-    set_message(other.static_message_);
-  }
-  return *this;
-}
-
-RTCError::~RTCError() {
-  // If we hold a message string that was built, rather than a static string,
-  // we need to delete it.
-  if (have_string_message_) {
-    string_message_.~basic_string();
-  }
-}
+RTCError::RTCError(RTCError&& other) = default;
+RTCError& RTCError::operator=(RTCError&& other) = default;
 
 // static
 RTCError RTCError::OK() {
   return RTCError();
 }
 
 const char* RTCError::message() const {
-  if (have_string_message_) {
-    return string_message_.c_str();
-  } else {
-    return static_message_;
-  }
-}
-
-void RTCError::set_message(const char* message) {
-  if (have_string_message_) {
-    string_message_.~basic_string();
-    have_string_message_ = false;
-  }
-  static_message_ = message;
+  return message_.c_str();
 }
 
-void RTCError::set_message(std::string&& message) {
-  if (!have_string_message_) {
-    new (&string_message_) std::string(std::move(message));
-    have_string_message_ = true;
-  } else {
-    string_message_ = message;
-  }
+void RTCError::set_message(std::string message) {
+  message_ = std::move(message);
 }
 
 // TODO(jonasolsson): Change to use absl::string_view when it's available.

diff --git a/api/rtcerror.h b/api/rtcerror.h
@@ -86,12 +86,9 @@ class RTCError {
   // Creates a "no error" error.
   RTCError() {}
   explicit RTCError(RTCErrorType type) : type_(type) {}
-  // For performance, prefer using the constructor that takes a const char* if
-  // the message is a static string.
-  RTCError(RTCErrorType type, const char* message)
-      : type_(type), static_message_(message), have_string_message_(false) {}
-  RTCError(RTCErrorType type, std::string&& message)
-      : type_(type), string_message_(message), have_string_message_(true) {}
+
+  RTCError(RTCErrorType type, std::string message)
+      : type_(type), message_(std::move(message)) {}
 
   // Delete the copy constructor and assignment operator; there aren't any use
   // cases where you should need to copy an RTCError, as opposed to moving it.
@@ -103,8 +100,6 @@ class RTCError {
   RTCError(RTCError&& other);
   RTCError& operator=(RTCError&& other);
 
-  ~RTCError();
-
   // Identical to default constructed error.
   //
   // Preferred over the default constructor for code readability.
@@ -118,27 +113,16 @@ class RTCError {
   // anything but logging/diagnostics, since messages are not guaranteed to be
   // stable.
   const char* message() const;
-  // For performance, prefer using the method that takes a const char* if the
-  // message is a static string.
-  void set_message(const char* message);
-  void set_message(std::string&& message);
+
+  void set_message(std::string message);
 
   // Convenience method for situations where you only care whether or not an
   // error occurred.
   bool ok() const { return type_ == RTCErrorType::NONE; }
 
  private:
   RTCErrorType type_ = RTCErrorType::NONE;
-  // For performance, we use static strings wherever possible. But in some
-  // cases the error string may need to be constructed, in which case an
-  // std::string is used.
-  union {
-    const char* static_message_ = "";
-    std::string string_message_;
-  };
-  // Whether or not |static_message_| or |string_message_| is being used in the
-  // above union.
-  bool have_string_message_ = false;
+  std::string message_;
 };
 
 // Outputs the error as a friendly string. Update this method when adding a new

diff --git a/api/rtcerror_unittest.cc b/api/rtcerror_unittest.cc
@@ -222,7 +222,8 @@ TEST(RTCErrorOrTest, MoveValue) {
 #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 
 TEST(RTCErrorOrDeathTest, ConstructWithOkError) {
-  EXPECT_DEATH(RTCErrorOr<int> err = RTCError::OK(), "");
+  RTCErrorOr<int> err;
+  EXPECT_DEATH(err = RTCError::OK(), "");
 }
 
 TEST(RTCErrorOrDeathTest, DereferenceErrorValue) {

diff --git a/api/units/time_delta.h b/api/units/time_delta.h
@@ -17,6 +17,7 @@
 
 #include <stdint.h>
 #include <cmath>
+#include <cstdlib>
 #include <limits>
 #include <string>
 

diff --git a/examples/stunprober/main.cc b/examples/stunprober/main.cc
@@ -14,6 +14,7 @@
 
 #include <map>
 #include <memory>
+#include <sstream>  // no-presubmit-check TODO(webrtc:8982)
 
 #include "p2p/base/basicpacketsocketfactory.h"
 #include "p2p/stunprober/stunprober.h"

diff --git a/logging/rtc_event_log/rtc_event_log_parser.h b/logging/rtc_event_log/rtc_event_log_parser.h
@@ -11,6 +11,7 @@
 #define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_PARSER_H_
 
 #include <map>
+#include <sstream>  // no-presubmit-check TODO(webrtc:8982)
 #include <string>
 #include <utility>  // pair
 #include <vector>

diff --git a/logging/rtc_event_log/rtc_event_log_parser_new.h b/logging/rtc_event_log/rtc_event_log_parser_new.h
@@ -13,6 +13,7 @@
 #include <iterator>
 #include <map>
 #include <set>
+#include <sstream>  // no-presubmit-check TODO(webrtc:8982)
 #include <string>
 #include <utility>  // pair
 #include <vector>

diff --git a/media/engine/webrtcvideoengine.cc b/media/engine/webrtcvideoengine.cc
@@ -34,6 +34,7 @@
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/copyonwritebuffer.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/strings/string_builder.h"
 #include "rtc_base/stringutils.h"
 #include "rtc_base/timeutils.h"
 #include "rtc_base/trace_event.h"
@@ -168,15 +169,15 @@ std::vector<VideoCodec> AssignPayloadTypesAndDefaultCodecs(
 }
 
 static std::string CodecVectorToString(const std::vector<VideoCodec>& codecs) {
-  std::stringstream out;
-  out << '{';
+  rtc::StringBuilder out;
+  out << "{";
   for (size_t i = 0; i < codecs.size(); ++i) {
     out << codecs[i].ToString();
     if (i != codecs.size() - 1) {
       out << ", ";
     }
   }
-  out << '}';
+  out << "}";
   return out.str();
 }
 
@@ -940,15 +941,15 @@ bool WebRtcVideoChannel::SetRecvParameters(const VideoRecvParameters& params) {
 
 std::string WebRtcVideoChannel::CodecSettingsVectorToString(
     const std::vector<VideoCodecSettings>& codecs) {
-  std::stringstream out;
-  out << '{';
+  rtc::StringBuilder out;
+  out << "{";
   for (size_t i = 0; i < codecs.size(); ++i) {
     out << codecs[i].codec.ToString();
     if (i != codecs.size() - 1) {
       out << ", ";
     }
   }
-  out << '}';
+  out << "}";
   return out.str();
 }
 

diff --git a/modules/audio_processing/aec3/aec3_fft.cc b/modules/audio_processing/aec3/aec3_fft.cc
@@ -11,6 +11,7 @@
 #include "modules/audio_processing/aec3/aec3_fft.h"
 
 #include <algorithm>
+#include <functional>
 
 #include "rtc_base/checks.h"
 

diff --git a/modules/audio_processing/aec3/render_buffer.cc b/modules/audio_processing/aec3/render_buffer.cc
@@ -11,6 +11,7 @@
 #include "modules/audio_processing/aec3/render_buffer.h"
 
 #include <algorithm>
+#include <functional>
 
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "rtc_base/checks.h"

diff --git a/modules/audio_processing/test/test_utils.h b/modules/audio_processing/test/test_utils.h
@@ -15,6 +15,7 @@
 #include <iterator>
 #include <limits>
 #include <memory>
+#include <sstream>  // no-presubmit-check TODO(webrtc:8982)
 #include <string>
 #include <vector>
 

diff --git a/ortc/rtptransportadapter.cc b/ortc/rtptransportadapter.cc
@@ -12,7 +12,6 @@
 
 #include <algorithm>  // For std::find.
 #include <set>
-#include <sstream>
 #include <utility>  // For std::move.
 
 #include "absl/memory/memory.h"

diff --git a/ortc/rtptransportcontrolleradapter.cc b/ortc/rtptransportcontrolleradapter.cc
@@ -12,7 +12,6 @@
 
 #include <algorithm>  // For "remove", "find".
 #include <set>
-#include <sstream>
 #include <unordered_map>
 #include <utility>  // For std::move.
 
@@ -25,6 +24,7 @@
 #include "pc/rtpmediautils.h"
 #include "pc/rtpparametersconversion.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/strings/string_builder.h"
 
 namespace webrtc {
 
@@ -39,7 +39,7 @@ static RTCError CheckForIdConflicts(
     const std::vector<C2>& codecs_b,
     const cricket::RtpHeaderExtensions& extensions_b,
     const cricket::StreamParamsVec& streams_b) {
-  std::ostringstream oss;
+  rtc::StringBuilder oss;
   // Since it's assumed that C1 and C2 are different types, codecs_a and
   // codecs_b should never contain the same payload type, and thus we can just
   // use a set.

diff --git a/p2p/base/dtlstransport.h b/p2p/base/dtlstransport.h
@@ -22,6 +22,7 @@
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/sslstreamadapter.h"
 #include "rtc_base/stream.h"
+#include "rtc_base/strings/string_builder.h"
 #include "rtc_base/thread_checker.h"
 
 namespace rtc {
@@ -180,12 +181,12 @@ class DtlsTransport : public DtlsTransportInternal {
   int SetOption(rtc::Socket::Option opt, int value) override;
 
   std::string ToString() const {
-    const char RECEIVING_ABBREV[2] = {'_', 'R'};
-    const char WRITABLE_ABBREV[2] = {'_', 'W'};
-    std::stringstream ss;
-    ss << "DtlsTransport[" << transport_name_ << "|" << component_ << "|"
+    const absl::string_view RECEIVING_ABBREV[2] = {"_", "R"};
+    const absl::string_view WRITABLE_ABBREV[2] = {"_", "W"};
+    rtc::StringBuilder sb;
+    sb << "DtlsTransport[" << transport_name_ << "|" << component_ << "|"
        << RECEIVING_ABBREV[receiving()] << WRITABLE_ABBREV[writable()] << "]";
-    return ss.str();
+    return sb.str();
   }
 
  private:

diff --git a/p2p/base/p2ptransportchannel.h b/p2p/base/p2ptransportchannel.h
@@ -41,6 +41,7 @@
 #include "rtc_base/asyncinvoker.h"
 #include "rtc_base/asyncpacketsocket.h"
 #include "rtc_base/constructormagic.h"
+#include "rtc_base/strings/string_builder.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace webrtc {
@@ -171,9 +172,9 @@ class P2PTransportChannel : public IceTransportInternal {
   }
 
   std::string ToString() const {
-    const char RECEIVING_ABBREV[2] = {'_', 'R'};
-    const char WRITABLE_ABBREV[2] = {'_', 'W'};
-    std::stringstream ss;
+    const std::string RECEIVING_ABBREV[2] = {"_", "R"};
+    const std::string WRITABLE_ABBREV[2] = {"_", "W"};
+    rtc::StringBuilder ss;
     ss << "Channel[" << transport_name_ << "|" << component_ << "|"
        << RECEIVING_ABBREV[receiving_] << WRITABLE_ABBREV[writable_] << "]";
     return ss.str();