commit 45ab63e8f863a0c60a78e8e1f19a0e2f333fcd60 Author: Mike Perry mikeperry-git@torproject.org Date: Thu Nov 14 00:09:40 2013 -0800
fixup! Randomize HTTP request order and pipeline depth.
Fix some unused variable warnings. --- netwerk/protocol/http/nsHttpConnectionMgr.cpp | 4 ++-- netwerk/protocol/http/nsHttpPipeline.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp index 9b79c1d..a02fe07 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -1512,8 +1512,8 @@ nsHttpConnectionMgr::AddToBestPipeline(nsConnectionEntry *ent, if (NS_FAILED(rv)) return false;
- LOG((" scheduling trans %p on pipeline at position %d\n", - trans, trans->PipelinePosition())); + LOG((" scheduling trans %p on pipeline at position %d, type %s\n", + trans, trans->PipelinePosition(), type));
#ifdef WTF_DEBUG pipeline = activeTrans->QueryPipeline(); diff --git a/netwerk/protocol/http/nsHttpPipeline.cpp b/netwerk/protocol/http/nsHttpPipeline.cpp index d385720..367a663 100644 --- a/netwerk/protocol/http/nsHttpPipeline.cpp +++ b/netwerk/protocol/http/nsHttpPipeline.cpp @@ -872,7 +872,6 @@ nsHttpPipeline::FillSendBuf()
uint32_t n; uint64_t avail; - uint64_t totalAvailable = Available(); uint64_t totalSent = 0; uint64_t reqsSent = 0; uint64_t alreadyPending = 0; @@ -882,6 +881,7 @@ nsHttpPipeline::FillSendBuf() nsAHttpTransaction *trans; nsITransport *transport = Transport(); #ifdef WTF_TEST + uint64_t totalAvailable = Available(); nsRefPtr<nsHttpConnectionInfo> ci; GetConnectionInfo(getter_AddRefs(ci)); #endif @@ -946,7 +946,7 @@ nsHttpPipeline::FillSendBuf()
#ifdef WTF_TEST if (totalSent) - fprintf(stderr, "WTF-combine: Sent %d/%d bytes of %d combined pipelined requests for host %s\n", + fprintf(stderr, "WTF-combine: Sent %ld/%ld bytes of %ld combined pipelined requests for host %s\n", alreadyPending+totalSent, totalAvailable, reqsSent, ci->Host()); #endif