mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
caf9d19efc
- Bug 1194415 - Refactor BuildProgressFooter.draw() for minor |mach build| perf improvement, r=gps (3488ffb86) - Bug 1153691 - intTestLogging() now adds timestamps and supports param substitution. r=rnewman (507a881c2) - reenable asserts (97032f833) - re-enable specific Windows optimization (7a581da03) - Bug 1149815 - Pass storage function failure codes through to callers, r=asuth. (c54838b5d) - Bug 1149373 - Ensure mozStorage async threads are shut down. r=bent (a511cfefc) - namespace style (7a567650f) - Bug 1193022 - clean up reference-counting in storage/; r=mak (49f115c52) - Bug 1155193 Proxy release the Connection in mozStorageService::unregisterConnection(). r=asuth (bb9311ee5) - bug 1189896 - Do not preallocate Sqlite connections caches for now. r=asuth (210115e89) - Bug 1155846 - Comment out intentionally unreachable code and unused parameters in Prefetcher.jsm. r=billm (8757cba52) - Bug 1166886 - Comment out some code that is supposed to be disabled (r=mconley) (ec5b2bd30) - Bug 1040285 - Single Quotes should not be encoded in the path r=mcmanus,annevk (0a47fdc2f) - Bug 1040285 - Single Quotes in HTTP request-uri Are Incorrectly Encoded as %27 r=MattN (dcce00624) - Bug 1125989 - Avoid OS.File request lossage during worker shutdown, r=yoric (e8e8cab17) - Bug 1164822 - Fix OS.File.remove not throwing with unexisting files. r=Yoric (dd57a069f) - Bug 1123372 - Remove use of .toLocaleFormat() from Places. r=mak (fbfbd7fa0)
174 lines
3.9 KiB
C++
174 lines
3.9 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/. */
|
|
|
|
#ifndef mozilla_storage_SQLiteMutex_h_
|
|
#define mozilla_storage_SQLiteMutex_h_
|
|
|
|
#include "mozilla/BlockingResourceBase.h"
|
|
#include "sqlite3.h"
|
|
|
|
namespace mozilla {
|
|
namespace storage {
|
|
|
|
/**
|
|
* Wrapper class for sqlite3_mutexes. To be used whenever we want to use a
|
|
* sqlite3_mutex.
|
|
*
|
|
* @warning Never EVER wrap the same sqlite3_mutex with a different SQLiteMutex.
|
|
* If you do this, you void the deadlock detector's warranty!
|
|
*/
|
|
class SQLiteMutex : private BlockingResourceBase
|
|
{
|
|
public:
|
|
/**
|
|
* Constructs a wrapper for a sqlite3_mutex that has deadlock detecting.
|
|
*
|
|
* @param aName
|
|
* A name which can be used to reference this mutex.
|
|
*/
|
|
explicit SQLiteMutex(const char *aName)
|
|
: BlockingResourceBase(aName, eMutex)
|
|
, mMutex(nullptr)
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Sets the mutex that we are wrapping. We generally do not have access to
|
|
* our mutex at class construction, so we have to set it once we get access to
|
|
* it.
|
|
*
|
|
* @param aMutex
|
|
* The sqlite3_mutex that we are going to wrap.
|
|
*/
|
|
void initWithMutex(sqlite3_mutex *aMutex)
|
|
{
|
|
NS_ASSERTION(aMutex, "You must pass in a valid mutex!");
|
|
NS_ASSERTION(!mMutex, "A mutex has already been set for this!");
|
|
mMutex = aMutex;
|
|
}
|
|
|
|
#if !defined(DEBUG) || defined(MOZ_NATIVE_SQLITE)
|
|
/**
|
|
* Acquires the mutex.
|
|
*/
|
|
void lock()
|
|
{
|
|
sqlite3_mutex_enter(mMutex);
|
|
}
|
|
|
|
/**
|
|
* Releases the mutex.
|
|
*/
|
|
void unlock()
|
|
{
|
|
sqlite3_mutex_leave(mMutex);
|
|
}
|
|
|
|
/**
|
|
* Asserts that the current thread owns the mutex.
|
|
*/
|
|
void assertCurrentThreadOwns()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Asserts that the current thread does not own the mutex.
|
|
*/
|
|
void assertNotCurrentThreadOwns()
|
|
{
|
|
}
|
|
|
|
#else
|
|
void lock()
|
|
{
|
|
NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
|
|
|
|
// While SQLite Mutexes may be recursive, in our own code we do not want to
|
|
// treat them as such.
|
|
|
|
CheckAcquire();
|
|
sqlite3_mutex_enter(mMutex);
|
|
Acquire(); // Call is protected by us holding the mutex.
|
|
}
|
|
|
|
void unlock()
|
|
{
|
|
NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
|
|
|
|
// While SQLite Mutexes may be recursive, in our own code we do not want to
|
|
// treat them as such.
|
|
Release(); // Call is protected by us holding the mutex.
|
|
sqlite3_mutex_leave(mMutex);
|
|
}
|
|
|
|
void assertCurrentThreadOwns()
|
|
{
|
|
NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
|
|
NS_ASSERTION(sqlite3_mutex_held(mMutex),
|
|
"Mutex is not held, but we expect it to be!");
|
|
}
|
|
|
|
void assertNotCurrentThreadOwns()
|
|
{
|
|
NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
|
|
NS_ASSERTION(sqlite3_mutex_notheld(mMutex),
|
|
"Mutex is held, but we expect it to not be!");
|
|
}
|
|
#endif // ifndef DEBUG
|
|
|
|
private:
|
|
sqlite3_mutex *mMutex;
|
|
};
|
|
|
|
/**
|
|
* Automatically acquires the mutex when it enters scope, and releases it when
|
|
* it leaves scope.
|
|
*/
|
|
class MOZ_STACK_CLASS SQLiteMutexAutoLock
|
|
{
|
|
public:
|
|
explicit SQLiteMutexAutoLock(SQLiteMutex &aMutex)
|
|
: mMutex(aMutex)
|
|
{
|
|
mMutex.lock();
|
|
}
|
|
|
|
~SQLiteMutexAutoLock()
|
|
{
|
|
mMutex.unlock();
|
|
}
|
|
|
|
private:
|
|
SQLiteMutex &mMutex;
|
|
};
|
|
|
|
/**
|
|
* Automatically releases the mutex when it enters scope, and acquires it when
|
|
* it leaves scope.
|
|
*/
|
|
class MOZ_STACK_CLASS SQLiteMutexAutoUnlock
|
|
{
|
|
public:
|
|
explicit SQLiteMutexAutoUnlock(SQLiteMutex &aMutex)
|
|
: mMutex(aMutex)
|
|
{
|
|
mMutex.unlock();
|
|
}
|
|
|
|
~SQLiteMutexAutoUnlock()
|
|
{
|
|
mMutex.lock();
|
|
}
|
|
|
|
private:
|
|
SQLiteMutex &mMutex;
|
|
};
|
|
|
|
} // namespace storage
|
|
} // namespace mozilla
|
|
|
|
#endif // mozilla_storage_SQLiteMutex_h_
|