• file
• revisions
• annotate
• diff
• comparison
• raw

netwerk/protocol/http/nsHttpActivityDistributor.cpp@deefc01c0e14 (annotated)

netwerk/protocol/http/nsHttpActivityDistributor.cpp

Thu, 15 Jan 2015 21:03:48 +0100

author

Michael Schloh von Bennewitz <michael@schloh.com>

date

Thu, 15 Jan 2015 21:03:48 +0100

branch

TOR_BUG_9701

changeset 11

deefc01c0e14

permissions

-rw-r--r--

Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)

michael@0	1	/* This Source Code Form is subject to the terms of the Mozilla Public
michael@0	2	* License, v. 2.0. If a copy of the MPL was not distributed with this
michael@0	3	* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
michael@0	4
michael@0	5	// HttpLog.h should generally be included first
michael@0	6	#include "HttpLog.h"
michael@0	7
michael@0	8	#include "nsHttpActivityDistributor.h"
michael@0	9	#include "nsCOMPtr.h"
michael@0	10	#include "nsAutoPtr.h"
michael@0	11	#include "nsThreadUtils.h"
michael@0	12
michael@0	13	namespace mozilla {
michael@0	14	namespace net {
michael@0	15
michael@0	16	typedef nsMainThreadPtrHolder<nsIHttpActivityObserver> ObserverHolder;
michael@0	17	typedef nsMainThreadPtrHandle<nsIHttpActivityObserver> ObserverHandle;
michael@0	18	typedef nsTArray<ObserverHandle> ObserverArray;
michael@0	19
michael@0	20	class nsHttpActivityEvent : public nsRunnable
michael@0	21	{
michael@0	22	public:
michael@0	23	nsHttpActivityEvent(nsISupports *aHttpChannel,
michael@0	24	uint32_t aActivityType,
michael@0	25	uint32_t aActivitySubtype,
michael@0	26	PRTime aTimestamp,
michael@0	27	uint64_t aExtraSizeData,
michael@0	28	const nsACString & aExtraStringData,
michael@0	29	ObserverArray *aObservers)
michael@0	30	: mHttpChannel(aHttpChannel)
michael@0	31	, mActivityType(aActivityType)
michael@0	32	, mActivitySubtype(aActivitySubtype)
michael@0	33	, mTimestamp(aTimestamp)
michael@0	34	, mExtraSizeData(aExtraSizeData)
michael@0	35	, mExtraStringData(aExtraStringData)
michael@0	36	, mObservers(*aObservers)
michael@0	37	{
michael@0	38	}
michael@0	39
michael@0	40	NS_IMETHOD Run()
michael@0	41	{
michael@0	42	for (size_t i = 0 ; i < mObservers.Length() ; i++)
michael@0	43	mObservers[i]->ObserveActivity(mHttpChannel, mActivityType,
michael@0	44	mActivitySubtype, mTimestamp,
michael@0	45	mExtraSizeData, mExtraStringData);
michael@0	46	return NS_OK;
michael@0	47	}
michael@0	48
michael@0	49	private:
michael@0	50	virtual ~nsHttpActivityEvent()
michael@0	51	{
michael@0	52	}
michael@0	53
michael@0	54	nsCOMPtr<nsISupports> mHttpChannel;
michael@0	55	uint32_t mActivityType;
michael@0	56	uint32_t mActivitySubtype;
michael@0	57	PRTime mTimestamp;
michael@0	58	uint64_t mExtraSizeData;
michael@0	59	nsCString mExtraStringData;
michael@0	60
michael@0	61	ObserverArray mObservers;
michael@0	62	};
michael@0	63
michael@0	64	NS_IMPL_ISUPPORTS(nsHttpActivityDistributor,
michael@0	65	nsIHttpActivityDistributor,
michael@0	66	nsIHttpActivityObserver)
michael@0	67
michael@0	68	nsHttpActivityDistributor::nsHttpActivityDistributor()
michael@0	69	: mLock("nsHttpActivityDistributor.mLock")
michael@0	70	{
michael@0	71	}
michael@0	72
michael@0	73	nsHttpActivityDistributor::~nsHttpActivityDistributor()
michael@0	74	{
michael@0	75	}
michael@0	76
michael@0	77	NS_IMETHODIMP
michael@0	78	nsHttpActivityDistributor::ObserveActivity(nsISupports *aHttpChannel,
michael@0	79	uint32_t aActivityType,
michael@0	80	uint32_t aActivitySubtype,
michael@0	81	PRTime aTimestamp,
michael@0	82	uint64_t aExtraSizeData,
michael@0	83	const nsACString & aExtraStringData)
michael@0	84	{
michael@0	85	nsRefPtr<nsIRunnable> event;
michael@0	86	{
michael@0	87	MutexAutoLock lock(mLock);
michael@0	88
michael@0	89	if (!mObservers.Length())
michael@0	90	return NS_OK;
michael@0	91
michael@0	92	event = new nsHttpActivityEvent(aHttpChannel, aActivityType,
michael@0	93	aActivitySubtype, aTimestamp,
michael@0	94	aExtraSizeData, aExtraStringData,
michael@0	95	&mObservers);
michael@0	96	}
michael@0	97	NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY);
michael@0	98	return NS_DispatchToMainThread(event);
michael@0	99	}
michael@0	100
michael@0	101	NS_IMETHODIMP
michael@0	102	nsHttpActivityDistributor::GetIsActive(bool *isActive)
michael@0	103	{
michael@0	104	NS_ENSURE_ARG_POINTER(isActive);
michael@0	105	MutexAutoLock lock(mLock);
michael@0	106	*isActive = !!mObservers.Length();
michael@0	107	return NS_OK;
michael@0	108	}
michael@0	109
michael@0	110	NS_IMETHODIMP
michael@0	111	nsHttpActivityDistributor::AddObserver(nsIHttpActivityObserver *aObserver)
michael@0	112	{
michael@0	113	MutexAutoLock lock(mLock);
michael@0	114
michael@0	115	ObserverHandle observer(new ObserverHolder(aObserver));
michael@0	116	if (!mObservers.AppendElement(observer))
michael@0	117	return NS_ERROR_OUT_OF_MEMORY;
michael@0	118
michael@0	119	return NS_OK;
michael@0	120	}
michael@0	121
michael@0	122	NS_IMETHODIMP
michael@0	123	nsHttpActivityDistributor::RemoveObserver(nsIHttpActivityObserver *aObserver)
michael@0	124	{
michael@0	125	MutexAutoLock lock(mLock);
michael@0	126
michael@0	127	ObserverHandle observer(new ObserverHolder(aObserver));
michael@0	128	if (!mObservers.RemoveElement(observer))
michael@0	129	return NS_ERROR_FAILURE;
michael@0	130
michael@0	131	return NS_OK;
michael@0	132	}
michael@0	133	} // namespace mozilla::net
michael@0	134	} // namespace mozilla