mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
5d8f4a0ceb
- Bug 1130710 - xre: Use stdint uint*_t instead of nonstandard __uint*_t. r=bsmedberg# Please enter the commit message for your changes. Lines starting (8ee5fbe479) - partial revert of PM (bcd354aa6b) - Bug 1158866 - Enable MAR verification on linux via NSS. r=rstrong (d3a4eff858) - Bug 1159090 - Only append library path for updater if it is a unique value. r=rstrong (5aeece0f47) - Bug 1168720 - Remove use of test env var MOZ_NO_REPLACE_FALLBACK and associated tests that are covered by other tests. r=spohl (4c8fb7266d) - more backport (a30d3a5c9d) - Bug 1158870: Disable mar signing code path in updater for gonk until mar signing is available there. r=bbondy (d08701cdb4) - Bug 1217985 - Don't depend on Windows crypto DLLs (e313b1d3b7) - more backports (fa8e0ff050) - Bug 1168009 - heap-use-after-free (ASAN build) in updater.cpp mstrtok. r=spohl (9ffe217d90) - Bug 1234033 - Unbreak build --with-system-bz2 using Clang. r=dvander (1109f20b70) - backports (3f418fc789) - Bug 1213130 - Make several string function to accept char16ptr_t instead of char16_t*, and remove redundant overloads. rs=froydnj (95a4cb53cd) - Bug 1210871 - don't use reinterpret_cast in nsTHashtable.h; r=erahm (f742409381) - Bug 1217125 - remove pointless includes from nsTHashtable.h; r=mccr8 (ad26d04f77) - Bug 1159081 - Bad PR_SetEnv usage for Gonk. r=dhylands, r=rstrong (855a00ae4b) - bit of Bug 1237140 - Move DefinesAction (d0d8fffb86) - Bug 1157212 - Teach clang-analyzer about XPT_ASSERT; r=froydnj (d75e87012c) - Bug 1208320 - Do not stage some reftest support files before archiving; r=glandium (5a547ca126) - Bug 1208320 - Do not stage reftest test files before archiving; r=glandium (28944e3a87) - Bug 1208320 - Print message when done with archiving; r=glandium (27e0b00dcd) - Bug 1208320 - Decrease compression level of test zip archives; r=glandium (d01f75ea8b) - Bug 1232887 - "make package MOZ_PKG_PRETTYNAMES=1" is busted. r=glandium (9f978b70f0) - Bug 1212609 - Add common test package rules for firefox-ui-tests. r=gps (3fa329714a) - Bug 1239442 - Update common.tests.zip to contain dom/media/test/external-media-sites. r=gps (94e917c5e7) - Bug 1233774 - fix Leak EventTokenBucket on shutdown r=dragana (37db0e5752) - Bug 1241295 - Limit time for PR_Close calls during shutdown in nsUDPSocket. r=mcmanus (451f8663b9) - Bug 1242464 - Call shutdown() before closesocket() and change linger option on windows. r=mcmanus (2b4f7e327c) - Bug 1240122 - threadsafe fix for getselfaddr() r=dragana (0cdeefb33e) - Bug 544986 - 64KB rwin for windows xp r=dragana (cbe034ebf5) - Bug 1239655 - Do not do PR_ConnectContinue during the shutdown. r=mcmanus (2361129b62) - Bug 1240120 - Move external-media-tests to subdirectory to generate correct packaging; r=maja_zf,whimboo (0742e93414) - Bug 1235232 - Fix -Wclass-varargs warnings in dom/media/. r=kentuckyfriedtakahe (b13b325846) - Bug 1231793: Part 1 - Added read functions for Little Endian integers to ByteReader.h. r=jya (6dc6519fe9) - Bug 1231793: Part 2 - Added conversions to AudioSampleFormat.h. r=jya (59d48c4d82) - Bug 1231793: Part 3 - Fixed reading of Metadata tags. r=jya (3931a82ce7) - Bug 1192539 - [2.4] Use MediaCodecList to check for decoder support. r=snorp (35e0427a2b) - Bug 1231793: Part 4 - Added checks for Wave type in AndroidDecoderModule. r=jya (a80b83691c) - Bug 1237836 - Add support for MetadataTags to MediaFormatReader. r=jya (9b813ae38c) - Bug 1231793: Part 5 - Added Wave Data Demuxer and Decoder. r=jya (6f7131a2d8) - Bug 1231793: Part 6 - Enabled the new Wave Data Decoder in DecoderTraits. r=jya (1574922fc7) - Bug 1241677: P1. Add MediaDataDecoder::GetDescriptionName() method. r=cpearce (767413678e) - Bug 1241677: P2. Add media decoder's description to about:media report. r=cpearce (b6d300d864) - Bug 1231793: Part 7 - Fixed various tests. r=jya (baa4a844c1) - Bug 1231793: Part 8 - Added checks for various metadata errors. r=jya (53af45d8de)
463 lines
11 KiB
C++
463 lines
11 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
|
/* 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 "EventTokenBucket.h"
|
|
|
|
#include "nsICancelable.h"
|
|
#include "nsIIOService.h"
|
|
#include "nsNetCID.h"
|
|
#include "nsNetUtil.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "nsSocketTransportService2.h"
|
|
#ifdef DEBUG
|
|
#include "MainThreadUtils.h"
|
|
#endif
|
|
|
|
#ifdef XP_WIN
|
|
#include <windows.h>
|
|
#include <mmsystem.h>
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
namespace net {
|
|
|
|
////////////////////////////////////////////
|
|
// EventTokenBucketCancelable
|
|
////////////////////////////////////////////
|
|
|
|
class TokenBucketCancelable : public nsICancelable
|
|
{
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSICANCELABLE
|
|
|
|
explicit TokenBucketCancelable(class ATokenBucketEvent *event);
|
|
void Fire();
|
|
|
|
private:
|
|
virtual ~TokenBucketCancelable() {}
|
|
|
|
friend class EventTokenBucket;
|
|
ATokenBucketEvent *mEvent;
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS(TokenBucketCancelable, nsICancelable)
|
|
|
|
TokenBucketCancelable::TokenBucketCancelable(ATokenBucketEvent *event)
|
|
: mEvent(event)
|
|
{
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
TokenBucketCancelable::Cancel(nsresult reason)
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
mEvent = nullptr;
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
TokenBucketCancelable::Fire()
|
|
{
|
|
if (!mEvent)
|
|
return;
|
|
|
|
ATokenBucketEvent *event = mEvent;
|
|
mEvent = nullptr;
|
|
event->OnTokenBucketAdmitted();
|
|
}
|
|
|
|
////////////////////////////////////////////
|
|
// EventTokenBucket
|
|
////////////////////////////////////////////
|
|
|
|
NS_IMPL_ISUPPORTS(EventTokenBucket, nsITimerCallback)
|
|
|
|
// by default 1hz with no burst
|
|
EventTokenBucket::EventTokenBucket(uint32_t eventsPerSecond,
|
|
uint32_t burstSize)
|
|
: mUnitCost(kUsecPerSec)
|
|
, mMaxCredit(kUsecPerSec)
|
|
, mCredit(kUsecPerSec)
|
|
, mPaused(false)
|
|
, mStopped(false)
|
|
, mTimerArmed(false)
|
|
#ifdef XP_WIN
|
|
, mFineGrainTimerInUse(false)
|
|
, mFineGrainResetTimerArmed(false)
|
|
#endif
|
|
{
|
|
mLastUpdate = TimeStamp::Now();
|
|
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
nsresult rv;
|
|
nsCOMPtr<nsIEventTarget> sts;
|
|
nsCOMPtr<nsIIOService> ioService = do_GetIOService(&rv);
|
|
if (NS_SUCCEEDED(rv))
|
|
sts = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv);
|
|
if (NS_SUCCEEDED(rv))
|
|
mTimer = do_CreateInstance("@mozilla.org/timer;1");
|
|
if (mTimer)
|
|
mTimer->SetTarget(sts);
|
|
SetRate(eventsPerSecond, burstSize);
|
|
}
|
|
|
|
EventTokenBucket::~EventTokenBucket()
|
|
{
|
|
SOCKET_LOG(("EventTokenBucket::dtor %p events=%d\n",
|
|
this, mEvents.GetSize()));
|
|
|
|
CleanupTimers();
|
|
|
|
// Complete any queued events to prevent hangs
|
|
while (mEvents.GetSize()) {
|
|
RefPtr<TokenBucketCancelable> cancelable =
|
|
dont_AddRef(static_cast<TokenBucketCancelable *>(mEvents.PopFront()));
|
|
cancelable->Fire();
|
|
}
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::CleanupTimers()
|
|
{
|
|
if (mTimer && mTimerArmed) {
|
|
mTimer->Cancel();
|
|
}
|
|
mTimer = nullptr;
|
|
mTimerArmed = false;
|
|
|
|
#ifdef XP_WIN
|
|
NormalTimers();
|
|
if (mFineGrainResetTimer && mFineGrainResetTimerArmed) {
|
|
mFineGrainResetTimer->Cancel();
|
|
}
|
|
mFineGrainResetTimer = nullptr;
|
|
mFineGrainResetTimerArmed = false;
|
|
#endif
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::SetRate(uint32_t eventsPerSecond,
|
|
uint32_t burstSize)
|
|
{
|
|
SOCKET_LOG(("EventTokenBucket::SetRate %p %u %u\n",
|
|
this, eventsPerSecond, burstSize));
|
|
|
|
if (eventsPerSecond > kMaxHz) {
|
|
eventsPerSecond = kMaxHz;
|
|
SOCKET_LOG((" eventsPerSecond out of range\n"));
|
|
}
|
|
|
|
if (!eventsPerSecond) {
|
|
eventsPerSecond = 1;
|
|
SOCKET_LOG((" eventsPerSecond out of range\n"));
|
|
}
|
|
|
|
mUnitCost = kUsecPerSec / eventsPerSecond;
|
|
mMaxCredit = mUnitCost * burstSize;
|
|
if (mMaxCredit > kUsecPerSec * 60 * 15) {
|
|
SOCKET_LOG((" burstSize out of range\n"));
|
|
mMaxCredit = kUsecPerSec * 60 * 15;
|
|
}
|
|
mCredit = mMaxCredit;
|
|
mLastUpdate = TimeStamp::Now();
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::ClearCredits()
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
SOCKET_LOG(("EventTokenBucket::ClearCredits %p\n", this));
|
|
mCredit = 0;
|
|
}
|
|
|
|
uint32_t
|
|
EventTokenBucket::BurstEventsAvailable()
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
return static_cast<uint32_t>(mCredit / mUnitCost);
|
|
}
|
|
|
|
uint32_t
|
|
EventTokenBucket::QueuedEvents()
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
return mEvents.GetSize();
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::Pause()
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
SOCKET_LOG(("EventTokenBucket::Pause %p\n", this));
|
|
if (mPaused || mStopped)
|
|
return;
|
|
|
|
mPaused = true;
|
|
if (mTimerArmed) {
|
|
mTimer->Cancel();
|
|
mTimerArmed = false;
|
|
}
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::UnPause()
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
SOCKET_LOG(("EventTokenBucket::UnPause %p\n", this));
|
|
if (!mPaused || mStopped)
|
|
return;
|
|
|
|
mPaused = false;
|
|
DispatchEvents();
|
|
UpdateTimer();
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::Stop()
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
SOCKET_LOG(("EventTokenBucket::Stop %p armed=%d\n", this, mTimerArmed));
|
|
mStopped = true;
|
|
CleanupTimers();
|
|
|
|
// Complete any queued events to prevent hangs
|
|
while (mEvents.GetSize()) {
|
|
RefPtr<TokenBucketCancelable> cancelable =
|
|
dont_AddRef(static_cast<TokenBucketCancelable *>(mEvents.PopFront()));
|
|
cancelable->Fire();
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
EventTokenBucket::SubmitEvent(ATokenBucketEvent *event, nsICancelable **cancelable)
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
SOCKET_LOG(("EventTokenBucket::SubmitEvent %p\n", this));
|
|
|
|
if (mStopped || !mTimer)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
UpdateCredits();
|
|
|
|
RefPtr<TokenBucketCancelable> cancelEvent = new TokenBucketCancelable(event);
|
|
// When this function exits the cancelEvent needs 2 references, one for the
|
|
// mEvents queue and one for the caller of SubmitEvent()
|
|
|
|
NS_ADDREF(*cancelable = cancelEvent.get());
|
|
|
|
if (mPaused || !TryImmediateDispatch(cancelEvent.get())) {
|
|
// queue it
|
|
SOCKET_LOG((" queued\n"));
|
|
mEvents.Push(cancelEvent.forget().take());
|
|
UpdateTimer();
|
|
}
|
|
else {
|
|
SOCKET_LOG((" dispatched synchronously\n"));
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
bool
|
|
EventTokenBucket::TryImmediateDispatch(TokenBucketCancelable *cancelable)
|
|
{
|
|
if (mCredit < mUnitCost)
|
|
return false;
|
|
|
|
mCredit -= mUnitCost;
|
|
cancelable->Fire();
|
|
return true;
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::DispatchEvents()
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
SOCKET_LOG(("EventTokenBucket::DispatchEvents %p %d\n", this, mPaused));
|
|
if (mPaused || mStopped)
|
|
return;
|
|
|
|
while (mEvents.GetSize() && mUnitCost <= mCredit) {
|
|
RefPtr<TokenBucketCancelable> cancelable =
|
|
dont_AddRef(static_cast<TokenBucketCancelable *>(mEvents.PopFront()));
|
|
if (cancelable->mEvent) {
|
|
SOCKET_LOG(("EventTokenBucket::DispachEvents [%p] "
|
|
"Dispatching queue token bucket event cost=%lu credit=%lu\n",
|
|
this, mUnitCost, mCredit));
|
|
mCredit -= mUnitCost;
|
|
cancelable->Fire();
|
|
}
|
|
}
|
|
|
|
#ifdef XP_WIN
|
|
if (!mEvents.GetSize())
|
|
WantNormalTimers();
|
|
#endif
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::UpdateTimer()
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
if (mTimerArmed || mPaused || mStopped || !mEvents.GetSize() || !mTimer)
|
|
return;
|
|
|
|
if (mCredit >= mUnitCost)
|
|
return;
|
|
|
|
// determine the time needed to wait to accumulate enough credits to admit
|
|
// one more event and set the timer for that point. Always round it
|
|
// up because firing early doesn't help.
|
|
//
|
|
uint64_t deficit = mUnitCost - mCredit;
|
|
uint64_t msecWait = (deficit + (kUsecPerMsec - 1)) / kUsecPerMsec;
|
|
|
|
if (msecWait < 4) // minimum wait
|
|
msecWait = 4;
|
|
else if (msecWait > 60000) // maximum wait
|
|
msecWait = 60000;
|
|
|
|
#ifdef XP_WIN
|
|
FineGrainTimers();
|
|
#endif
|
|
|
|
SOCKET_LOG(("EventTokenBucket::UpdateTimer %p for %dms\n",
|
|
this, msecWait));
|
|
nsresult rv = mTimer->InitWithCallback(this, static_cast<uint32_t>(msecWait),
|
|
nsITimer::TYPE_ONE_SHOT);
|
|
mTimerArmed = NS_SUCCEEDED(rv);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
EventTokenBucket::Notify(nsITimer *timer)
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
|
|
#ifdef XP_WIN
|
|
if (timer == mFineGrainResetTimer) {
|
|
FineGrainResetTimerNotify();
|
|
return NS_OK;
|
|
}
|
|
#endif
|
|
|
|
SOCKET_LOG(("EventTokenBucket::Notify() %p\n", this));
|
|
mTimerArmed = false;
|
|
if (mStopped)
|
|
return NS_OK;
|
|
|
|
UpdateCredits();
|
|
DispatchEvents();
|
|
UpdateTimer();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::UpdateCredits()
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
|
|
TimeStamp now = TimeStamp::Now();
|
|
TimeDuration elapsed = now - mLastUpdate;
|
|
mLastUpdate = now;
|
|
|
|
mCredit += static_cast<uint64_t>(elapsed.ToMicroseconds());
|
|
if (mCredit > mMaxCredit)
|
|
mCredit = mMaxCredit;
|
|
SOCKET_LOG(("EventTokenBucket::UpdateCredits %p to %lu (%lu each.. %3.2f)\n",
|
|
this, mCredit, mUnitCost, (double)mCredit / mUnitCost));
|
|
}
|
|
|
|
#ifdef XP_WIN
|
|
void
|
|
EventTokenBucket::FineGrainTimers()
|
|
{
|
|
SOCKET_LOG(("EventTokenBucket::FineGrainTimers %p mFineGrainTimerInUse=%d\n",
|
|
this, mFineGrainTimerInUse));
|
|
|
|
mLastFineGrainTimerUse = TimeStamp::Now();
|
|
|
|
if (mFineGrainTimerInUse)
|
|
return;
|
|
|
|
if (mUnitCost > kCostFineGrainThreshold)
|
|
return;
|
|
|
|
SOCKET_LOG(("EventTokenBucket::FineGrainTimers %p timeBeginPeriod()\n",
|
|
this));
|
|
|
|
mFineGrainTimerInUse = true;
|
|
timeBeginPeriod(1);
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::NormalTimers()
|
|
{
|
|
if (!mFineGrainTimerInUse)
|
|
return;
|
|
mFineGrainTimerInUse = false;
|
|
|
|
SOCKET_LOG(("EventTokenBucket::NormalTimers %p timeEndPeriod()\n", this));
|
|
timeEndPeriod(1);
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::WantNormalTimers()
|
|
{
|
|
if (!mFineGrainTimerInUse)
|
|
return;
|
|
if (mFineGrainResetTimerArmed)
|
|
return;
|
|
|
|
TimeDuration elapsed(TimeStamp::Now() - mLastFineGrainTimerUse);
|
|
static const TimeDuration fiveSeconds = TimeDuration::FromSeconds(5);
|
|
|
|
if (elapsed >= fiveSeconds) {
|
|
NormalTimers();
|
|
return;
|
|
}
|
|
|
|
if (!mFineGrainResetTimer)
|
|
mFineGrainResetTimer = do_CreateInstance("@mozilla.org/timer;1");
|
|
|
|
// if we can't delay the reset, just do it now
|
|
if (!mFineGrainResetTimer) {
|
|
NormalTimers();
|
|
return;
|
|
}
|
|
|
|
// pad the callback out 100ms to avoid having to round trip this again if the
|
|
// timer calls back just a tad early.
|
|
SOCKET_LOG(("EventTokenBucket::WantNormalTimers %p "
|
|
"Will reset timer granularity after delay", this));
|
|
|
|
mFineGrainResetTimer->InitWithCallback(
|
|
this,
|
|
static_cast<uint32_t>((fiveSeconds - elapsed).ToMilliseconds()) + 100,
|
|
nsITimer::TYPE_ONE_SHOT);
|
|
mFineGrainResetTimerArmed = true;
|
|
}
|
|
|
|
void
|
|
EventTokenBucket::FineGrainResetTimerNotify()
|
|
{
|
|
SOCKET_LOG(("EventTokenBucket::FineGrainResetTimerNotify() events = %d\n",
|
|
this, mEvents.GetSize()));
|
|
mFineGrainResetTimerArmed = false;
|
|
|
|
// If we are currently processing events then wait for the queue to drain
|
|
// before trying to reset back to normal timers again
|
|
if (!mEvents.GetSize())
|
|
WantNormalTimers();
|
|
}
|
|
|
|
#endif
|
|
|
|
} // namespace net
|
|
} // namespace mozilla
|