Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 10:40:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1191144 - Remove CACHE_SERVICE_LOCK_WAIT_MAINTHREAD_NSCACHESERVICE_LEAVEPRIVATEBROWSING; r=michal

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-08-04 20:19:09 -04:00
parent 94d981e0c3
commit b71438b17e
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netwerk/cache/nsCacheService.cpp vendored
View File

@ -2639,6 +2639,13 @@ nsCacheService::LockReleased()
mLockAcquiredTimeStamp = TimeStamp();
}
void
nsCacheService::Lock()
{
gService->mLock.Lock();
gService->LockAcquired();
}
void
nsCacheService::Lock(mozilla::Telemetry::ID mainThreadLockerID)
{
@ -2655,8 +2662,7 @@ nsCacheService::Lock(mozilla::Telemetry::ID mainThreadLockerID)
TimeStamp start(TimeStamp::Now());
gService->mLock.Lock();
gService->LockAcquired();
nsCacheService::Lock();
TimeStamp stop(TimeStamp::Now());
@ -3171,7 +3177,7 @@ IsEntryPrivate(nsCacheEntry* entry)
void
nsCacheService::LeavePrivateBrowsing()
{
nsCacheServiceAutoLock lock(LOCK_TELEM(NSCACHESERVICE_LEAVEPRIVATEBROWSING));
nsCacheServiceAutoLock lock;
gService->DoomActiveEntries(IsEntryPrivate);

4
netwerk/cache/nsCacheService.h vendored
View File

@ -254,6 +254,7 @@ private:
* Internal Methods
*/
static void Lock();
static void Lock(::mozilla::Telemetry::ID mainThreadLockerID);
static void Unlock();
void LockAcquired();
@ -380,6 +381,9 @@ private:
// execution scope.
class nsCacheServiceAutoLock {
public:
nsCacheServiceAutoLock() {
nsCacheService::Lock();
}
explicit nsCacheServiceAutoLock(mozilla::Telemetry::ID mainThreadLockerID) {
nsCacheService::Lock(mainThreadLockerID);
}

7
toolkit/components/telemetry/Histograms.json
View File

@ -1890,13 +1890,6 @@
"n_buckets": 50,
"description": "Time spent waiting on the cache service lock (ms) on the main thread in NSCACHESERVICE_ONPROFILECHANGED"
},
"CACHE_SERVICE_LOCK_WAIT_MAINTHREAD_NSCACHESERVICE_LEAVEPRIVATEBROWSING": {
"expires_in_version": "never",
"kind": "exponential",
"high": "10 * 1000",
"n_buckets": 50,
"description": "Time spent waiting on the cache service lock (ms) on the main thread in NSCACHESERVICE_LEAVEPRIVATEBROWSING"
},
"CACHE_SERVICE_LOCK_WAIT_MAINTHREAD_NSCACHESERVICE_ISSTORAGEENABLEDFORPOLICY": {
"expires_in_version": "never",
"kind": "exponential",