Bug 1468583 - Explicitly tie h2stream to transaction in logs for logan. r=valentin
authorNicholas Hurley <hurley@mozilla.com>
Fri, 27 Jul 2018 06:35:00 +0000
changeset 428801 2663d407a55a1e6851503f7b1c91f2017f0458e4
parent 428800 565b62023b58fbaa84fb1075f6f86feaec36fecc
child 428802 653f9be185f845fee0c6f28915badeb641d14baf
child 428827 71f410a4fe344f37447aee40403c53225ea2efdc
push id67010
push userhurley@mozilla.com
push dateFri, 27 Jul 2018 18:48:42 +0000
treeherderautoland@2663d407a55a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvalentin
bugs1468583
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1468583 - Explicitly tie h2stream to transaction in logs for logan. r=valentin Differential Revision: https://phabricator.services.mozilla.com/D1656
netwerk/protocol/http/Http2Stream.cpp
--- a/netwerk/protocol/http/Http2Stream.cpp
+++ b/netwerk/protocol/http/Http2Stream.cpp
@@ -75,17 +75,18 @@ Http2Stream::Http2Stream(nsAHttpTransact
   , mAttempting0RTT(false)
   , mCurrentForegroundTabOuterContentWindowId(windowId)
   , mTransactionTabId(0)
   , mIsTunnel(false)
   , mPlainTextTunnel(false)
 {
   MOZ_ASSERT(OnSocketThread(), "not on socket thread");
 
-  LOG3(("Http2Stream::Http2Stream %p", this));
+  nsHttpTransaction *trans = mTransaction->QueryHttpTransaction();
+  LOG3(("Http2Stream::Http2Stream %p trans=%p atrans=%p", this, trans, httpTransaction));
 
   mServerReceiveWindow = session->GetServerInitialStreamWindow();
   mClientReceiveWindow = session->PushAllowance();
 
   mTxInlineFrame = MakeUnique<uint8_t[]>(mTxInlineFrameSize);
 
   static_assert(nsISupportsPriority::PRIORITY_LOWEST <= kNormalPriority,
                 "Lowest Priority should be less than kNormalPriority");
@@ -99,17 +100,16 @@ Http2Stream::Http2Stream(nsAHttpTransact
   } else if (priority <= nsISupportsPriority::PRIORITY_HIGHEST) {
     httpPriority = kBestPriority;
   } else {
     httpPriority = kNormalPriority + priority;
   }
   MOZ_ASSERT(httpPriority >= 0);
   SetPriority(static_cast<uint32_t>(httpPriority));
 
-  nsHttpTransaction *trans = mTransaction->QueryHttpTransaction();
   if (trans) {
     mTransactionTabId = trans->TopLevelOuterContentWindowId();
   }
 }
 
 Http2Stream::~Http2Stream()
 {
   ClearPushSource();