Bug 1174899 - fixup log format strings for spdy/h2 r=bagder
authorPatrick McManus <mcmanus@ducksong.com>
Fri, 20 Nov 2015 15:33:04 -0500
changeset 273775 29bb91687133
parent 273774 50785278334f
child 273776 4ec0c590ef66
push id68376
push usermcmanus@ducksong.com
push date2015-11-23 15:38 +0000
treeherdermozilla-inbound@4ec0c590ef66 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbagder
bugs1174899
milestone45.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 1174899 - fixup log format strings for spdy/h2 r=bagder
netwerk/protocol/http/Http2Stream.cpp
netwerk/protocol/http/SpdyStream31.cpp
--- a/netwerk/protocol/http/Http2Stream.cpp
+++ b/netwerk/protocol/http/Http2Stream.cpp
@@ -1334,25 +1334,25 @@ Http2Stream::OnReadSegment(const char *b
 
     if (dataLength > mSession->ServerSessionWindow())
       dataLength = static_cast<uint32_t>(mSession->ServerSessionWindow());
 
     if (dataLength > mServerReceiveWindow)
       dataLength = static_cast<uint32_t>(mServerReceiveWindow);
 
     LOG3(("Http2Stream this=%p id 0x%X send calculation "
-          "avail=%d chunksize=%d stream window=%d session window=%d "
-          "max frame=%d USING=%d\n", this, mStreamID,
+          "avail=%d chunksize=%d stream window=%" PRId64 " session window=%" PRId64 " "
+          "max frame=%d USING=%u\n", this, mStreamID,
           count, mChunkSize, mServerReceiveWindow, mSession->ServerSessionWindow(),
           Http2Session::kMaxFrameData, dataLength));
 
     mSession->DecrementServerSessionWindow(dataLength);
     mServerReceiveWindow -= dataLength;
 
-    LOG3(("Http2Stream %p id %x request len remaining %u, "
+    LOG3(("Http2Stream %p id 0x%x request len remaining %" PRId64 ", "
           "count avail %u, chunk used %u",
           this, mStreamID, mRequestBodyLenRemaining, count, dataLength));
     if (!dataLength && mRequestBodyLenRemaining) {
       return NS_BASE_STREAM_WOULD_BLOCK;
     }
     if (dataLength > mRequestBodyLenRemaining) {
       return NS_ERROR_UNEXPECTED;
     }
--- a/netwerk/protocol/http/SpdyStream31.cpp
+++ b/netwerk/protocol/http/SpdyStream31.cpp
@@ -1526,24 +1526,24 @@ SpdyStream31::OnReadSegment(const char *
     dataLength = std::min(count, mChunkSize);
 
     if (dataLength > mRemoteWindow)
       dataLength = static_cast<uint32_t>(mRemoteWindow);
 
     if (dataLength > mSession->RemoteSessionWindow())
       dataLength = static_cast<uint32_t>(mSession->RemoteSessionWindow());
 
-    LOG3(("SpdyStream31 this=%p id 0x%X remote window is stream %ld and "
-          "session %ld. Chunk is %d\n",
-          this, mStreamID, mRemoteWindow, mSession->RemoteSessionWindow(),
-          dataLength));
+    LOG3(("SpdyStream31 this=%p id 0x%X remote window is stream %" PRId64 " and "
+          "session %" PRId64". Chunk is %u\n",
+          this, mStreamID, mRemoteWindow,
+          mSession->RemoteSessionWindow(), dataLength));
     mRemoteWindow -= dataLength;
     mSession->DecrementRemoteSessionWindow(dataLength);
 
-    LOG3(("SpdyStream31 %p id %x request len remaining %u, "
+    LOG3(("SpdyStream31 %p id 0x%x request len remaining %" PRId64 ", "
           "count avail %u, chunk used %u",
           this, mStreamID, mRequestBodyLenRemaining, count, dataLength));
     if (!dataLength && mRequestBodyLenRemaining) {
       return NS_BASE_STREAM_WOULD_BLOCK;
     }
     if (dataLength > mRequestBodyLenRemaining) {
       return NS_ERROR_UNEXPECTED;
     }