Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 867755 - Detect if DiscardTracker has shutdown r=seth

Browse Source
This commit is contained in:
Steve Workman 2013-09-28 11:28:44 -07:00
parent a15a4e8e26
commit 5d7442e954
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
image/src/DiscardTracker.cpp
View File

@ -24,6 +24,7 @@ static const char* sDiscardTimeoutPref = "image.mem.min_discard_timeout_ms";
/* static */ uint32_t DiscardTracker::sMaxDecodedImageKB = 42 * 1024;
/* static */ PRLock * DiscardTracker::sAllocationLock = nullptr;
/* static */ mozilla::Mutex* DiscardTracker::sNodeListMutex = nullptr;
/* static */ Atomic<uint32_t> DiscardTracker::sShutdown(0);
/*
* When we notice we're using too much memory for decoded images, we enqueue a
@ -82,6 +83,10 @@ DiscardTracker::Reset(Node *node)
void
DiscardTracker::Remove(Node *node)
{
if (sShutdown) {
// Already shutdown. List should be empty, so just return.
return;
}
MutexAutoLock lock(*sNodeListMutex);
if (node->isInList())
@ -97,6 +102,8 @@ DiscardTracker::Remove(Node *node)
void
DiscardTracker::Shutdown()
{
sShutdown = true;
if (sTimer) {
sTimer->Cancel();
sTimer = nullptr;

1
image/src/DiscardTracker.h
View File

@ -122,6 +122,7 @@ class DiscardTracker
// Lock for safegarding the 64-bit sCurrentDecodedImageBytes
static PRLock *sAllocationLock;
static mozilla::Mutex* sNodeListMutex;
static Atomic<uint32_t> sShutdown;
};
} // namespace image