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

Unified Diff: webrtc/logging/rtc_event_log/rtc_event_log.cc

Issue 2956003003: Limit the number of simultaneous event logs. (Closed)
Patch Set: Use atomics instead of lock. Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/logging/rtc_event_log/rtc_event_log.cc
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.cc b/webrtc/logging/rtc_event_log/rtc_event_log.cc
index 0c2b15d13c0407c78a25a2fc3ac8a5e409025a64..6b0783116a62dd0799077dc634d0a0f104a3df7b 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log.cc
@@ -13,6 +13,7 @@
#include <limits>
#include <vector>
+#include "webrtc/base/atomicops.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/event.h"
@@ -52,8 +53,9 @@ namespace webrtc {
#ifdef ENABLE_RTC_EVENT_LOG
class RtcEventLogImpl final : public RtcEventLog {
+ friend std::unique_ptr<RtcEventLog> RtcEventLog::Create();
+
public:
- RtcEventLogImpl();
~RtcEventLogImpl() override;
bool StartLogging(const std::string& file_name,
@@ -92,11 +94,16 @@ class RtcEventLogImpl final : public RtcEventLog {
ProbeFailureReason failure_reason) override;
private:
+ // Private constructor to ensure that creation is done by RtcEventLog::Create.
+ RtcEventLogImpl();
+
void StoreEvent(std::unique_ptr<rtclog::Event>* event);
void LogProbeResult(int id,
rtclog::BweProbeResult::ResultType result,
int bitrate_bps);
+ static volatile int log_count_;
+
// Message queue for passing control messages to the logging thread.
SwapQueue<RtcEventLogHelperThread::ControlMessage> message_queue_;
@@ -162,6 +169,8 @@ static const int kEventsPerSecond = 1000;
static const int kControlMessagesPerSecond = 10;
} // namespace
+volatile int RtcEventLogImpl::log_count_ = 0;
+
// RtcEventLogImpl member functions.
RtcEventLogImpl::RtcEventLogImpl()
// Allocate buffers for roughly one second of history.
@@ -175,6 +184,8 @@ RtcEventLogImpl::RtcEventLogImpl()
RtcEventLogImpl::~RtcEventLogImpl() {
// The RtcEventLogHelperThread destructor closes the file
// and waits for the thread to terminate.
+ int count = rtc::AtomicOps::Decrement(&RtcEventLogImpl::log_count_);
+ RTC_DCHECK_GE(count, 0);
}
bool RtcEventLogImpl::StartLogging(const std::string& file_name,
@@ -583,6 +594,14 @@ bool RtcEventLog::ParseRtcEventLog(const std::string& file_name,
// RtcEventLog member functions.
std::unique_ptr<RtcEventLog> RtcEventLog::Create() {
#ifdef ENABLE_RTC_EVENT_LOG
+ constexpr int kMaxLogCount = 5;
+ int count = rtc::AtomicOps::Increment(&RtcEventLogImpl::log_count_);
+ if (count > kMaxLogCount) {
+ LOG(LS_WARNING) << "Denied creation of additional WebRTC event logs. "
+ << count - 1 << " logs open already.";
+ rtc::AtomicOps::Decrement(&RtcEventLogImpl::log_count_);
+ return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl());
+ }
return std::unique_ptr<RtcEventLog>(new RtcEventLogImpl());
#else
return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698