wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 805067 - remove redundant mozilla:: in netwerk/protocol/http r=jduell

Browse Source
This commit is contained in:
Patrick McManus 2012-10-24 21:00:27 -04:00
parent 59031ba05a
commit 96c8b98c1b
5 changed files with 59 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -61,10 +61,9 @@ enum CacheDisposition {
kCacheMissed = 4
};
const mozilla::Telemetry::ID UNKNOWN_DEVICE
= static_cast<mozilla::Telemetry::ID>(0);
const Telemetry::ID UNKNOWN_DEVICE = static_cast<Telemetry::ID>(0);
void
AccumulateCacheHitTelemetry(mozilla::Telemetry::ID deviceHistogram,
AccumulateCacheHitTelemetry(Telemetry::ID deviceHistogram,
CacheDisposition hitOrMiss)
{
// If we had a cache hit, or we revalidated an entry, then we should know
@ -72,10 +71,9 @@ AccumulateCacheHitTelemetry(mozilla::Telemetry::ID deviceHistogram,
// (Bug 769497).
// MOZ_ASSERT(deviceHistogram != UNKNOWN_DEVICE || hitOrMiss == kCacheMissed);
mozilla::Telemetry::Accumulate(
mozilla::Telemetry::HTTP_CACHE_DISPOSITION_2, hitOrMiss);
Telemetry::Accumulate(Telemetry::HTTP_CACHE_DISPOSITION_2, hitOrMiss);
if (deviceHistogram != UNKNOWN_DEVICE) {
mozilla::Telemetry::Accumulate(deviceHistogram, hitOrMiss);
Telemetry::Accumulate(deviceHistogram, hitOrMiss);
}
}
@ -286,7 +284,7 @@ private:
/*out*/ bool mCachedContentIsPartial;
/*out*/ bool mCustomConditionalRequest;
/*out*/ bool mDidReval;
/*out*/ mozilla::Telemetry::ID mCacheEntryDeviceTelemetryID;
/*out*/ Telemetry::ID mCacheEntryDeviceTelemetryID;
};
NS_IMPL_ISUPPORTS_INHERITED1(HttpCacheQuery, nsRunnable, nsICacheListener)
@ -320,7 +318,7 @@ nsHttpChannel::nsHttpChannel()
{
LOG(("Creating nsHttpChannel [this=%p]\n", this));
mChannelCreationTime = PR_Now();
mChannelCreationTimestamp = mozilla::TimeStamp::Now();
mChannelCreationTimestamp = TimeStamp::Now();
}
nsHttpChannel::~nsHttpChannel()
@ -2830,13 +2828,13 @@ HttpCacheQuery::OnCacheEntryAvailable(nsICacheEntryDescriptor *entry,
if (cacheDeviceID) {
if (!strcmp(cacheDeviceID, kDiskDeviceID)) {
mCacheEntryDeviceTelemetryID
= mozilla::Telemetry::HTTP_DISK_CACHE_DISPOSITION_2;
= Telemetry::HTTP_DISK_CACHE_DISPOSITION_2;
} else if (!strcmp(cacheDeviceID, kMemoryDeviceID)) {
mCacheEntryDeviceTelemetryID
= mozilla::Telemetry::HTTP_MEMORY_CACHE_DISPOSITION_2;
= Telemetry::HTTP_MEMORY_CACHE_DISPOSITION_2;
} else if (!strcmp(cacheDeviceID, kOfflineDeviceID)) {
mCacheEntryDeviceTelemetryID
= mozilla::Telemetry::HTTP_OFFLINE_CACHE_DISPOSITION_2;
= Telemetry::HTTP_OFFLINE_CACHE_DISPOSITION_2;
} else {
MOZ_NOT_REACHED("unknown cache device ID");
}
@ -3456,7 +3454,7 @@ nsHttpChannel::ReadFromCache(bool alreadyMarkedValid)
if (NS_FAILED(rv)) return rv;
if (mTimingEnabled)
mCacheReadStart = mozilla::TimeStamp::Now();
mCacheReadStart = TimeStamp::Now();
uint32_t suspendCount = mSuspendCount;
while (suspendCount--)
@ -4309,7 +4307,7 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context)
// don't want it after OnModifyRequest() weighs in. But waiting for
// that to complete would mean we don't include proxy resolution in the
// timing.
mAsyncOpenTime = mozilla::TimeStamp::Now();
mAsyncOpenTime = TimeStamp::Now();
// the only time we would already know the proxy information at this
// point would be if we were proxying a non-http protocol like ftp
@ -4335,7 +4333,7 @@ nsHttpChannel::BeginConnect()
// If mTimingEnabled flag is not set after OnModifyRequest() then
// clear the already recorded AsyncOpen value for consistency.
if (!mTimingEnabled)
mAsyncOpenTime = mozilla::TimeStamp();
mAsyncOpenTime = TimeStamp();
// Construct connection info object
nsAutoCString host;
@ -4541,19 +4539,19 @@ nsHttpChannel::GetTimingEnabled(bool* _retval) {
}
NS_IMETHODIMP
nsHttpChannel::GetChannelCreation(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetChannelCreation(TimeStamp* _retval) {
*_retval = mChannelCreationTimestamp;
return NS_OK;
}
NS_IMETHODIMP
nsHttpChannel::GetAsyncOpen(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetAsyncOpen(TimeStamp* _retval) {
*_retval = mAsyncOpenTime;
return NS_OK;
}
NS_IMETHODIMP
nsHttpChannel::GetDomainLookupStart(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetDomainLookupStart(TimeStamp* _retval) {
if (mDNSPrefetch && mDNSPrefetch->TimingsValid())
*_retval = mDNSPrefetch->StartTimestamp();
else if (mTransaction)
@ -4564,7 +4562,7 @@ nsHttpChannel::GetDomainLookupStart(mozilla::TimeStamp* _retval) {
}
NS_IMETHODIMP
nsHttpChannel::GetDomainLookupEnd(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetDomainLookupEnd(TimeStamp* _retval) {
if (mDNSPrefetch && mDNSPrefetch->TimingsValid())
*_retval = mDNSPrefetch->EndTimestamp();
else if (mTransaction)
@ -4575,7 +4573,7 @@ nsHttpChannel::GetDomainLookupEnd(mozilla::TimeStamp* _retval) {
}
NS_IMETHODIMP
nsHttpChannel::GetConnectStart(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetConnectStart(TimeStamp* _retval) {
if (mTransaction)
*_retval = mTransaction->Timings().connectStart;
else
@ -4584,7 +4582,7 @@ nsHttpChannel::GetConnectStart(mozilla::TimeStamp* _retval) {
}
NS_IMETHODIMP
nsHttpChannel::GetConnectEnd(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetConnectEnd(TimeStamp* _retval) {
if (mTransaction)
*_retval = mTransaction->Timings().connectEnd;
else
@ -4593,7 +4591,7 @@ nsHttpChannel::GetConnectEnd(mozilla::TimeStamp* _retval) {
}
NS_IMETHODIMP
nsHttpChannel::GetRequestStart(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetRequestStart(TimeStamp* _retval) {
if (mTransaction)
*_retval = mTransaction->Timings().requestStart;
else
@ -4602,7 +4600,7 @@ nsHttpChannel::GetRequestStart(mozilla::TimeStamp* _retval) {
}
NS_IMETHODIMP
nsHttpChannel::GetResponseStart(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetResponseStart(TimeStamp* _retval) {
if (mTransaction)
*_retval = mTransaction->Timings().responseStart;
else
@ -4611,7 +4609,7 @@ nsHttpChannel::GetResponseStart(mozilla::TimeStamp* _retval) {
}
NS_IMETHODIMP
nsHttpChannel::GetResponseEnd(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetResponseEnd(TimeStamp* _retval) {
if (mTransaction)
*_retval = mTransaction->Timings().responseEnd;
else
@ -4620,13 +4618,13 @@ nsHttpChannel::GetResponseEnd(mozilla::TimeStamp* _retval) {
}
NS_IMETHODIMP
nsHttpChannel::GetCacheReadStart(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetCacheReadStart(TimeStamp* _retval) {
*_retval = mCacheReadStart;
return NS_OK;
}
NS_IMETHODIMP
nsHttpChannel::GetCacheReadEnd(mozilla::TimeStamp* _retval) {
nsHttpChannel::GetCacheReadEnd(TimeStamp* _retval) {
*_retval = mCacheReadEnd;
return NS_OK;
}
@ -4634,7 +4632,7 @@ nsHttpChannel::GetCacheReadEnd(mozilla::TimeStamp* _retval) {
#define IMPL_TIMING_ATTR(name) \
NS_IMETHODIMP \
nsHttpChannel::Get##name##Time(PRTime* _retval) { \
mozilla::TimeStamp stamp; \
TimeStamp stamp; \
Get##name(&stamp); \
if (stamp.IsNull()) { \
*_retval = 0; \
@ -4867,7 +4865,7 @@ nsHttpChannel::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult st
this, request, status));
if (mTimingEnabled && request == mCachePump) {
mCacheReadEnd = mozilla::TimeStamp::Now();
mCacheReadEnd = TimeStamp::Now();
}
// allow content to be cached if it was loaded successfully (bug #482935)

17
netwerk/protocol/http/nsHttpConnection.cpp
View File

@ -31,6 +31,7 @@ extern PRThread *gSocketThread;
static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
using namespace mozilla;
using namespace mozilla::net;
//-----------------------------------------------------------------------------
@ -89,19 +90,18 @@ nsHttpConnection::~nsHttpConnection()
if (!mEverUsedSpdy) {
LOG(("nsHttpConnection %p performed %d HTTP/1.x transactions\n",
this, mHttp1xTransactionCount));
mozilla::Telemetry::Accumulate(
mozilla::Telemetry::HTTP_REQUEST_PER_CONN, mHttp1xTransactionCount);
Telemetry::Accumulate(Telemetry::HTTP_REQUEST_PER_CONN,
mHttp1xTransactionCount);
}
if (mTotalBytesRead) {
uint32_t totalKBRead = static_cast<uint32_t>(mTotalBytesRead >> 10);
LOG(("nsHttpConnection %p read %dkb on connection spdy=%d\n",
this, totalKBRead, mEverUsedSpdy));
mozilla::Telemetry::Accumulate(
mEverUsedSpdy ?
mozilla::Telemetry::SPDY_KBREAD_PER_CONN :
mozilla::Telemetry::HTTP_KBREAD_PER_CONN,
totalKBRead);
Telemetry::Accumulate(mEverUsedSpdy ?
Telemetry::SPDY_KBREAD_PER_CONN :
Telemetry::HTTP_KBREAD_PER_CONN,
totalKBRead);
}
}
@ -294,8 +294,7 @@ nsHttpConnection::EnsureNPNComplete()
if (NS_SUCCEEDED(rv))
StartSpdy(spdyVersion);
mozilla::Telemetry::Accumulate(mozilla::Telemetry::SPDY_NPN_CONNECT,
mUsingSpdyVersion);
Telemetry::Accumulate(Telemetry::SPDY_NPN_CONNECT, mUsingSpdyVersion);
npnComplete:
LOG(("nsHttpConnection::EnsureNPNComplete setting complete to true"));

39
netwerk/protocol/http/nsHttpConnectionMgr.cpp
View File

@ -687,8 +687,7 @@ nsHttpConnectionMgr::GetSpdyPreferredEnt(nsConnectionEntry *aOriginalEntry)
"with %s connections. rv=%x isJoined=%d",
preferred->mConnInfo->Host(), aOriginalEntry->mConnInfo->Host(),
rv, isJoined));
mozilla::Telemetry::Accumulate(mozilla::Telemetry::SPDY_NPN_JOIN,
false);
Telemetry::Accumulate(Telemetry::SPDY_NPN_JOIN, false);
return nullptr;
}
@ -698,7 +697,7 @@ nsHttpConnectionMgr::GetSpdyPreferredEnt(nsConnectionEntry *aOriginalEntry)
"so %s will be coalesced with %s",
preferred->mConnInfo->Host(), aOriginalEntry->mConnInfo->Host(),
aOriginalEntry->mConnInfo->Host(), preferred->mConnInfo->Host()));
mozilla::Telemetry::Accumulate(mozilla::Telemetry::SPDY_NPN_JOIN, true);
Telemetry::Accumulate(Telemetry::SPDY_NPN_JOIN, true);
return preferred;
}
@ -1348,11 +1347,11 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent,
if (trans->UsesPipelining())
AccumulateTimeDelta(
Telemetry::TRANSACTION_WAIT_TIME_HTTP_PIPELINES,
trans->GetPendingTime(), mozilla::TimeStamp::Now());
trans->GetPendingTime(), TimeStamp::Now());
else
AccumulateTimeDelta(
Telemetry::TRANSACTION_WAIT_TIME_HTTP,
trans->GetPendingTime(), mozilla::TimeStamp::Now());
trans->GetPendingTime(), TimeStamp::Now());
trans->SetPendingTime(false);
}
return true;
@ -1556,7 +1555,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent,
NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "SPDY Cannot Fail Dispatch");
if (NS_SUCCEEDED(rv) && !trans->GetPendingTime().IsNull()) {
AccumulateTimeDelta(Telemetry::TRANSACTION_WAIT_TIME_SPDY,
trans->GetPendingTime(), mozilla::TimeStamp::Now());
trans->GetPendingTime(), TimeStamp::Now());
trans->SetPendingTime(false);
}
return rv;
@ -1574,10 +1573,10 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent,
if (NS_SUCCEEDED(rv) && !trans->GetPendingTime().IsNull()) {
if (trans->UsesPipelining())
AccumulateTimeDelta(Telemetry::TRANSACTION_WAIT_TIME_HTTP_PIPELINES,
trans->GetPendingTime(), mozilla::TimeStamp::Now());
trans->GetPendingTime(), TimeStamp::Now());
else
AccumulateTimeDelta(Telemetry::TRANSACTION_WAIT_TIME_HTTP,
trans->GetPendingTime(), mozilla::TimeStamp::Now());
trans->GetPendingTime(), TimeStamp::Now());
trans->SetPendingTime(false);
}
return rv;
@ -2492,7 +2491,7 @@ nsHttpConnectionMgr::nsHalfOpenSocket::SetupPrimaryStreams()
nsresult rv;
mPrimarySynStarted = mozilla::TimeStamp::Now();
mPrimarySynStarted = TimeStamp::Now();
rv = SetupStreams(getter_AddRefs(mSocketTransport),
getter_AddRefs(mStreamIn),
getter_AddRefs(mStreamOut),
@ -2512,7 +2511,7 @@ nsHttpConnectionMgr::nsHalfOpenSocket::SetupPrimaryStreams()
nsresult
nsHttpConnectionMgr::nsHalfOpenSocket::SetupBackupStreams()
{
mBackupSynStarted = mozilla::TimeStamp::Now();
mBackupSynStarted = TimeStamp::Now();
nsresult rv = SetupStreams(getter_AddRefs(mBackupTransport),
getter_AddRefs(mBackupStreamIn),
getter_AddRefs(mBackupStreamOut),
@ -2598,7 +2597,7 @@ nsHttpConnectionMgr::nsHalfOpenSocket::Abandon()
}
double
nsHttpConnectionMgr::nsHalfOpenSocket::Duration(mozilla::TimeStamp epoch)
nsHttpConnectionMgr::nsHalfOpenSocket::Duration(TimeStamp epoch)
{
if (mPrimarySynStarted.IsNull())
return 0;
@ -2647,8 +2646,7 @@ nsHalfOpenSocket::OnOutputStreamReady(nsIAsyncOutputStream *out)
mTransaction->GetSecurityCallbacks(getter_AddRefs(callbacks),
getter_AddRefs(callbackTarget));
if (out == mStreamOut) {
mozilla::TimeDuration rtt =
mozilla::TimeStamp::Now() - mPrimarySynStarted;
TimeDuration rtt = TimeStamp::Now() - mPrimarySynStarted;
rv = conn->Init(mEnt->mConnInfo,
gHttpHandler->ConnMgr()->mMaxRequestDelay,
mSocketTransport, mStreamIn, mStreamOut,
@ -2661,9 +2659,7 @@ nsHalfOpenSocket::OnOutputStreamReady(nsIAsyncOutputStream *out)
mSocketTransport = nullptr;
}
else {
mozilla::TimeDuration rtt =
mozilla::TimeStamp::Now() - mBackupSynStarted;
TimeDuration rtt = TimeStamp::Now() - mBackupSynStarted;
rv = conn->Init(mEnt->mConnInfo,
gHttpHandler->ConnMgr()->mMaxRequestDelay,
mBackupTransport, mBackupStreamIn, mBackupStreamOut,
@ -2957,7 +2953,7 @@ nsConnectionEntry::OnPipelineFeedbackInfo(
}
if (mLastCreditTime.IsNull())
mLastCreditTime = mozilla::TimeStamp::Now();
mLastCreditTime = TimeStamp::Now();
// Red* events impact the host globally via mPipeliningPenalty, while
// Bad* events impact the per class penalty.
@ -3068,8 +3064,8 @@ nsHttpConnectionMgr::nsConnectionEntry::CreditPenalty()
// Decrease penalty values by 1 for every 16 seconds
// (i.e 3.7 per minute, or 1000 every 4h20m)
mozilla::TimeStamp now = mozilla::TimeStamp::Now();
mozilla::TimeDuration elapsedTime = now - mLastCreditTime;
TimeStamp now = TimeStamp::Now();
TimeDuration elapsedTime = now - mLastCreditTime;
uint32_t creditsEarned =
static_cast<uint32_t>(elapsedTime.ToSeconds()) >> 4;
@ -3087,8 +3083,7 @@ nsHttpConnectionMgr::nsConnectionEntry::CreditPenalty()
}
// update last credit mark to reflect elapsed time
mLastCreditTime +=
mozilla::TimeDuration::FromSeconds(creditsEarned << 4);
mLastCreditTime += TimeDuration::FromSeconds(creditsEarned << 4);
}
else {
failed = true; /* just assume this */
@ -3097,7 +3092,7 @@ nsHttpConnectionMgr::nsConnectionEntry::CreditPenalty()
// If we are no longer red then clear the credit counter - you only
// get credits for time spent in the red state
if (!failed)
mLastCreditTime = mozilla::TimeStamp(); /* reset to null timestamp */
mLastCreditTime = TimeStamp(); /* reset to null timestamp */
if (mPipelineState == PS_RED && !mPipeliningPenalty)
{

2
netwerk/protocol/http/nsHttpHandler.cpp
View File

@ -299,7 +299,7 @@ nsHttpHandler::Init()
static_cast<nsISupports*>(static_cast<void*>(this)),
NS_HTTP_STARTUP_TOPIC);
mObserverService = mozilla::services::GetObserverService();
mObserverService = services::GetObserverService();
if (mObserverService) {
mObserverService->AddObserver(this, "profile-change-net-teardown", true);
mObserverService->AddObserver(this, "profile-change-net-restore", true);

16
netwerk/protocol/http/nsHttpTransaction.cpp
View File

@ -405,13 +405,13 @@ nsHttpTransaction::OnTransportStatus(nsITransport* transport,
if (TimingEnabled()) {
if (status == NS_NET_STATUS_RESOLVING_HOST) {
mTimings.domainLookupStart = mozilla::TimeStamp::Now();
mTimings.domainLookupStart = TimeStamp::Now();
} else if (status == NS_NET_STATUS_RESOLVED_HOST) {
mTimings.domainLookupEnd = mozilla::TimeStamp::Now();
mTimings.domainLookupEnd = TimeStamp::Now();
} else if (status == NS_NET_STATUS_CONNECTING_TO) {
mTimings.connectStart = mozilla::TimeStamp::Now();
mTimings.connectStart = TimeStamp::Now();
} else if (status == NS_NET_STATUS_CONNECTED_TO) {
mTimings.connectEnd = mozilla::TimeStamp::Now();
mTimings.connectEnd = TimeStamp::Now();
}
}
@ -514,7 +514,7 @@ nsHttpTransaction::ReadRequestSegment(nsIInputStream *stream,
if (trans->TimingEnabled() && trans->mTimings.requestStart.IsNull()) {
// First data we're sending -> this is requestStart
trans->mTimings.requestStart = mozilla::TimeStamp::Now();
trans->mTimings.requestStart = TimeStamp::Now();
}
trans->mSentData = true;
return NS_OK;
@ -576,7 +576,7 @@ nsHttpTransaction::WritePipeSegment(nsIOutputStream *stream,
return NS_BASE_STREAM_CLOSED; // stop iterating
if (trans->TimingEnabled() && trans->mTimings.responseStart.IsNull()) {
trans->mTimings.responseStart = mozilla::TimeStamp::Now();
trans->mTimings.responseStart = TimeStamp::Now();
}
nsresult rv;
@ -764,7 +764,7 @@ nsHttpTransaction::Close(nsresult reason)
// EOF or an error still require an end time be recorded.
if (TimingEnabled() &&
mTimings.responseEnd.IsNull() && !mTimings.responseStart.IsNull())
mTimings.responseEnd = mozilla::TimeStamp::Now();
mTimings.responseEnd = TimeStamp::Now();
if (relConn && mConnection)
NS_RELEASE(mConnection);
@ -1371,7 +1371,7 @@ nsHttpTransaction::HandleContent(char *buf,
mResponseIsComplete = true;
if (TimingEnabled())
mTimings.responseEnd = mozilla::TimeStamp::Now();
mTimings.responseEnd = TimeStamp::Now();
// report the entire response has arrived
if (mActivityDistributor)