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

Use a plain string buffer in MemoryLogWriter

Browse Source 
Drop dependency on MemoryStream and the complex Stream interface.

Bug: None
Change-Id: I2226324b10ddbf5606e27bfecb82efdd25929163
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/213145
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33583}
This commit is contained in:
Niels Möller 2021-03-29 10:50:32 +02:00 committed by Commit Bot
parent ed3f9ec846
commit 0aca1dee17
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/logging/memory_log_writer.cc
View File

@ -21,25 +21,18 @@ class MemoryLogWriter final : public RtcEventLogOutput {
explicit MemoryLogWriter(std::map<std::string, std::string>* target, explicit MemoryLogWriter(std::map<std::string, std::string>* target,
std::string filename) std::string filename)
: target_(target), filename_(filename) {} : target_(target), filename_(filename) {}
~MemoryLogWriter() final { ~MemoryLogWriter() final { target_->insert({filename_, std::move(buffer_)}); }
size_t size;
buffer_.GetSize(&size);
target_->insert({filename_, std::string(buffer_.GetBuffer(), size)});
}
bool IsActive() const override { return true; } bool IsActive() const override { return true; }
bool Write(const std::string& value) override { bool Write(const std::string& value) override {
size_t written; buffer_.append(value);
int error; return true;
return buffer_.WriteAll(value.data(), value.size(), &written, &error) ==
rtc::SR_SUCCESS;
RTC_DCHECK_EQ(value.size(), written);
} }
void Flush() override {} void Flush() override {}
private: private:
std::map<std::string, std::string>* const target_; std::map<std::string, std::string>* const target_;
const std::string filename_; const std::string filename_;
rtc::MemoryStream buffer_; std::string buffer_;
}; };
class MemoryLogWriterFactory : public LogWriterFactoryInterface { class MemoryLogWriterFactory : public LogWriterFactoryInterface {

1
test/logging/memory_log_writer.h
View File

@ -15,7 +15,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "rtc_base/memory_stream.h"
#include "test/logging/log_writer.h" #include "test/logging/log_writer.h"
namespace webrtc { namespace webrtc {