Link NetLogs for HttpStreamFactoryImpl::Job and existing QuicStreamFactory::Job

net/quic/chromium/quic_stream_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/chromium/quic_stream_factory.h"
 
 #include <algorithm>
 #include <tuple>
 #include <utility>
 
@@ skipping 327 matching lines @@
   void OnIOComplete(int rv);
 
   void RunAuxilaryJob();
 
   void Cancel();
 
   void CancelWaitForDataReadyCallback();
 
   const QuicSessionKey& key() const { return key_; }
 
+  const NetLogWithSource& net_log() const { return net_log_; }
+
   base::WeakPtr<Job> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }
 
  private:
   enum IoState {
     STATE_NONE,
     STATE_RESOLVE_HOST,
     STATE_RESOLVE_HOST_COMPLETE,
     STATE_LOAD_SERVER_INFO,
     STATE_LOAD_SERVER_INFO_COMPLETE,
     STATE_CONNECT,
@@ skipping 641 matching lines @@
   if (!active_sessions_.empty()) {
     SessionMap::iterator it = active_sessions_.find(server_id);
     if (it != active_sessions_.end()) {
       QuicChromiumClientSession* session = it->second;
       request->SetSession(session);
       return OK;
     }
   }
 
   // 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.
Acknowledged.

+    // 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;
   }
 
   // Pool to active session to |destination| if possible.
   if (!active_sessions_.empty() && !disable_connection_pooling_) {
     for (const auto& key_value : active_sessions_) {
       QuicChromiumClientSession* session = key_value.second;
       if (destination.Equals(all_sessions_[session].destination()) &&
           session->CanPool(server_id.host(), server_id.privacy_mode())) {
@@ skipping 907 matching lines @@
   // Since the session was active, there's no longer an
   // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP
   // job also fails. So to avoid not using QUIC when we otherwise could, we mark
   // it as recently broken, which means that 0-RTT will be disabled but we'll
   // still race.
   http_server_properties_->MarkAlternativeServiceRecentlyBroken(
       alternative_service);
 }
 
 }  // namespace net