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

Unified Diff: net/quic/quic_connection.cc

Issue 1572353002: QuicAlarms are now allocated out of an arena in QuicConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge recent changes. Created 4 years, 11 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 | « net/quic/quic_connection.h ('k') | net/quic/quic_connection_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_connection.cc
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index df2efe48f22a009f9262f154b8584d03d9840122..fba91797ccb4aa132003c19ba851597a7c7dcd39 100644
--- a/net/quic/quic_connection.cc
+++ b/net/quic/quic_connection.cc
@@ -274,13 +274,18 @@ QuicConnection::QuicConnection(QuicConnectionId connection_id,
ack_decimation_enabled_(false),
delay_setting_retransmission_alarm_(false),
pending_retransmission_alarm_(false),
- ack_alarm_(helper->CreateAlarm(new AckAlarm(this))),
- retransmission_alarm_(helper->CreateAlarm(new RetransmissionAlarm(this))),
- send_alarm_(helper->CreateAlarm(new SendAlarm(this))),
- resume_writes_alarm_(helper->CreateAlarm(new SendAlarm(this))),
- timeout_alarm_(helper->CreateAlarm(new TimeoutAlarm(this))),
- ping_alarm_(helper->CreateAlarm(new PingAlarm(this))),
- mtu_discovery_alarm_(helper->CreateAlarm(new MtuDiscoveryAlarm(this))),
+ arena_(),
+ ack_alarm_(helper->CreateAlarm(arena_.New<AckAlarm>(this), &arena_)),
+ retransmission_alarm_(
+ helper->CreateAlarm(arena_.New<RetransmissionAlarm>(this), &arena_)),
+ send_alarm_(helper->CreateAlarm(arena_.New<SendAlarm>(this), &arena_)),
+ resume_writes_alarm_(
+ helper->CreateAlarm(arena_.New<SendAlarm>(this), &arena_)),
+ timeout_alarm_(
+ helper->CreateAlarm(arena_.New<TimeoutAlarm>(this), &arena_)),
+ ping_alarm_(helper->CreateAlarm(arena_.New<PingAlarm>(this), &arena_)),
+ mtu_discovery_alarm_(
+ helper->CreateAlarm(arena_.New<MtuDiscoveryAlarm>(this), &arena_)),
visitor_(nullptr),
debug_visitor_(nullptr),
packet_generator_(connection_id_,
@@ -288,7 +293,8 @@ QuicConnection::QuicConnection(QuicConnectionId connection_id,
random_generator_,
helper->GetBufferAllocator(),
this),
- fec_alarm_(helper->CreateAlarm(new FecAlarm(&packet_generator_))),
+ fec_alarm_(helper->CreateAlarm(arena_.New<FecAlarm>(&packet_generator_),
+ &arena_)),
idle_network_timeout_(QuicTime::Delta::Infinite()),
overall_connection_timeout_(QuicTime::Delta::Infinite()),
time_of_last_received_packet_(clock_->ApproximateNow()),
« no previous file with comments | « net/quic/quic_connection.h ('k') | net/quic/quic_connection_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698