Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-27 19:09:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1050494: Clear sBluetoothThread in BluetoothDBusService on shutdown to fix memory leak. r=shuang

Browse Source
This commit is contained in:
Jocelyn Liu 2014-08-08 16:22:32 +08:00
parent 92a362d3ac
commit de0443c58f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/bluetooth/bluez/BluetoothDBusService.cpp
View File

@ -37,6 +37,7 @@
#include "nsDataHashtable.h" #include "nsDataHashtable.h"
#include "mozilla/ArrayUtils.h" #include "mozilla/ArrayUtils.h"
#include "mozilla/Atomics.h" #include "mozilla/Atomics.h"
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/dom/bluetooth/BluetoothTypes.h" #include "mozilla/dom/bluetooth/BluetoothTypes.h"
#include "mozilla/Hal.h" #include "mozilla/Hal.h"
#include "mozilla/ipc/UnixSocket.h" #include "mozilla/ipc/UnixSocket.h"
@ -373,6 +374,7 @@ DispatchToBtThread(nsIRunnable* aRunnable)
sBluetoothThread = new LazyIdleThread(BT_LAZY_THREAD_TIMEOUT_MS, sBluetoothThread = new LazyIdleThread(BT_LAZY_THREAD_TIMEOUT_MS,
NS_LITERAL_CSTRING("BluetoothDBusService"), NS_LITERAL_CSTRING("BluetoothDBusService"),
LazyIdleThread::ManualShutdown); LazyIdleThread::ManualShutdown);
ClearOnShutdown(&sBluetoothThread);
} }
return sBluetoothThread->Dispatch(aRunnable, NS_DISPATCH_NORMAL); return sBluetoothThread->Dispatch(aRunnable, NS_DISPATCH_NORMAL);
} }

2
dom/bluetooth2/bluez/BluetoothDBusService.cpp
View File

@ -37,6 +37,7 @@
#include "nsDataHashtable.h" #include "nsDataHashtable.h"
#include "mozilla/ArrayUtils.h" #include "mozilla/ArrayUtils.h"
#include "mozilla/Atomics.h" #include "mozilla/Atomics.h"
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/dom/bluetooth/BluetoothTypes.h" #include "mozilla/dom/bluetooth/BluetoothTypes.h"
#include "mozilla/Hal.h" #include "mozilla/Hal.h"
#include "mozilla/ipc/UnixSocket.h" #include "mozilla/ipc/UnixSocket.h"
@ -370,6 +371,7 @@ DispatchToBtThread(nsIRunnable* aRunnable)
sBluetoothThread = new LazyIdleThread(BT_LAZY_THREAD_TIMEOUT_MS, sBluetoothThread = new LazyIdleThread(BT_LAZY_THREAD_TIMEOUT_MS,
NS_LITERAL_CSTRING("BluetoothDBusService"), NS_LITERAL_CSTRING("BluetoothDBusService"),
LazyIdleThread::ManualShutdown); LazyIdleThread::ManualShutdown);
ClearOnShutdown(&sBluetoothThread);
} }
return sBluetoothThread->Dispatch(aRunnable, NS_DISPATCH_NORMAL); return sBluetoothThread->Dispatch(aRunnable, NS_DISPATCH_NORMAL);
} }