2001-09-28 20:14:13 +00:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2012-05-21 11:12:37 +00:00
|
|
|
/* 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/. */
|
2000-04-18 02:34:54 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Maintains a circular buffer of recent messages, and notifies
|
|
|
|
* listeners when new messages are logged.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Threadsafe. */
|
|
|
|
|
2000-06-03 09:46:12 +00:00
|
|
|
#include "nsMemory.h"
|
2009-04-14 08:02:58 +00:00
|
|
|
#include "nsCOMArray.h"
|
2006-05-10 17:30:15 +00:00
|
|
|
#include "nsThreadUtils.h"
|
2000-04-18 02:34:54 +00:00
|
|
|
|
|
|
|
#include "nsConsoleService.h"
|
|
|
|
#include "nsConsoleMessage.h"
|
2006-03-15 04:59:42 +00:00
|
|
|
#include "nsIClassInfoImpl.h"
|
2013-09-23 17:29:27 +00:00
|
|
|
#include "nsIConsoleListener.h"
|
2013-10-04 17:16:53 +00:00
|
|
|
#include "nsPrintfCString.h"
|
2012-11-07 06:34:33 +00:00
|
|
|
|
|
|
|
#include "mozilla/Preferences.h"
|
2000-04-18 02:34:54 +00:00
|
|
|
|
2014-02-11 21:01:29 +00:00
|
|
|
#if defined(ANDROID)
|
|
|
|
#include <android/log.h>
|
|
|
|
#endif
|
|
|
|
#ifdef XP_WIN
|
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
|
|
|
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 04:29:02 +00:00
|
|
|
using namespace mozilla;
|
|
|
|
|
2013-07-19 02:31:26 +00:00
|
|
|
NS_IMPL_ADDREF(nsConsoleService)
|
|
|
|
NS_IMPL_RELEASE(nsConsoleService)
|
2013-10-10 20:41:00 +00:00
|
|
|
NS_IMPL_CLASSINFO(nsConsoleService, nullptr, nsIClassInfo::THREADSAFE | nsIClassInfo::SINGLETON, NS_CONSOLESERVICE_CID)
|
2004-10-28 07:34:41 +00:00
|
|
|
NS_IMPL_QUERY_INTERFACE1_CI(nsConsoleService, nsIConsoleService)
|
|
|
|
NS_IMPL_CI_INTERFACE_GETTER1(nsConsoleService, nsIConsoleService)
|
2000-04-18 02:34:54 +00:00
|
|
|
|
2012-11-07 06:34:33 +00:00
|
|
|
static bool sLoggingEnabled = true;
|
2013-03-14 05:55:25 +00:00
|
|
|
static bool sLoggingBuffered = true;
|
2012-11-07 06:34:33 +00:00
|
|
|
|
2000-04-18 02:34:54 +00:00
|
|
|
nsConsoleService::nsConsoleService()
|
2012-07-30 14:20:58 +00:00
|
|
|
: mMessages(nullptr)
|
2012-01-11 16:28:21 +00:00
|
|
|
, mCurrent(0)
|
|
|
|
, mFull(false)
|
2012-01-11 16:28:21 +00:00
|
|
|
, mDeliveringMessage(false)
|
2012-01-11 16:28:21 +00:00
|
|
|
, mLock("nsConsoleService.mLock")
|
2000-04-18 02:34:54 +00:00
|
|
|
{
|
|
|
|
// XXX grab this from a pref!
|
|
|
|
// hm, but worry about circularity, bc we want to be able to report
|
|
|
|
// prefs errs...
|
|
|
|
mBufferSize = 250;
|
|
|
|
}
|
|
|
|
|
|
|
|
nsConsoleService::~nsConsoleService()
|
|
|
|
{
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t i = 0;
|
2012-07-30 14:20:58 +00:00
|
|
|
while (i < mBufferSize && mMessages[i] != nullptr) {
|
2000-04-18 02:34:54 +00:00
|
|
|
NS_RELEASE(mMessages[i]);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
2005-03-02 16:37:53 +00:00
|
|
|
if (mMessages)
|
|
|
|
nsMemory::Free(mMessages);
|
2000-04-18 02:34:54 +00:00
|
|
|
}
|
|
|
|
|
2013-03-14 05:55:25 +00:00
|
|
|
class AddConsolePrefWatchers : public nsRunnable
|
2012-11-07 06:34:33 +00:00
|
|
|
{
|
|
|
|
public:
|
2013-03-14 05:55:25 +00:00
|
|
|
AddConsolePrefWatchers(nsConsoleService* aConsole) : mConsole(aConsole) {}
|
|
|
|
|
2012-11-07 06:34:33 +00:00
|
|
|
NS_IMETHOD Run()
|
|
|
|
{
|
|
|
|
Preferences::AddBoolVarCache(&sLoggingEnabled, "consoleservice.enabled", true);
|
2013-03-14 05:55:25 +00:00
|
|
|
Preferences::AddBoolVarCache(&sLoggingBuffered, "consoleservice.buffered", true);
|
|
|
|
if (!sLoggingBuffered) {
|
|
|
|
mConsole->Reset();
|
|
|
|
}
|
2012-11-07 06:34:33 +00:00
|
|
|
return NS_OK;
|
|
|
|
}
|
2013-03-14 05:55:25 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
nsRefPtr<nsConsoleService> mConsole;
|
2012-11-07 06:34:33 +00:00
|
|
|
};
|
|
|
|
|
2005-03-02 16:37:53 +00:00
|
|
|
nsresult
|
|
|
|
nsConsoleService::Init()
|
|
|
|
{
|
|
|
|
mMessages = (nsIConsoleMessage **)
|
|
|
|
nsMemory::Alloc(mBufferSize * sizeof(nsIConsoleMessage *));
|
|
|
|
if (!mMessages)
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
|
|
|
|
// Array elements should be 0 initially for circular buffer algorithm.
|
|
|
|
memset(mMessages, 0, mBufferSize * sizeof(nsIConsoleMessage *));
|
|
|
|
|
2013-03-14 05:55:25 +00:00
|
|
|
NS_DispatchToMainThread(new AddConsolePrefWatchers(this));
|
2012-01-11 16:28:21 +00:00
|
|
|
|
2005-03-02 16:37:53 +00:00
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
2012-01-11 16:28:21 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
class LogMessageRunnable : public nsRunnable
|
2001-10-26 04:51:08 +00:00
|
|
|
{
|
2012-01-11 16:28:21 +00:00
|
|
|
public:
|
2012-01-11 16:28:21 +00:00
|
|
|
LogMessageRunnable(nsIConsoleMessage* message, nsConsoleService* service)
|
|
|
|
: mMessage(message)
|
|
|
|
, mService(service)
|
2012-01-11 16:28:21 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
NS_DECL_NSIRUNNABLE
|
|
|
|
|
|
|
|
private:
|
|
|
|
nsCOMPtr<nsIConsoleMessage> mMessage;
|
2012-01-11 16:28:21 +00:00
|
|
|
nsRefPtr<nsConsoleService> mService;
|
2012-01-11 16:28:21 +00:00
|
|
|
};
|
|
|
|
|
2013-01-29 16:02:56 +00:00
|
|
|
typedef nsCOMArray<nsIConsoleListener> ListenerArrayType;
|
|
|
|
|
|
|
|
PLDHashOperator
|
|
|
|
CollectCurrentListeners(nsISupports* aKey, nsIConsoleListener* aValue,
|
|
|
|
void* closure)
|
|
|
|
{
|
|
|
|
ListenerArrayType* listeners = static_cast<ListenerArrayType*>(closure);
|
|
|
|
listeners->AppendObject(aValue);
|
|
|
|
return PL_DHASH_NEXT;
|
|
|
|
}
|
|
|
|
|
2012-01-11 16:28:21 +00:00
|
|
|
NS_IMETHODIMP
|
|
|
|
LogMessageRunnable::Run()
|
|
|
|
{
|
2012-01-11 16:28:21 +00:00
|
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
|
2013-01-29 16:02:56 +00:00
|
|
|
// Snapshot of listeners so that we don't reenter this hash during
|
|
|
|
// enumeration.
|
|
|
|
nsCOMArray<nsIConsoleListener> listeners;
|
|
|
|
mService->EnumerateListeners(CollectCurrentListeners, &listeners);
|
|
|
|
|
2012-01-11 16:28:21 +00:00
|
|
|
mService->SetIsDelivering();
|
|
|
|
|
2013-01-29 16:02:56 +00:00
|
|
|
for (int32_t i = 0; i < listeners.Count(); ++i)
|
|
|
|
listeners[i]->Observe(mMessage);
|
2012-01-11 16:28:21 +00:00
|
|
|
|
2012-01-11 16:28:21 +00:00
|
|
|
mService->SetDoneDelivering();
|
|
|
|
|
2012-01-11 16:28:21 +00:00
|
|
|
return NS_OK;
|
|
|
|
}
|
2001-10-26 04:51:08 +00:00
|
|
|
|
2012-01-11 16:28:21 +00:00
|
|
|
} // anonymous namespace
|
|
|
|
|
2000-04-18 02:34:54 +00:00
|
|
|
// nsIConsoleService methods
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsConsoleService::LogMessage(nsIConsoleMessage *message)
|
2012-11-09 17:52:09 +00:00
|
|
|
{
|
|
|
|
return LogMessageWithMode(message, OutputToLog);
|
|
|
|
}
|
|
|
|
|
|
|
|
nsresult
|
|
|
|
nsConsoleService::LogMessageWithMode(nsIConsoleMessage *message, nsConsoleService::OutputMode outputMode)
|
2000-04-18 02:34:54 +00:00
|
|
|
{
|
2012-07-30 14:20:58 +00:00
|
|
|
if (message == nullptr)
|
2000-04-18 02:34:54 +00:00
|
|
|
return NS_ERROR_INVALID_ARG;
|
|
|
|
|
2012-11-07 06:34:33 +00:00
|
|
|
if (!sLoggingEnabled) {
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
2012-01-11 16:28:21 +00:00
|
|
|
if (NS_IsMainThread() && mDeliveringMessage) {
|
2014-02-18 14:47:54 +00:00
|
|
|
nsCString msg;
|
|
|
|
message->ToString(msg);
|
2013-10-04 17:16:53 +00:00
|
|
|
NS_WARNING(nsPrintfCString("Reentrancy error: some client attempted "
|
|
|
|
"to display a message to the console while in a console listener. "
|
2014-02-18 14:47:54 +00:00
|
|
|
"The following message was discarded: \"%s\"", msg.get()).get());
|
2012-01-11 16:28:21 +00:00
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
}
|
|
|
|
|
2012-09-28 16:54:36 +00:00
|
|
|
nsRefPtr<LogMessageRunnable> r;
|
2000-04-18 02:34:54 +00:00
|
|
|
nsIConsoleMessage *retiredMessage;
|
|
|
|
|
2013-03-14 05:55:25 +00:00
|
|
|
if (sLoggingBuffered) {
|
|
|
|
NS_ADDREF(message); // early, in case it's same as replaced below.
|
|
|
|
}
|
2000-04-18 02:34:54 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Lock while updating buffer, and while taking snapshot of
|
|
|
|
* listeners array.
|
|
|
|
*/
|
|
|
|
{
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 04:29:02 +00:00
|
|
|
MutexAutoLock lock(mLock);
|
2000-04-18 02:34:54 +00:00
|
|
|
|
2014-02-11 21:01:29 +00:00
|
|
|
#if defined(ANDROID)
|
|
|
|
if (outputMode == OutputToLog)
|
|
|
|
{
|
2014-02-18 14:47:54 +00:00
|
|
|
nsCString msg;
|
|
|
|
message->ToString(msg);
|
2014-02-11 21:01:29 +00:00
|
|
|
__android_log_print(ANDROID_LOG_ERROR, "GeckoConsole",
|
2014-02-18 14:47:54 +00:00
|
|
|
"%s", msg.get());
|
2014-02-11 21:01:29 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef XP_WIN
|
|
|
|
if (IsDebuggerPresent()) {
|
|
|
|
nsString msg;
|
|
|
|
message->GetMessageMoz(getter_Copies(msg));
|
|
|
|
msg.AppendLiteral("\n");
|
|
|
|
OutputDebugStringW(msg.get());
|
2012-08-06 20:41:40 +00:00
|
|
|
}
|
2014-02-11 21:01:29 +00:00
|
|
|
#endif
|
2011-11-15 03:12:20 +00:00
|
|
|
|
2000-04-18 02:34:54 +00:00
|
|
|
/*
|
|
|
|
* If there's already a message in the slot we're about to replace,
|
|
|
|
* we've wrapped around, and we need to release the old message. We
|
|
|
|
* save a pointer to it, so we can release below outside the lock.
|
|
|
|
*/
|
|
|
|
retiredMessage = mMessages[mCurrent];
|
2013-03-14 05:55:25 +00:00
|
|
|
|
|
|
|
if (sLoggingBuffered) {
|
|
|
|
mMessages[mCurrent++] = message;
|
|
|
|
if (mCurrent == mBufferSize) {
|
|
|
|
mCurrent = 0; // wrap around.
|
|
|
|
mFull = true;
|
|
|
|
}
|
2000-04-18 02:34:54 +00:00
|
|
|
}
|
|
|
|
|
2012-09-28 16:54:36 +00:00
|
|
|
if (mListeners.Count() > 0) {
|
|
|
|
r = new LogMessageRunnable(message, this);
|
|
|
|
}
|
2000-04-18 02:34:54 +00:00
|
|
|
}
|
2012-09-28 16:54:36 +00:00
|
|
|
|
2012-07-30 14:20:58 +00:00
|
|
|
if (retiredMessage != nullptr)
|
2000-04-18 02:34:54 +00:00
|
|
|
NS_RELEASE(retiredMessage);
|
|
|
|
|
2012-09-28 16:54:36 +00:00
|
|
|
if (r)
|
|
|
|
NS_DispatchToMainThread(r);
|
2000-04-18 02:34:54 +00:00
|
|
|
|
2009-04-14 08:02:58 +00:00
|
|
|
return NS_OK;
|
2000-04-18 02:34:54 +00:00
|
|
|
}
|
|
|
|
|
2013-01-29 16:02:56 +00:00
|
|
|
void
|
|
|
|
nsConsoleService::EnumerateListeners(ListenerHash::EnumReadFunction aFunction,
|
|
|
|
void* aClosure)
|
|
|
|
{
|
|
|
|
MutexAutoLock lock(mLock);
|
|
|
|
mListeners.EnumerateRead(aFunction, aClosure);
|
|
|
|
}
|
|
|
|
|
2000-04-18 02:34:54 +00:00
|
|
|
NS_IMETHODIMP
|
2014-01-04 15:02:17 +00:00
|
|
|
nsConsoleService::LogStringMessage(const char16_t *message)
|
2000-04-18 02:34:54 +00:00
|
|
|
{
|
2012-11-07 06:34:33 +00:00
|
|
|
if (!sLoggingEnabled) {
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
nsRefPtr<nsConsoleMessage> msg(new nsConsoleMessage(message));
|
2000-04-18 02:34:54 +00:00
|
|
|
return this->LogMessage(msg);
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
2012-11-03 10:59:29 +00:00
|
|
|
nsConsoleService::GetMessageArray(uint32_t *count, nsIConsoleMessage ***messages)
|
2000-04-18 02:34:54 +00:00
|
|
|
{
|
|
|
|
nsIConsoleMessage **messageArray;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Lock the whole method, as we don't want anyone mucking with mCurrent or
|
|
|
|
* mFull while we're copying out the buffer.
|
|
|
|
*/
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 04:29:02 +00:00
|
|
|
MutexAutoLock lock(mLock);
|
2000-04-18 02:34:54 +00:00
|
|
|
|
|
|
|
if (mCurrent == 0 && !mFull) {
|
|
|
|
/*
|
|
|
|
* Make a 1-length output array so that nobody gets confused,
|
|
|
|
* and return a count of 0. This should result in a 0-length
|
|
|
|
* array object when called from script.
|
|
|
|
*/
|
|
|
|
messageArray = (nsIConsoleMessage **)
|
2000-06-03 09:46:12 +00:00
|
|
|
nsMemory::Alloc(sizeof (nsIConsoleMessage *));
|
2012-07-30 14:20:58 +00:00
|
|
|
*messageArray = nullptr;
|
2000-04-18 02:34:54 +00:00
|
|
|
*messages = messageArray;
|
|
|
|
*count = 0;
|
2013-03-14 05:55:25 +00:00
|
|
|
|
2000-04-18 02:34:54 +00:00
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t resultSize = mFull ? mBufferSize : mCurrent;
|
2000-04-18 02:34:54 +00:00
|
|
|
messageArray =
|
2000-06-03 09:46:12 +00:00
|
|
|
(nsIConsoleMessage **)nsMemory::Alloc((sizeof (nsIConsoleMessage *))
|
|
|
|
* resultSize);
|
2000-04-18 02:34:54 +00:00
|
|
|
|
2012-07-30 14:20:58 +00:00
|
|
|
if (messageArray == nullptr) {
|
|
|
|
*messages = nullptr;
|
2000-04-18 02:34:54 +00:00
|
|
|
*count = 0;
|
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
}
|
|
|
|
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t i;
|
2000-04-18 02:34:54 +00:00
|
|
|
if (mFull) {
|
|
|
|
for (i = 0; i < mBufferSize; i++) {
|
|
|
|
// if full, fill the buffer starting from mCurrent (which'll be
|
|
|
|
// oldest) wrapping around the buffer to the most recent.
|
|
|
|
messageArray[i] = mMessages[(mCurrent + i) % mBufferSize];
|
|
|
|
NS_ADDREF(messageArray[i]);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < mCurrent; i++) {
|
|
|
|
messageArray[i] = mMessages[i];
|
|
|
|
NS_ADDREF(messageArray[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*count = resultSize;
|
|
|
|
*messages = messageArray;
|
|
|
|
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
2012-01-11 16:28:21 +00:00
|
|
|
nsConsoleService::RegisterListener(nsIConsoleListener *listener)
|
|
|
|
{
|
|
|
|
if (!NS_IsMainThread()) {
|
|
|
|
NS_ERROR("nsConsoleService::RegisterListener is main thread only.");
|
|
|
|
return NS_ERROR_NOT_SAME_THREAD;
|
|
|
|
}
|
2000-04-18 02:34:54 +00:00
|
|
|
|
2012-01-11 16:28:21 +00:00
|
|
|
nsCOMPtr<nsISupports> canonical = do_QueryInterface(listener);
|
2001-10-26 04:51:08 +00:00
|
|
|
|
2012-01-11 16:28:21 +00:00
|
|
|
MutexAutoLock lock(mLock);
|
|
|
|
if (mListeners.GetWeak(canonical)) {
|
|
|
|
// Reregistering a listener isn't good
|
|
|
|
return NS_ERROR_FAILURE;
|
2000-04-18 02:34:54 +00:00
|
|
|
}
|
2012-01-11 16:28:21 +00:00
|
|
|
mListeners.Put(canonical, listener);
|
2000-04-18 02:34:54 +00:00
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
2012-01-11 16:28:21 +00:00
|
|
|
nsConsoleService::UnregisterListener(nsIConsoleListener *listener)
|
|
|
|
{
|
|
|
|
if (!NS_IsMainThread()) {
|
|
|
|
NS_ERROR("nsConsoleService::UnregisterListener is main thread only.");
|
|
|
|
return NS_ERROR_NOT_SAME_THREAD;
|
|
|
|
}
|
|
|
|
|
|
|
|
nsCOMPtr<nsISupports> canonical = do_QueryInterface(listener);
|
|
|
|
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 04:29:02 +00:00
|
|
|
MutexAutoLock lock(mLock);
|
2000-04-18 02:34:54 +00:00
|
|
|
|
2012-01-11 16:28:21 +00:00
|
|
|
if (!mListeners.GetWeak(canonical)) {
|
|
|
|
// Unregistering a listener that was never registered?
|
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
}
|
|
|
|
mListeners.Remove(canonical);
|
2000-04-18 02:34:54 +00:00
|
|
|
return NS_OK;
|
|
|
|
}
|
2000-10-09 23:45:59 +00:00
|
|
|
|
2006-07-19 12:49:33 +00:00
|
|
|
NS_IMETHODIMP
|
|
|
|
nsConsoleService::Reset()
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Make sure nobody trips into the buffer while it's being reset
|
|
|
|
*/
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 04:29:02 +00:00
|
|
|
MutexAutoLock lock(mLock);
|
2006-07-19 12:49:33 +00:00
|
|
|
|
|
|
|
mCurrent = 0;
|
2011-10-17 14:59:28 +00:00
|
|
|
mFull = false;
|
2006-07-19 12:49:33 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Free all messages stored so far (cf. destructor)
|
|
|
|
*/
|
2012-08-22 15:56:38 +00:00
|
|
|
for (uint32_t i = 0; i < mBufferSize && mMessages[i] != nullptr; i++)
|
2006-07-19 12:49:33 +00:00
|
|
|
NS_RELEASE(mMessages[i]);
|
|
|
|
|
|
|
|
return NS_OK;
|
|
|
|
}
|