mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 13:34:03 +00:00
69d1f32ff7
- Bug 1268085 - Remove unused post barrier callbacks r=terrence (0ab13411c9) - Bug 1267699 - Move some public types to the right namespace; r=sfink (3d5008e610) - Bug 1267550 (part 1) - Rename MOZ_MUST_USE as MOZ_MUST_USE_TYPE. r=ehsan. (6f47375796) - Bug 1259021 - Rename Vector::extractRawBuffer to extractOrCopyRawBuffer r=Waldo (97ca94495b) - Bug 1259021 - Add Vector::extractRawBuffer method that doesn't copy the buffer r=Waldo (e58deec48f) - Bug 1265892 - Change Vector to use Impl::new_ consistently. r=Waldo (7a52d21b29) - Bug 1267912 - Rename nsNetUtil.inl as nsNetUtilInlines.h. r=valentin. (548a41b293) - Bug 1265690 part 1 - Mark StringBuffer methods WARN_UNUSED_RESULT, fix OOM issues. r=jonco (0d7e6837e3) - Bug 1265690 part 2 - Fix some more OOM issues in TypedObject code. r=jonco (b60902453e) - Bug 1263490 - Part 2: Add GetFirstDollarIndex intrinsic and use it inRegExpReplace. r=till (4ba19db8c4) - Bug 1263490 - Part 3: Inline GetFirstDollarIndex intrinsic. r=h4writer (e7d9b5d1cc) - Bug 1263490 - Part 4: Fold GetFirstDollarIndex into a integer constant. r=h4writer (3479c7d1af) - Bug 1267269 - Make MIRType an enum class. r=bbouvier (d580ef372a) - Bug 1259295 - BaldrMonkey: Postorder (r=luke) (6ef7a77663) - Bug 1254142: BaldrMonkey: make br_table yield (r=luke) (80e7635e58) - Bug 1263202 - BaldrMonkey: switch to arities on branches, calls and return (r=bbouvier) (f5a0358634) - Bug 1236358 - Improper reading of string16 in Pickle::ReadString16. r=jld (8370ba6a0b) - Bug 1263205 - BaldrMonkey: Update section headers for proposed spec changes (r=luke) (0def2e6bc2) - Bug 1263205 - BaldrMonkey: Update for proposed new section names (r=luke) (e57f0e3367) - Bug 1263205 - BaldrMonkey: Add 'form' field to types section (r=bbouvier) (794edc890f) - Bug 1259021 - Use in-place storage in AutoStableStringChars to avoid allocation for short strings r=jandem r=Waldo (ffb53cbcf4) - Bug 1267550 (part 2) - Rename MOZ_WARN_UNUSED_RESULT as MOZ_MUST_USE. r=froydnj. (47bc674b86) - Bug 1268518: Baldr: implement int32/int64 rotations; r=luke (0d5eedccce) - Bug 1255008: IonMonkey - Add a by default disabled flow sensitive alias analysis pass, r=jandem (521c585d75) - Bug 1266781: Baldr: implement proper checked truncations to integer types; r=sunfish (46078fb3d3) - Bug 1266781: Rename MTruncateToInt64 into MWasmTruncateInt64; r=sunfish (c7d7d1ac11) - Bug 1266781: Add new traps; r=luke (b7ed3d44e6) - Bug 1268024: Pass the atomic attribute down to EmitHeapAccess; r=luke (6195f7d7a3) - Bug 1268024: A few cleanups related to loads/stores; r=luke (88141e3a01) - Bug 1258312 - Make Pickle::Resize infallible r=jld (241ee9b60d) - Bug 1162772, part 1 - Allow CompartmentCreationOptions to store Secure Context state. r=jorendorff (ff666384cf) - Bug 1162772, part 2 - Expose whether SEC_FORCE_INHERIT_PRINCIPAL was dropped from an nsILoadInfo. r=bz (ada46f86bf) - Bug 1162772, part 3 - Add a getChannelResultPrincipalIfNotSandboxed method to nsIScriptSecurityManager. r=bz (5b1d9f6807) - Bug 1162772, part 4 - Implement nsGlobalWindow::IsSecureContext. r=bz (f392f439c9) - Bug 1162772, part 5 - Expose Window.isSecureContext to content. r=bz (e7296e2cf1) - Bug 1267509 - Make nsContentSecurityManager::IsURIPotentiallyTrustworthy act on an nsIPrincipal. r=bz (83de80350a) - Bug 1219098 - Use UniquePtr in UncompressedSourceCache, for it is good (r=jandem) (b68769c729) - Bug 1244279 - Part 1: Take a bit in ObjectElements::Flags to indicate whether the object is in the whole cell store buffer. r=terrence (968cf373f9) - Bug 1244279 - Part 0: Add a GC ubench for large arrays with both elements and properties. r=terrence (ec76b48323) - Bug 1255925 - Give a name to getters/setters and integer-named methods. r=efaust (f978cc6916) - Bug 888969 - Make the getPrototypeOf/setPrototypeOf traps scriptable. r=efaust, r=bholley (eb2325a9ea) - Bug 1267557 part 0 - Move JS poison constants to jsutil.h. r=jonco (65afc690d2) - Bug 1267557 part 1 - Also poison bytes allocated before the actual jitcode. r=nbp (70f0b327d3) - Bug 1267557 part 2 - Use different jitcode poison values. r=nbp (08008ab9dc) - Bug 1267557 part 3 - Define JS_SWEPT_CODE_PATTERN for mips. r=nbp (17e894d59d) - Bug 1267449 - Do not infinite loop in js_fputs; r=jimb (67f961b6cd) - Bug 1219098 - Reenable compression on large sources, but revert to uncompressed if decompression happens (r=jandem) (b44ee8d77d) - Bug 1267551 (part 1) - Use MOZ_MUST_USE more in jsnum.h. r=jonco. (d2476bf8f4) - Bug 1267551 (part 2) - Use MOZ_MUST_USE more in js/src/ds/. r=jonco. (4ff5d9aa88) - Bug 1267412 - Use MutableHandleValue instead of pointer-to-AutoValueVector; r=sfink (3f6dd284bb) - Bug 1266406 - Use EnumSet<AllocKind> to simplify GC sweeping phase information r=terrence (64811500e7) - Bug 1266457 - Update pointers in GC things in two phases when compacting r=terrence (f6f5bc4e4d) - Bug 1266457 - Simplify typed object trace hook r=terence (3b06c8d1e5) - Bug 1268541 - Compact arenas containing base shapes r=terrence (b458b92eea) - Bug 1268805 - Implement PrivateGCThingValue. (r=terrence) (deec9a83ae) - Bug 1268415: Initialize members in UpdatePointerTasks; r=jonco (6cb219005a) - Bug 1268501 - Release the GC lock periodically when releasing arenas on the backgound thread r=terrence (37f0997682) - Bug 1263572 - Wait for background sweeping to finish before checking base shapes r=terrence (354801a411) - Bug 1266887 - Store Rooted heads on the Zone; r=sfink (91c0101ee3) - Bug 1266402 - Add iteration to EnumSet<T> so that it can be used in range-based for loops r=Waldo (e9507a2524) - Bug 1266404 - Allow construction of an EnumSet<T> using an initializer list r=Waldo (1b6d340e99) - Bug 1254020 - Always compute theme scaling factor when per-monitor dpi aware, even if only a single display is currently present. r=emk (a00cda21f4) - Bug 1263525 - Add dedicated function for std_Array self-hosted intrinsic. r=efaust (449d8bb7eb) - Bug 1255925 - Change JSFunction::name to return a JSAtom. r=efaust (5ab396ce83) - Bug 888969 - Make our tree's sole implementation of nsIRemoteTagService.getRemoteObjectTag not depend upon the infallibility of [[GetPrototypeOf]] on the object provided to it. r=bz (f388f4bf1f) - Bug 1264896 - Kill off nsIRemoteTagService and do what it does, in its sole caller, in far-faster C++. r=billm (5ed3fb103d) - Bug 1268246 - Add a simple Poison class lifetime checker. r=froydnj (7b237bc70e) - Bug 1249496 - Don't apply dpi-based scaling for window titlebar dimensions when on a secondary display, because windows doesn't scale it. r=emk (64dd706dbc) - Bug 1164518 - Avoid unnecessary DB updates when caching Safe Browsing results. r=gcp (3cafd9a4df) - Bug 1264472 - Use nsRunnables in FIDO U2F. r=keeler (3aa9570132) - Bug 1236060 - Dispatch error should advance queue. r=smaug (74155b75dd) - Bug 1251697 part 1. Thread an ErrorResult reference through the worker XHR WorkerThreadProxySyncRunnable implementations. r=khuey (77804cbb7c) - Bug 1251697 part 2. Have WorkerThreadProxySyncRunnable hand the ErrorResult reference it holds to its ResponseRunnable so it can report exceptions on there instead of on a JSContext. r=khuey (355c9ee313) - Bug 1251697 part 3. Remove the JSContext argument of StopSyncLoopRunnable::MaybeSetException. r=khuey (010f5b1058) - Bug 1155328. r=smaug (e1f8dac304) - Bug 1265927: Move nsRunnable to mozilla::Runnable, CancelableRunnable to mozilla::CancelableRunnable. r=froydnj (f83bfcae02) - Bug 1239946 - Change test to return error on Speak. r=eeejay (1d402beb02) - Bug 1254378 - Update synth tests and introduce no voiceschanged test. r=smaug (f5823bb70e) - Bug 1251627. Fix XMLHttpRequest.send() to follow the spec better in terms of the exceptions it throws. r=khuey (cd0e321948) - Bug 1268868: [MSE] P1. Re-enable gap detection within a media segment. r=gerald (b8b8df4bc2) - Bug 1268868: [MSE] P2. Reset longest duration after keyframe is seen. r=gerald (2b1401465c) - Bug 1268868: [MSE] P3. Prevent crash should gap be detected in content. r=gerald (063d9376fc) - Bug 1254378 - Implement nsISynthVoiceRegistry.notifyVoicesChanged. r=smaug (4b63b1c360) - Bug 1266804 - Un-inline js::Unbox(); r=jorendorff (0f288b6173) - Bug 1268863 - Report ScriptSources that are only reachable via AsmJSModule (r=njn) (5ba40acb64) - bump version to 45.1b1 (1414db0ca8) - Bug 1262062 - remove old futex names. r=bbouvier (62662bdd2e) - memory: build fix after renaming MOZ_WARN_UNUSED_RESULT (7254dc8d53) - import from mozilla: - Bug 1268725 - BaldrMonkey: Refactor away the internal storage from ExprIter. r=luke (1931bd636f17) - Bug 1268725 - BaldrMonkey: Convert default arguments into explicit arguments. r=luke (c8a11b8b6bbd) (867ec715d6)
390 lines
11 KiB
C++
390 lines
11 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
|
|
* 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/. */
|
|
|
|
#include "TestHarness.h"
|
|
|
|
#include "nsMemory.h"
|
|
#include "prthread.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "nsDirectoryServiceDefs.h"
|
|
#include "mozilla/ReentrantMonitor.h"
|
|
|
|
#include "mozIStorageService.h"
|
|
#include "mozIStorageConnection.h"
|
|
#include "mozIStorageStatementCallback.h"
|
|
#include "mozIStorageCompletionCallback.h"
|
|
#include "mozIStorageBindingParamsArray.h"
|
|
#include "mozIStorageBindingParams.h"
|
|
#include "mozIStorageAsyncStatement.h"
|
|
#include "mozIStorageStatement.h"
|
|
#include "mozIStoragePendingStatement.h"
|
|
#include "mozIStorageError.h"
|
|
#include "nsIInterfaceRequestorUtils.h"
|
|
#include "nsIEventTarget.h"
|
|
|
|
#include "sqlite3.h"
|
|
|
|
static int gTotalTests = 0;
|
|
static int gPassedTests = 0;
|
|
|
|
#define do_check_true(aCondition) \
|
|
PR_BEGIN_MACRO \
|
|
gTotalTests++; \
|
|
if (aCondition) { \
|
|
gPassedTests++; \
|
|
} else { \
|
|
fail("%s | Expected true, got false at line %d", __FILE__, __LINE__); \
|
|
} \
|
|
PR_END_MACRO
|
|
|
|
#define do_check_false(aCondition) \
|
|
PR_BEGIN_MACRO \
|
|
gTotalTests++; \
|
|
if (!aCondition) { \
|
|
gPassedTests++; \
|
|
} else { \
|
|
fail("%s | Expected false, got true at line %d", __FILE__, __LINE__); \
|
|
} \
|
|
PR_END_MACRO
|
|
|
|
#define do_check_success(aResult) \
|
|
do_check_true(NS_SUCCEEDED(aResult))
|
|
|
|
#ifdef LINUX
|
|
// XXX Linux opt builds on tinderbox are orange due to linking with stdlib.
|
|
// This is sad and annoying, but it's a workaround that works.
|
|
#define do_check_eq(aExpected, aActual) \
|
|
do_check_true(aExpected == aActual)
|
|
#else
|
|
#include <sstream>
|
|
// Print nsresult as uint32_t
|
|
std::ostream& operator<<(std::ostream& aStream, const nsresult aInput)
|
|
{
|
|
return aStream << static_cast<uint32_t>(aInput);
|
|
}
|
|
#define do_check_eq(aExpected, aActual) \
|
|
PR_BEGIN_MACRO \
|
|
gTotalTests++; \
|
|
if (aExpected == aActual) { \
|
|
gPassedTests++; \
|
|
} else { \
|
|
std::ostringstream temp; \
|
|
temp << __FILE__ << " | Expected '" << aExpected << "', got '"; \
|
|
temp << aActual <<"' at line " << __LINE__; \
|
|
fail(temp.str().c_str()); \
|
|
} \
|
|
PR_END_MACRO
|
|
#endif
|
|
|
|
#define do_check_ok(aInvoc) do_check_true((aInvoc) == SQLITE_OK)
|
|
|
|
already_AddRefed<mozIStorageService>
|
|
getService()
|
|
{
|
|
nsCOMPtr<mozIStorageService> ss =
|
|
do_GetService("@mozilla.org/storage/service;1");
|
|
do_check_true(ss);
|
|
return ss.forget();
|
|
}
|
|
|
|
already_AddRefed<mozIStorageConnection>
|
|
getMemoryDatabase()
|
|
{
|
|
nsCOMPtr<mozIStorageService> ss = getService();
|
|
nsCOMPtr<mozIStorageConnection> conn;
|
|
nsresult rv = ss->OpenSpecialDatabase("memory", getter_AddRefs(conn));
|
|
do_check_success(rv);
|
|
return conn.forget();
|
|
}
|
|
|
|
already_AddRefed<mozIStorageConnection>
|
|
getDatabase()
|
|
{
|
|
nsCOMPtr<nsIFile> dbFile;
|
|
(void)NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
|
|
getter_AddRefs(dbFile));
|
|
NS_ASSERTION(dbFile, "The directory doesn't exists?!");
|
|
|
|
nsresult rv = dbFile->Append(NS_LITERAL_STRING("storage_test_db.sqlite"));
|
|
do_check_success(rv);
|
|
|
|
nsCOMPtr<mozIStorageService> ss = getService();
|
|
nsCOMPtr<mozIStorageConnection> conn;
|
|
rv = ss->OpenDatabase(dbFile, getter_AddRefs(conn));
|
|
do_check_success(rv);
|
|
return conn.forget();
|
|
}
|
|
|
|
|
|
class AsyncStatementSpinner : public mozIStorageStatementCallback
|
|
, public mozIStorageCompletionCallback
|
|
{
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_MOZISTORAGESTATEMENTCALLBACK
|
|
NS_DECL_MOZISTORAGECOMPLETIONCALLBACK
|
|
|
|
AsyncStatementSpinner();
|
|
|
|
void SpinUntilCompleted();
|
|
|
|
uint16_t completionReason;
|
|
|
|
protected:
|
|
virtual ~AsyncStatementSpinner() {}
|
|
volatile bool mCompleted;
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS(AsyncStatementSpinner,
|
|
mozIStorageStatementCallback,
|
|
mozIStorageCompletionCallback)
|
|
|
|
AsyncStatementSpinner::AsyncStatementSpinner()
|
|
: completionReason(0)
|
|
, mCompleted(false)
|
|
{
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
AsyncStatementSpinner::HandleResult(mozIStorageResultSet *aResultSet)
|
|
{
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
AsyncStatementSpinner::HandleError(mozIStorageError *aError)
|
|
{
|
|
int32_t result;
|
|
nsresult rv = aError->GetResult(&result);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
nsAutoCString message;
|
|
rv = aError->GetMessage(message);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsAutoCString warnMsg;
|
|
warnMsg.AppendLiteral("An error occurred while executing an async statement: ");
|
|
warnMsg.AppendInt(result);
|
|
warnMsg.Append(' ');
|
|
warnMsg.Append(message);
|
|
NS_WARNING(warnMsg.get());
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
AsyncStatementSpinner::HandleCompletion(uint16_t aReason)
|
|
{
|
|
completionReason = aReason;
|
|
mCompleted = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
AsyncStatementSpinner::Complete(nsresult, nsISupports*)
|
|
{
|
|
mCompleted = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
void AsyncStatementSpinner::SpinUntilCompleted()
|
|
{
|
|
nsCOMPtr<nsIThread> thread(::do_GetCurrentThread());
|
|
nsresult rv = NS_OK;
|
|
bool processed = true;
|
|
while (!mCompleted && NS_SUCCEEDED(rv)) {
|
|
rv = thread->ProcessNextEvent(true, &processed);
|
|
}
|
|
}
|
|
|
|
#define NS_DECL_ASYNCSTATEMENTSPINNER \
|
|
NS_IMETHOD HandleResult(mozIStorageResultSet *aResultSet) override;
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
//// Async Helpers
|
|
|
|
/**
|
|
* Execute an async statement, blocking the main thread until we get the
|
|
* callback completion notification.
|
|
*/
|
|
void
|
|
blocking_async_execute(mozIStorageBaseStatement *stmt)
|
|
{
|
|
RefPtr<AsyncStatementSpinner> spinner(new AsyncStatementSpinner());
|
|
|
|
nsCOMPtr<mozIStoragePendingStatement> pendy;
|
|
(void)stmt->ExecuteAsync(spinner, getter_AddRefs(pendy));
|
|
spinner->SpinUntilCompleted();
|
|
}
|
|
|
|
/**
|
|
* Invoke AsyncClose on the given connection, blocking the main thread until we
|
|
* get the completion notification.
|
|
*/
|
|
void
|
|
blocking_async_close(mozIStorageConnection *db)
|
|
{
|
|
RefPtr<AsyncStatementSpinner> spinner(new AsyncStatementSpinner());
|
|
|
|
db->AsyncClose(spinner);
|
|
spinner->SpinUntilCompleted();
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
//// Mutex Watching
|
|
|
|
/**
|
|
* Verify that mozIStorageAsyncStatement's life-cycle never triggers a mutex on
|
|
* the caller (generally main) thread. We do this by decorating the sqlite
|
|
* mutex logic with our own code that checks what thread it is being invoked on
|
|
* and sets a flag if it is invoked on the main thread. We are able to easily
|
|
* decorate the SQLite mutex logic because SQLite allows us to retrieve the
|
|
* current function pointers being used and then provide a new set.
|
|
*/
|
|
|
|
sqlite3_mutex_methods orig_mutex_methods;
|
|
sqlite3_mutex_methods wrapped_mutex_methods;
|
|
|
|
bool mutex_used_on_watched_thread = false;
|
|
PRThread *watched_thread = nullptr;
|
|
/**
|
|
* Ugly hack to let us figure out what a connection's async thread is. If we
|
|
* were MOZILLA_INTERNAL_API and linked as such we could just include
|
|
* mozStorageConnection.h and just ask Connection directly. But that turns out
|
|
* poorly.
|
|
*
|
|
* When the thread a mutex is invoked on isn't watched_thread we save it to this
|
|
* variable.
|
|
*/
|
|
PRThread *last_non_watched_thread = nullptr;
|
|
|
|
/**
|
|
* Set a flag if the mutex is used on the thread we are watching, but always
|
|
* call the real mutex function.
|
|
*/
|
|
extern "C" void wrapped_MutexEnter(sqlite3_mutex *mutex)
|
|
{
|
|
PRThread *curThread = ::PR_GetCurrentThread();
|
|
if (curThread == watched_thread)
|
|
mutex_used_on_watched_thread = true;
|
|
else
|
|
last_non_watched_thread = curThread;
|
|
orig_mutex_methods.xMutexEnter(mutex);
|
|
}
|
|
|
|
extern "C" int wrapped_MutexTry(sqlite3_mutex *mutex)
|
|
{
|
|
if (::PR_GetCurrentThread() == watched_thread)
|
|
mutex_used_on_watched_thread = true;
|
|
return orig_mutex_methods.xMutexTry(mutex);
|
|
}
|
|
|
|
void hook_sqlite_mutex()
|
|
{
|
|
// We need to initialize and teardown SQLite to get it to set up the
|
|
// default mutex handlers for us so we can steal them and wrap them.
|
|
do_check_ok(sqlite3_initialize());
|
|
do_check_ok(sqlite3_shutdown());
|
|
do_check_ok(::sqlite3_config(SQLITE_CONFIG_GETMUTEX, &orig_mutex_methods));
|
|
do_check_ok(::sqlite3_config(SQLITE_CONFIG_GETMUTEX, &wrapped_mutex_methods));
|
|
wrapped_mutex_methods.xMutexEnter = wrapped_MutexEnter;
|
|
wrapped_mutex_methods.xMutexTry = wrapped_MutexTry;
|
|
do_check_ok(::sqlite3_config(SQLITE_CONFIG_MUTEX, &wrapped_mutex_methods));
|
|
}
|
|
|
|
/**
|
|
* Call to clear the watch state and to set the watching against this thread.
|
|
*
|
|
* Check |mutex_used_on_watched_thread| to see if the mutex has fired since
|
|
* this method was last called. Since we're talking about the current thread,
|
|
* there are no race issues to be concerned about
|
|
*/
|
|
void watch_for_mutex_use_on_this_thread()
|
|
{
|
|
watched_thread = ::PR_GetCurrentThread();
|
|
mutex_used_on_watched_thread = false;
|
|
}
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
//// Thread Wedgers
|
|
|
|
/**
|
|
* A runnable that blocks until code on another thread invokes its unwedge
|
|
* method. By dispatching this to a thread you can ensure that no subsequent
|
|
* runnables dispatched to the thread will execute until you invoke unwedge.
|
|
*
|
|
* The wedger is self-dispatching, just construct it with its target.
|
|
*/
|
|
class ThreadWedger : public mozilla::Runnable
|
|
{
|
|
public:
|
|
explicit ThreadWedger(nsIEventTarget *aTarget)
|
|
: mReentrantMonitor("thread wedger")
|
|
, unwedged(false)
|
|
{
|
|
aTarget->Dispatch(this, aTarget->NS_DISPATCH_NORMAL);
|
|
}
|
|
|
|
NS_IMETHOD Run()
|
|
{
|
|
mozilla::ReentrantMonitorAutoEnter automon(mReentrantMonitor);
|
|
|
|
if (!unwedged)
|
|
automon.Wait();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void unwedge()
|
|
{
|
|
mozilla::ReentrantMonitorAutoEnter automon(mReentrantMonitor);
|
|
unwedged = true;
|
|
automon.Notify();
|
|
}
|
|
|
|
private:
|
|
mozilla::ReentrantMonitor mReentrantMonitor;
|
|
bool unwedged;
|
|
};
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
//// Async Helpers
|
|
|
|
/**
|
|
* A horrible hack to figure out what the connection's async thread is. By
|
|
* creating a statement and async dispatching we can tell from the mutex who
|
|
* is the async thread, PRThread style. Then we map that to an nsIThread.
|
|
*/
|
|
already_AddRefed<nsIThread>
|
|
get_conn_async_thread(mozIStorageConnection *db)
|
|
{
|
|
// Make sure we are tracking the current thread as the watched thread
|
|
watch_for_mutex_use_on_this_thread();
|
|
|
|
// - statement with nothing to bind
|
|
nsCOMPtr<mozIStorageAsyncStatement> stmt;
|
|
db->CreateAsyncStatement(
|
|
NS_LITERAL_CSTRING("SELECT 1"),
|
|
getter_AddRefs(stmt));
|
|
blocking_async_execute(stmt);
|
|
stmt->Finalize();
|
|
|
|
nsCOMPtr<nsIThreadManager> threadMan =
|
|
do_GetService("@mozilla.org/thread-manager;1");
|
|
nsCOMPtr<nsIThread> asyncThread;
|
|
threadMan->GetThreadFromPRThread(last_non_watched_thread,
|
|
getter_AddRefs(asyncThread));
|
|
|
|
// Additionally, check that the thread we get as the background thread is the
|
|
// same one as the one we report from getInterface.
|
|
nsCOMPtr<nsIEventTarget> target = do_GetInterface(db);
|
|
nsCOMPtr<nsIThread> allegedAsyncThread = do_QueryInterface(target);
|
|
PRThread *allegedPRThread;
|
|
(void)allegedAsyncThread->GetPRThread(&allegedPRThread);
|
|
do_check_eq(allegedPRThread, last_non_watched_thread);
|
|
return asyncThread.forget();
|
|
}
|