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 1173802: Replace |assertIsNfcServiceThread| with thread-safe checks, r=allstars.chh

Browse Source 
The main thread writes the NFC thread's field in the NFC service
instance, but the function |assertIsNfcServiceThread| uses this
value on the NFC worker thread itself. Also clearing this value
happens on main, while the NFC thread still executes code. Calls
to |assertIsNfcServiceThread| can therefore fail if they occur
during an NFC shutdown.

This patch replaces the unsafe and racy |assertIsNfcServiceThread|
with the much simpler |NfcConsumer::IsNfcServiceThread|. The new
method tests the current thread against a thread pointer that has
been stored in |NfcConsumer|.
This commit is contained in:
Thomas Zimmermann 2015-07-31 10:07:25 +02:00
parent 76380c5de2
commit ce37f51133
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dom/nfc/gonk/NfcService.cpp
View File

@ -38,13 +38,6 @@ static NfcService* gNfcService;
NS_IMPL_ISUPPORTS(NfcService, nsINfcService)
void
assertIsNfcServiceThread()
{
nsCOMPtr<nsIThread> thread = do_GetCurrentThread();
MOZ_ASSERT(thread == gNfcService->GetThread());
}
//
// NfcConsumer
//
@ -85,7 +78,10 @@ private:
STREAM_SOCKET
};
bool IsNfcServiceThread() const;
nsRefPtr<NfcService> mNfcService;
nsCOMPtr<nsIThread> mThread;
nsRefPtr<mozilla::ipc::ListenSocket> mListenSocket;
nsRefPtr<mozilla::ipc::StreamSocket> mStreamSocket;
nsAutoPtr<NfcMessageHandler> mHandler;
@ -103,8 +99,11 @@ NfcConsumer::Start()
{
static const char BASE_SOCKET_NAME[] = "nfcd";
assertIsNfcServiceThread();
MOZ_ASSERT(!mListenSocket);
MOZ_ASSERT(!mThread); // already started
// Store a pointer of the consumer's NFC thread for
// use with |IsNfcServiceThread|.
mThread = do_GetCurrentThread();
// If we could not cleanup properly before and an old
// instance of the daemon is still running, we kill it
@ -122,6 +121,8 @@ NfcConsumer::Start()
mStreamSocket);
if (NS_FAILED(rv)) {
mStreamSocket = nullptr;
mHandler = nullptr;
mThread = nullptr;
return rv;
}
@ -131,7 +132,7 @@ NfcConsumer::Start()
void
NfcConsumer::Shutdown()
{
assertIsNfcServiceThread();
MOZ_ASSERT(IsNfcServiceThread());
mListenSocket->Close();
mListenSocket = nullptr;
@ -139,12 +140,14 @@ NfcConsumer::Shutdown()
mStreamSocket = nullptr;
mHandler = nullptr;
mThread = nullptr;
}
nsresult
NfcConsumer::Send(const CommandOptions& aOptions)
{
assertIsNfcServiceThread();
MOZ_ASSERT(IsNfcServiceThread());
if (NS_WARN_IF(!mStreamSocket) ||
NS_WARN_IF(mStreamSocket->GetConnectionStatus() != SOCKET_CONNECTED)) {
@ -173,7 +176,7 @@ public:
: mNfcService(aNfcService)
, mEvent(aEvent)
{
assertIsNfcServiceThread();
MOZ_ASSERT(mNfcService);
}
NS_IMETHOD Run()
@ -324,7 +327,7 @@ private:
nsresult
NfcConsumer::Receive(UnixSocketBuffer* aBuffer)
{
assertIsNfcServiceThread();
MOZ_ASSERT(IsNfcServiceThread());
MOZ_ASSERT(mHandler);
MOZ_ASSERT(aBuffer);
@ -350,13 +353,19 @@ NfcConsumer::Receive(UnixSocketBuffer* aBuffer)
return NS_OK;
}
bool
NfcConsumer::IsNfcServiceThread() const
{
return nsCOMPtr<nsIThread>(do_GetCurrentThread()) == mThread;
}
// |StreamSocketConsumer|, |ListenSocketConsumer|
void
NfcConsumer::ReceiveSocketData(
int aIndex, nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aBuffer)
{
assertIsNfcServiceThread();
MOZ_ASSERT(IsNfcServiceThread());
MOZ_ASSERT(aIndex == STREAM_SOCKET);
Receive(aBuffer);
@ -365,7 +374,7 @@ NfcConsumer::ReceiveSocketData(
void
NfcConsumer::OnConnectSuccess(int aIndex)
{
assertIsNfcServiceThread();
MOZ_ASSERT(IsNfcServiceThread());
switch (aIndex) {
case LISTEN_SOCKET: {
@ -407,7 +416,7 @@ private:
void
NfcConsumer::OnConnectError(int aIndex)
{
assertIsNfcServiceThread();
MOZ_ASSERT(IsNfcServiceThread());
NS_DispatchToMainThread(new ShutdownServiceRunnable(mNfcService));
}
@ -415,7 +424,7 @@ NfcConsumer::OnConnectError(int aIndex)
void
NfcConsumer::OnDisconnect(int aIndex)
{
assertIsNfcServiceThread();
MOZ_ASSERT(IsNfcServiceThread());
}
//

4
dom/nfc/gonk/NfcService.h
View File

@ -29,10 +29,6 @@ public:
void DispatchNfcEvent(const mozilla::dom::NfcEventOptions& aOptions);
nsCOMPtr<nsIThread> GetThread() {
return mThread;
}
private:
class CleanupRunnable;
class SendRunnable;