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 956899 - js: Use mozilla::ThreadLocal instead of NSPR for IonContext's thread-local variable. r=jwalden

Browse Source 
* * *
[mq]: moar

--HG--
extra : rebase_source : dfc785cf9eac717624116484f07065e870a22801
This commit is contained in:
Bert Belder 2014-01-22 12:42:56 -05:00
parent 93a3b26b9d
commit 5218835332
2 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
js/src/jit/Ion.cpp
View File

@ -7,6 +7,7 @@
#include "jit/Ion.h"
#include "mozilla/MemoryReporting.h"
#include "mozilla/ThreadLocal.h"
#include "jscompartment.h"
#include "jsworkers.h"
@ -51,48 +52,31 @@ using namespace js;
using namespace js::jit;
using mozilla::Maybe;
using mozilla::ThreadLocal;
// Assert that JitCode is gc::Cell aligned.
JS_STATIC_ASSERT(sizeof(JitCode) % gc::CellSize == 0);
#ifdef JS_THREADSAFE
static bool IonTLSInitialized = false;
static unsigned IonTLSIndex;
static ThreadLocal<IonContext*> TlsIonContext;
static inline IonContext *
static IonContext *
CurrentIonContext()
{
return (IonContext *)PR_GetThreadPrivate(IonTLSIndex);
if (!TlsIonContext.initialized())
return nullptr;
return TlsIonContext.get();
}
bool
void
jit::SetIonContext(IonContext *ctx)
{
return PR_SetThreadPrivate(IonTLSIndex, ctx) == PR_SUCCESS;
TlsIonContext.set(ctx);
}
#else
static IonContext *GlobalIonContext;
static inline IonContext *
CurrentIonContext()
{
return GlobalIonContext;
}
bool
jit::SetIonContext(IonContext *ctx)
{
GlobalIonContext = ctx;
return true;
}
#endif
IonContext *
jit::GetIonContext()
{
JS_ASSERT(CurrentIonContext());
MOZ_ASSERT(CurrentIonContext());
return CurrentIonContext();
}
@ -154,15 +138,8 @@ IonContext::~IonContext()
bool
jit::InitializeIon()
{
#ifdef JS_THREADSAFE
if (!IonTLSInitialized) {
PRStatus status = PR_NewThreadPrivateIndex(&IonTLSIndex, nullptr);
if (status != PR_SUCCESS)
return false;
IonTLSInitialized = true;
}
#endif
if (!TlsIonContext.initialized() && !TlsIonContext.init())
return false;
CheckLogging();
CheckPerf();
return true;

2
js/src/jit/Ion.h
View File

@ -80,7 +80,7 @@ bool InitializeIon();
IonContext *GetIonContext();
IonContext *MaybeGetIonContext();
bool SetIonContext(IonContext *ctx);
void SetIonContext(IonContext *ctx);
bool CanIonCompileScript(JSContext *cx, HandleScript script, bool osr);