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

Backed out changeset 4eb44a3149ed (bug 913847)

Browse Source
This commit is contained in:
Wes Kocher 2013-09-18 17:19:23 -07:00
parent 0b90687d1e
commit d67c764568
3 changed files with 37 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
xpcom/glue/MainThreadUtils.h
View File

@ -1,50 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et cindent: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MainThreadUtils_h_
#define MainThreadUtils_h_
#include "nscore.h"
#include "mozilla/threads/nsThreadIDs.h"
class nsIThread;
/**
* Get a reference to the main thread.
*
* @param result
* The resulting nsIThread object.
*/
extern NS_COM_GLUE NS_METHOD
NS_GetMainThread(nsIThread **result);
#if defined(MOZILLA_INTERNAL_API) && defined(XP_WIN)
bool NS_IsMainThread();
#elif defined(MOZILLA_INTERNAL_API) && defined(NS_TLS)
// This is defined in nsThreadManager.cpp and initialized to `Main` for the
// main thread by nsThreadManager::Init.
extern NS_TLS mozilla::threads::ID gTLSThreadID;
#ifdef MOZ_ASAN
// Temporary workaround, see bug 895845
MOZ_ASAN_BLACKLIST static
#else
inline
#endif
bool NS_IsMainThread()
{
return gTLSThreadID == mozilla::threads::Main;
}
#else
/**
* Test to see if the current thread is the main thread.
*
* @returns true if the current thread is the main thread, and false
* otherwise.
*/
extern NS_COM_GLUE bool NS_IsMainThread();
#endif
#endif // MainThreadUtils_h_

1
xpcom/glue/moz.build
View File

@ -14,7 +14,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
MODULE = 'xpcom'
EXPORTS += [
'MainThreadUtils.h',
'nsArrayEnumerator.h',
'nsArrayUtils.h',
'nsBaseHashtable.h',

38
xpcom/glue/nsThreadUtils.h
View File

@ -9,7 +9,7 @@
#include "prthread.h"
#include "prinrval.h"
#include "MainThreadUtils.h"
#include "nscore.h"
#include "nsIThreadManager.h"
#include "nsIThread.h"
#include "nsIRunnable.h"
@ -17,6 +17,7 @@
#include "nsStringGlue.h"
#include "nsCOMPtr.h"
#include "nsAutoPtr.h"
#include "mozilla/threads/nsThreadIDs.h"
#include "mozilla/Likely.h"
//-----------------------------------------------------------------------------
@ -90,6 +91,41 @@ NS_NewNamedThread(const char (&name)[LEN],
extern NS_COM_GLUE NS_METHOD
NS_GetCurrentThread(nsIThread **result);
/**
* Get a reference to the main thread.
*
* @param result
* The resulting nsIThread object.
*/
extern NS_COM_GLUE NS_METHOD
NS_GetMainThread(nsIThread **result);
#if defined(MOZILLA_INTERNAL_API) && defined(XP_WIN)
bool NS_IsMainThread();
#elif defined(MOZILLA_INTERNAL_API) && defined(NS_TLS)
// This is defined in nsThreadManager.cpp and initialized to `Main` for the
// main thread by nsThreadManager::Init.
extern NS_TLS mozilla::threads::ID gTLSThreadID;
#ifdef MOZ_ASAN
// Temporary workaround, see bug 895845
MOZ_ASAN_BLACKLIST static
#else
inline
#endif
bool NS_IsMainThread()
{
return gTLSThreadID == mozilla::threads::Main;
}
#else
/**
* Test to see if the current thread is the main thread.
*
* @returns true if the current thread is the main thread, and false
* otherwise.
*/
extern NS_COM_GLUE bool NS_IsMainThread();
#endif
/**
* Dispatch the given event to the current thread.
*