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

Unified Diff: net/quic/chromium/quic_stream_factory.cc

Issue 2811573003: Link NetLogs for HttpStreamFactoryImpl::Job and existing QuicStreamFactory::Job (Closed)
Patch Set: add a todo Created 3 years, 8 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: net/quic/chromium/quic_stream_factory.cc
diff --git a/net/quic/chromium/quic_stream_factory.cc b/net/quic/chromium/quic_stream_factory.cc
index 1fe0bf28f1878cae0695a69dfbbe1396be04291c..d717692a0ba5b90a48be3e698985ff1b3d1e0b4a 100644
--- a/net/quic/chromium/quic_stream_factory.cc
+++ b/net/quic/chromium/quic_stream_factory.cc
@@ -345,6 +345,8 @@ class QuicStreamFactory::Job {
const QuicSessionKey& key() const { return key_; }
+ const NetLogWithSource& net_log() const { return net_log_; }
+
base::WeakPtr<Job> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }
private:
@@ -1006,7 +1008,21 @@ int QuicStreamFactory::Create(const QuicServerId& server_id,
}
// Associate with active job to |server_id| if such exists.
- if (HasActiveJob(server_id)) {
+ auto itr = active_jobs_.find(server_id);
+ if (itr != active_jobs_.end()) {
+ const JobSet* job_set = &itr->second;
+ // TODO(zhongyi): figure out how to link the NetLogs if there are more than
+ // one jobs serving the same server id, i.e., auxiliary job is also
xunjieli 2017/04/11 00:32:02 nit: s/one jobs/one job. Remove comma after "i.e."
Zhongyi Shi 2017/04/11 00:54:33 Done.
+ // created.
+ if (job_set->size() == 1) {
+ const NetLogWithSource& job_net_log = job_set->begin()->first->net_log();
+ job_net_log.AddEvent(
+ NetLogEventType::QUIC_STREAM_FACTORY_JOB_BOUND_TO_HTTP_STREAM_JOB,
+ net_log.source().ToEventParametersCallback());
+ net_log.AddEvent(
+ NetLogEventType::HTTP_STREAM_JOB_BOUND_TO_QUIC_STREAM_FACTORY_JOB,
+ job_net_log.source().ToEventParametersCallback());
+ }
job_requests_map_[server_id].insert(request);
return ERR_IO_PENDING;
}
« 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