gecko-dev/netwerk/base/EventTokenBucket.cpp
James Kitchener 2185d3a4e6 Bug 1100184 - Flatten netwerk/base/{public,src}/ directories. r=mcmanus, r=poiru
--HG--
rename : netwerk/base/src/ADivertableParentChannel.h => netwerk/base/ADivertableParentChannel.h
rename : netwerk/base/src/ArrayBufferInputStream.cpp => netwerk/base/ArrayBufferInputStream.cpp
rename : netwerk/base/src/ArrayBufferInputStream.h => netwerk/base/ArrayBufferInputStream.h
rename : netwerk/base/src/AutoClose.h => netwerk/base/AutoClose.h
rename : netwerk/base/src/BackgroundFileSaver.cpp => netwerk/base/BackgroundFileSaver.cpp
rename : netwerk/base/src/BackgroundFileSaver.h => netwerk/base/BackgroundFileSaver.h
rename : netwerk/base/src/ChannelDiverterChild.cpp => netwerk/base/ChannelDiverterChild.cpp
rename : netwerk/base/src/ChannelDiverterChild.h => netwerk/base/ChannelDiverterChild.h
rename : netwerk/base/src/ChannelDiverterParent.cpp => netwerk/base/ChannelDiverterParent.cpp
rename : netwerk/base/src/ChannelDiverterParent.h => netwerk/base/ChannelDiverterParent.h
rename : netwerk/base/src/Dashboard.cpp => netwerk/base/Dashboard.cpp
rename : netwerk/base/src/Dashboard.h => netwerk/base/Dashboard.h
rename : netwerk/base/src/DashboardTypes.h => netwerk/base/DashboardTypes.h
rename : netwerk/base/src/EventTokenBucket.cpp => netwerk/base/EventTokenBucket.cpp
rename : netwerk/base/src/EventTokenBucket.h => netwerk/base/EventTokenBucket.h
rename : netwerk/base/src/LoadContextInfo.cpp => netwerk/base/LoadContextInfo.cpp
rename : netwerk/base/src/LoadContextInfo.h => netwerk/base/LoadContextInfo.h
rename : netwerk/base/public/NetStatistics.h => netwerk/base/NetStatistics.h
rename : netwerk/base/src/NetUtil.jsm => netwerk/base/NetUtil.jsm
rename : netwerk/base/src/NetworkActivityMonitor.cpp => netwerk/base/NetworkActivityMonitor.cpp
rename : netwerk/base/src/NetworkActivityMonitor.h => netwerk/base/NetworkActivityMonitor.h
rename : netwerk/base/src/OfflineObserver.cpp => netwerk/base/OfflineObserver.cpp
rename : netwerk/base/src/OfflineObserver.h => netwerk/base/OfflineObserver.h
rename : netwerk/base/src/Predictor.cpp => netwerk/base/Predictor.cpp
rename : netwerk/base/src/Predictor.h => netwerk/base/Predictor.h
rename : netwerk/base/src/PrivateBrowsingChannel.h => netwerk/base/PrivateBrowsingChannel.h
rename : netwerk/base/src/ProxyAutoConfig.cpp => netwerk/base/ProxyAutoConfig.cpp
rename : netwerk/base/src/ProxyAutoConfig.h => netwerk/base/ProxyAutoConfig.h
rename : netwerk/base/src/RedirectChannelRegistrar.cpp => netwerk/base/RedirectChannelRegistrar.cpp
rename : netwerk/base/src/RedirectChannelRegistrar.h => netwerk/base/RedirectChannelRegistrar.h
rename : netwerk/base/public/ReferrerPolicy.h => netwerk/base/ReferrerPolicy.h
rename : netwerk/base/src/StreamingProtocolService.cpp => netwerk/base/StreamingProtocolService.cpp
rename : netwerk/base/src/StreamingProtocolService.h => netwerk/base/StreamingProtocolService.h
rename : netwerk/base/src/TLSServerSocket.cpp => netwerk/base/TLSServerSocket.cpp
rename : netwerk/base/src/TLSServerSocket.h => netwerk/base/TLSServerSocket.h
rename : netwerk/base/src/Tickler.cpp => netwerk/base/Tickler.cpp
rename : netwerk/base/src/Tickler.h => netwerk/base/Tickler.h
rename : netwerk/base/public/mozIThirdPartyUtil.idl => netwerk/base/mozIThirdPartyUtil.idl
rename : netwerk/base/public/netCore.h => netwerk/base/netCore.h
rename : netwerk/base/public/nsASocketHandler.h => netwerk/base/nsASocketHandler.h
rename : netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp => netwerk/base/nsAsyncRedirectVerifyHelper.cpp
rename : netwerk/base/public/nsAsyncRedirectVerifyHelper.h => netwerk/base/nsAsyncRedirectVerifyHelper.h
rename : netwerk/base/src/nsAsyncStreamCopier.cpp => netwerk/base/nsAsyncStreamCopier.cpp
rename : netwerk/base/src/nsAsyncStreamCopier.h => netwerk/base/nsAsyncStreamCopier.h
rename : netwerk/base/src/nsAuthInformationHolder.cpp => netwerk/base/nsAuthInformationHolder.cpp
rename : netwerk/base/src/nsAuthInformationHolder.h => netwerk/base/nsAuthInformationHolder.h
rename : netwerk/base/src/nsAutodialQt.cpp => netwerk/base/nsAutodialQt.cpp
rename : netwerk/base/src/nsAutodialQt.h => netwerk/base/nsAutodialQt.h
rename : netwerk/base/src/nsAutodialWin.cpp => netwerk/base/nsAutodialWin.cpp
rename : netwerk/base/src/nsAutodialWin.h => netwerk/base/nsAutodialWin.h
rename : netwerk/base/src/nsBase64Encoder.cpp => netwerk/base/nsBase64Encoder.cpp
rename : netwerk/base/src/nsBase64Encoder.h => netwerk/base/nsBase64Encoder.h
rename : netwerk/base/src/nsBaseChannel.cpp => netwerk/base/nsBaseChannel.cpp
rename : netwerk/base/src/nsBaseChannel.h => netwerk/base/nsBaseChannel.h
rename : netwerk/base/src/nsBaseContentStream.cpp => netwerk/base/nsBaseContentStream.cpp
rename : netwerk/base/src/nsBaseContentStream.h => netwerk/base/nsBaseContentStream.h
rename : netwerk/base/src/nsBufferedStreams.cpp => netwerk/base/nsBufferedStreams.cpp
rename : netwerk/base/src/nsBufferedStreams.h => netwerk/base/nsBufferedStreams.h
rename : netwerk/base/src/nsChannelClassifier.cpp => netwerk/base/nsChannelClassifier.cpp
rename : netwerk/base/src/nsChannelClassifier.h => netwerk/base/nsChannelClassifier.h
rename : netwerk/base/src/nsDNSPrefetch.cpp => netwerk/base/nsDNSPrefetch.cpp
rename : netwerk/base/src/nsDNSPrefetch.h => netwerk/base/nsDNSPrefetch.h
rename : netwerk/base/src/nsDirectoryIndexStream.cpp => netwerk/base/nsDirectoryIndexStream.cpp
rename : netwerk/base/src/nsDirectoryIndexStream.h => netwerk/base/nsDirectoryIndexStream.h
rename : netwerk/base/src/nsDownloader.cpp => netwerk/base/nsDownloader.cpp
rename : netwerk/base/src/nsDownloader.h => netwerk/base/nsDownloader.h
rename : netwerk/base/src/nsFileStreams.cpp => netwerk/base/nsFileStreams.cpp
rename : netwerk/base/src/nsFileStreams.h => netwerk/base/nsFileStreams.h
rename : netwerk/base/public/nsIApplicationCache.idl => netwerk/base/nsIApplicationCache.idl
rename : netwerk/base/public/nsIApplicationCacheChannel.idl => netwerk/base/nsIApplicationCacheChannel.idl
rename : netwerk/base/public/nsIApplicationCacheContainer.idl => netwerk/base/nsIApplicationCacheContainer.idl
rename : netwerk/base/public/nsIApplicationCacheService.idl => netwerk/base/nsIApplicationCacheService.idl
rename : netwerk/base/public/nsIArrayBufferInputStream.idl => netwerk/base/nsIArrayBufferInputStream.idl
rename : netwerk/base/public/nsIAsyncStreamCopier.idl => netwerk/base/nsIAsyncStreamCopier.idl
rename : netwerk/base/public/nsIAsyncStreamCopier2.idl => netwerk/base/nsIAsyncStreamCopier2.idl
rename : netwerk/base/public/nsIAsyncVerifyRedirectCallback.idl => netwerk/base/nsIAsyncVerifyRedirectCallback.idl
rename : netwerk/base/public/nsIAuthInformation.idl => netwerk/base/nsIAuthInformation.idl
rename : netwerk/base/public/nsIAuthModule.idl => netwerk/base/nsIAuthModule.idl
rename : netwerk/base/public/nsIAuthPrompt.idl => netwerk/base/nsIAuthPrompt.idl
rename : netwerk/base/public/nsIAuthPrompt2.idl => netwerk/base/nsIAuthPrompt2.idl
rename : netwerk/base/public/nsIAuthPromptAdapterFactory.idl => netwerk/base/nsIAuthPromptAdapterFactory.idl
rename : netwerk/base/public/nsIAuthPromptCallback.idl => netwerk/base/nsIAuthPromptCallback.idl
rename : netwerk/base/public/nsIAuthPromptProvider.idl => netwerk/base/nsIAuthPromptProvider.idl
rename : netwerk/base/public/nsIBackgroundFileSaver.idl => netwerk/base/nsIBackgroundFileSaver.idl
rename : netwerk/base/public/nsIBrowserSearchService.idl => netwerk/base/nsIBrowserSearchService.idl
rename : netwerk/base/public/nsIBufferedStreams.idl => netwerk/base/nsIBufferedStreams.idl
rename : netwerk/base/public/nsIByteRangeRequest.idl => netwerk/base/nsIByteRangeRequest.idl
rename : netwerk/base/public/nsICacheInfoChannel.idl => netwerk/base/nsICacheInfoChannel.idl
rename : netwerk/base/public/nsICachingChannel.idl => netwerk/base/nsICachingChannel.idl
rename : netwerk/base/public/nsICancelable.idl => netwerk/base/nsICancelable.idl
rename : netwerk/base/public/nsIChannel.idl => netwerk/base/nsIChannel.idl
rename : netwerk/base/public/nsIChannelEventSink.idl => netwerk/base/nsIChannelEventSink.idl
rename : netwerk/base/public/nsIChildChannel.idl => netwerk/base/nsIChildChannel.idl
rename : netwerk/base/public/nsIClassOfService.idl => netwerk/base/nsIClassOfService.idl
rename : netwerk/base/public/nsIContentSniffer.idl => netwerk/base/nsIContentSniffer.idl
rename : netwerk/base/public/nsICryptoFIPSInfo.idl => netwerk/base/nsICryptoFIPSInfo.idl
rename : netwerk/base/public/nsICryptoHMAC.idl => netwerk/base/nsICryptoHMAC.idl
rename : netwerk/base/public/nsICryptoHash.idl => netwerk/base/nsICryptoHash.idl
rename : netwerk/base/public/nsIDashboard.idl => netwerk/base/nsIDashboard.idl
rename : netwerk/base/public/nsIDashboardEventNotifier.idl => netwerk/base/nsIDashboardEventNotifier.idl
rename : netwerk/base/public/nsIDivertableChannel.idl => netwerk/base/nsIDivertableChannel.idl
rename : netwerk/base/public/nsIDownloader.idl => netwerk/base/nsIDownloader.idl
rename : netwerk/base/public/nsIEncodedChannel.idl => netwerk/base/nsIEncodedChannel.idl
rename : netwerk/base/public/nsIExternalProtocolHandler.idl => netwerk/base/nsIExternalProtocolHandler.idl
rename : netwerk/base/public/nsIFileStreams.idl => netwerk/base/nsIFileStreams.idl
rename : netwerk/base/public/nsIFileURL.idl => netwerk/base/nsIFileURL.idl
rename : netwerk/base/public/nsIForcePendingChannel.idl => netwerk/base/nsIForcePendingChannel.idl
rename : netwerk/base/public/nsIHttpPushListener.idl => netwerk/base/nsIHttpPushListener.idl
rename : netwerk/base/public/nsIIOService.idl => netwerk/base/nsIIOService.idl
rename : netwerk/base/public/nsIIOService2.idl => netwerk/base/nsIIOService2.idl
rename : netwerk/base/public/nsIIncrementalDownload.idl => netwerk/base/nsIIncrementalDownload.idl
rename : netwerk/base/public/nsIInputStreamChannel.idl => netwerk/base/nsIInputStreamChannel.idl
rename : netwerk/base/public/nsIInputStreamPump.idl => netwerk/base/nsIInputStreamPump.idl
rename : netwerk/base/public/nsILoadContextInfo.idl => netwerk/base/nsILoadContextInfo.idl
rename : netwerk/base/public/nsILoadGroup.idl => netwerk/base/nsILoadGroup.idl
rename : netwerk/base/public/nsILoadGroupChild.idl => netwerk/base/nsILoadGroupChild.idl
rename : netwerk/base/public/nsIMIMEInputStream.idl => netwerk/base/nsIMIMEInputStream.idl
rename : netwerk/base/public/nsIMultiPartChannel.idl => netwerk/base/nsIMultiPartChannel.idl
rename : netwerk/base/public/nsINSSErrorsService.idl => netwerk/base/nsINSSErrorsService.idl
rename : netwerk/base/public/nsINestedURI.idl => netwerk/base/nsINestedURI.idl
rename : netwerk/base/public/nsINetAddr.idl => netwerk/base/nsINetAddr.idl
rename : netwerk/base/public/nsINetUtil.idl => netwerk/base/nsINetUtil.idl
rename : netwerk/base/public/nsINetworkInterceptController.idl => netwerk/base/nsINetworkInterceptController.idl
rename : netwerk/base/public/nsINetworkLinkService.idl => netwerk/base/nsINetworkLinkService.idl
rename : netwerk/base/public/nsINetworkPredictor.idl => netwerk/base/nsINetworkPredictor.idl
rename : netwerk/base/public/nsINetworkPredictorVerifier.idl => netwerk/base/nsINetworkPredictorVerifier.idl
rename : netwerk/base/public/nsINetworkProperties.idl => netwerk/base/nsINetworkProperties.idl
rename : netwerk/base/public/nsINullChannel.idl => netwerk/base/nsINullChannel.idl
rename : netwerk/base/src/nsIOService.cpp => netwerk/base/nsIOService.cpp
rename : netwerk/base/src/nsIOService.h => netwerk/base/nsIOService.h
rename : netwerk/base/public/nsIParentChannel.idl => netwerk/base/nsIParentChannel.idl
rename : netwerk/base/public/nsIParentRedirectingChannel.idl => netwerk/base/nsIParentRedirectingChannel.idl
rename : netwerk/base/public/nsIPermission.idl => netwerk/base/nsIPermission.idl
rename : netwerk/base/public/nsIPermissionManager.idl => netwerk/base/nsIPermissionManager.idl
rename : netwerk/base/public/nsIPrivateBrowsingChannel.idl => netwerk/base/nsIPrivateBrowsingChannel.idl
rename : netwerk/base/public/nsIProgressEventSink.idl => netwerk/base/nsIProgressEventSink.idl
rename : netwerk/base/public/nsIPrompt.idl => netwerk/base/nsIPrompt.idl
rename : netwerk/base/public/nsIProtocolHandler.idl => netwerk/base/nsIProtocolHandler.idl
rename : netwerk/base/public/nsIProtocolProxyCallback.idl => netwerk/base/nsIProtocolProxyCallback.idl
rename : netwerk/base/public/nsIProtocolProxyFilter.idl => netwerk/base/nsIProtocolProxyFilter.idl
rename : netwerk/base/public/nsIProtocolProxyService.idl => netwerk/base/nsIProtocolProxyService.idl
rename : netwerk/base/public/nsIProtocolProxyService2.idl => netwerk/base/nsIProtocolProxyService2.idl
rename : netwerk/base/public/nsIProxiedChannel.idl => netwerk/base/nsIProxiedChannel.idl
rename : netwerk/base/public/nsIProxiedProtocolHandler.idl => netwerk/base/nsIProxiedProtocolHandler.idl
rename : netwerk/base/public/nsIProxyInfo.idl => netwerk/base/nsIProxyInfo.idl
rename : netwerk/base/public/nsIRandomGenerator.idl => netwerk/base/nsIRandomGenerator.idl
rename : netwerk/base/public/nsIRedirectChannelRegistrar.idl => netwerk/base/nsIRedirectChannelRegistrar.idl
rename : netwerk/base/public/nsIRedirectHistory.idl => netwerk/base/nsIRedirectHistory.idl
rename : netwerk/base/public/nsIRedirectResultListener.idl => netwerk/base/nsIRedirectResultListener.idl
rename : netwerk/base/public/nsIRequest.idl => netwerk/base/nsIRequest.idl
rename : netwerk/base/public/nsIRequestObserver.idl => netwerk/base/nsIRequestObserver.idl
rename : netwerk/base/public/nsIRequestObserverProxy.idl => netwerk/base/nsIRequestObserverProxy.idl
rename : netwerk/base/public/nsIResumableChannel.idl => netwerk/base/nsIResumableChannel.idl
rename : netwerk/base/public/nsISecretDecoderRing.idl => netwerk/base/nsISecretDecoderRing.idl
rename : netwerk/base/public/nsISecureBrowserUI.idl => netwerk/base/nsISecureBrowserUI.idl
rename : netwerk/base/public/nsISecurityEventSink.idl => netwerk/base/nsISecurityEventSink.idl
rename : netwerk/base/public/nsISecurityInfoProvider.idl => netwerk/base/nsISecurityInfoProvider.idl
rename : netwerk/base/public/nsISerializationHelper.idl => netwerk/base/nsISerializationHelper.idl
rename : netwerk/base/public/nsIServerSocket.idl => netwerk/base/nsIServerSocket.idl
rename : netwerk/base/public/nsISimpleStreamListener.idl => netwerk/base/nsISimpleStreamListener.idl
rename : netwerk/base/public/nsISiteSecurityService.idl => netwerk/base/nsISiteSecurityService.idl
rename : netwerk/base/public/nsISocketTransport.idl => netwerk/base/nsISocketTransport.idl
rename : netwerk/base/public/nsISocketTransportService.idl => netwerk/base/nsISocketTransportService.idl
rename : netwerk/base/public/nsISpeculativeConnect.idl => netwerk/base/nsISpeculativeConnect.idl
rename : netwerk/base/public/nsIStandardURL.idl => netwerk/base/nsIStandardURL.idl
rename : netwerk/base/public/nsIStreamListener.idl => netwerk/base/nsIStreamListener.idl
rename : netwerk/base/public/nsIStreamListenerTee.idl => netwerk/base/nsIStreamListenerTee.idl
rename : netwerk/base/public/nsIStreamLoader.idl => netwerk/base/nsIStreamLoader.idl
rename : netwerk/base/public/nsIStreamTransportService.idl => netwerk/base/nsIStreamTransportService.idl
rename : netwerk/base/public/nsIStreamingProtocolController.idl => netwerk/base/nsIStreamingProtocolController.idl
rename : netwerk/base/public/nsIStreamingProtocolService.idl => netwerk/base/nsIStreamingProtocolService.idl
rename : netwerk/base/public/nsISyncStreamListener.idl => netwerk/base/nsISyncStreamListener.idl
rename : netwerk/base/public/nsISystemProxySettings.idl => netwerk/base/nsISystemProxySettings.idl
rename : netwerk/base/public/nsITLSServerSocket.idl => netwerk/base/nsITLSServerSocket.idl
rename : netwerk/base/public/nsIThreadRetargetableRequest.idl => netwerk/base/nsIThreadRetargetableRequest.idl
rename : netwerk/base/public/nsIThreadRetargetableStreamListener.idl => netwerk/base/nsIThreadRetargetableStreamListener.idl
rename : netwerk/base/public/nsITimedChannel.idl => netwerk/base/nsITimedChannel.idl
rename : netwerk/base/public/nsITraceableChannel.idl => netwerk/base/nsITraceableChannel.idl
rename : netwerk/base/public/nsITransport.idl => netwerk/base/nsITransport.idl
rename : netwerk/base/public/nsIUDPSocket.idl => netwerk/base/nsIUDPSocket.idl
rename : netwerk/base/public/nsIUDPSocketFilter.idl => netwerk/base/nsIUDPSocketFilter.idl
rename : netwerk/base/public/nsIURI.idl => netwerk/base/nsIURI.idl
rename : netwerk/base/public/nsIURIChecker.idl => netwerk/base/nsIURIChecker.idl
rename : netwerk/base/public/nsIURIClassifier.idl => netwerk/base/nsIURIClassifier.idl
rename : netwerk/base/public/nsIURIWithPrincipal.idl => netwerk/base/nsIURIWithPrincipal.idl
rename : netwerk/base/public/nsIURL.idl => netwerk/base/nsIURL.idl
rename : netwerk/base/public/nsIURLParser.idl => netwerk/base/nsIURLParser.idl
rename : netwerk/base/public/nsIUnicharStreamLoader.idl => netwerk/base/nsIUnicharStreamLoader.idl
rename : netwerk/base/public/nsIUploadChannel.idl => netwerk/base/nsIUploadChannel.idl
rename : netwerk/base/public/nsIUploadChannel2.idl => netwerk/base/nsIUploadChannel2.idl
rename : netwerk/base/src/nsIncrementalDownload.cpp => netwerk/base/nsIncrementalDownload.cpp
rename : netwerk/base/src/nsInputStreamChannel.cpp => netwerk/base/nsInputStreamChannel.cpp
rename : netwerk/base/src/nsInputStreamChannel.h => netwerk/base/nsInputStreamChannel.h
rename : netwerk/base/src/nsInputStreamPump.cpp => netwerk/base/nsInputStreamPump.cpp
rename : netwerk/base/src/nsInputStreamPump.h => netwerk/base/nsInputStreamPump.h
rename : netwerk/base/src/nsLoadGroup.cpp => netwerk/base/nsLoadGroup.cpp
rename : netwerk/base/src/nsLoadGroup.h => netwerk/base/nsLoadGroup.h
rename : netwerk/base/src/nsMIMEInputStream.cpp => netwerk/base/nsMIMEInputStream.cpp
rename : netwerk/base/src/nsMIMEInputStream.h => netwerk/base/nsMIMEInputStream.h
rename : netwerk/base/src/nsMediaFragmentURIParser.cpp => netwerk/base/nsMediaFragmentURIParser.cpp
rename : netwerk/base/src/nsMediaFragmentURIParser.h => netwerk/base/nsMediaFragmentURIParser.h
rename : netwerk/base/src/nsNativeConnectionHelper.cpp => netwerk/base/nsNativeConnectionHelper.cpp
rename : netwerk/base/src/nsNativeConnectionHelper.h => netwerk/base/nsNativeConnectionHelper.h
rename : netwerk/base/src/nsNetAddr.cpp => netwerk/base/nsNetAddr.cpp
rename : netwerk/base/src/nsNetAddr.h => netwerk/base/nsNetAddr.h
rename : netwerk/base/src/nsNetSegmentUtils.h => netwerk/base/nsNetSegmentUtils.h
rename : netwerk/base/src/nsNetUtil.cpp => netwerk/base/nsNetUtil.cpp
rename : netwerk/base/public/nsNetUtil.h => netwerk/base/nsNetUtil.h
rename : netwerk/base/src/nsPACMan.cpp => netwerk/base/nsPACMan.cpp
rename : netwerk/base/src/nsPACMan.h => netwerk/base/nsPACMan.h
rename : netwerk/base/public/nsPILoadGroupInternal.idl => netwerk/base/nsPILoadGroupInternal.idl
rename : netwerk/base/public/nsPISocketTransportService.idl => netwerk/base/nsPISocketTransportService.idl
rename : netwerk/base/src/nsPreloadedStream.cpp => netwerk/base/nsPreloadedStream.cpp
rename : netwerk/base/src/nsPreloadedStream.h => netwerk/base/nsPreloadedStream.h
rename : netwerk/base/src/nsProtocolProxyService.cpp => netwerk/base/nsProtocolProxyService.cpp
rename : netwerk/base/src/nsProtocolProxyService.h => netwerk/base/nsProtocolProxyService.h
rename : netwerk/base/src/nsProxyInfo.cpp => netwerk/base/nsProxyInfo.cpp
rename : netwerk/base/src/nsProxyInfo.h => netwerk/base/nsProxyInfo.h
rename : netwerk/base/public/nsReadLine.h => netwerk/base/nsReadLine.h
rename : netwerk/base/src/nsRequestObserverProxy.cpp => netwerk/base/nsRequestObserverProxy.cpp
rename : netwerk/base/src/nsRequestObserverProxy.h => netwerk/base/nsRequestObserverProxy.h
rename : netwerk/base/src/nsSerializationHelper.cpp => netwerk/base/nsSerializationHelper.cpp
rename : netwerk/base/src/nsSerializationHelper.h => netwerk/base/nsSerializationHelper.h
rename : netwerk/base/src/nsServerSocket.cpp => netwerk/base/nsServerSocket.cpp
rename : netwerk/base/src/nsServerSocket.h => netwerk/base/nsServerSocket.h
rename : netwerk/base/src/nsSimpleNestedURI.cpp => netwerk/base/nsSimpleNestedURI.cpp
rename : netwerk/base/src/nsSimpleNestedURI.h => netwerk/base/nsSimpleNestedURI.h
rename : netwerk/base/src/nsSimpleStreamListener.cpp => netwerk/base/nsSimpleStreamListener.cpp
rename : netwerk/base/src/nsSimpleStreamListener.h => netwerk/base/nsSimpleStreamListener.h
rename : netwerk/base/src/nsSimpleURI.cpp => netwerk/base/nsSimpleURI.cpp
rename : netwerk/base/src/nsSimpleURI.h => netwerk/base/nsSimpleURI.h
rename : netwerk/base/src/nsSocketTransport2.cpp => netwerk/base/nsSocketTransport2.cpp
rename : netwerk/base/src/nsSocketTransport2.h => netwerk/base/nsSocketTransport2.h
rename : netwerk/base/src/nsSocketTransportService2.cpp => netwerk/base/nsSocketTransportService2.cpp
rename : netwerk/base/src/nsSocketTransportService2.h => netwerk/base/nsSocketTransportService2.h
rename : netwerk/base/src/nsStandardURL.cpp => netwerk/base/nsStandardURL.cpp
rename : netwerk/base/src/nsStandardURL.h => netwerk/base/nsStandardURL.h
rename : netwerk/base/src/nsStreamListenerTee.cpp => netwerk/base/nsStreamListenerTee.cpp
rename : netwerk/base/src/nsStreamListenerTee.h => netwerk/base/nsStreamListenerTee.h
rename : netwerk/base/src/nsStreamListenerWrapper.cpp => netwerk/base/nsStreamListenerWrapper.cpp
rename : netwerk/base/public/nsStreamListenerWrapper.h => netwerk/base/nsStreamListenerWrapper.h
rename : netwerk/base/src/nsStreamLoader.cpp => netwerk/base/nsStreamLoader.cpp
rename : netwerk/base/src/nsStreamLoader.h => netwerk/base/nsStreamLoader.h
rename : netwerk/base/src/nsStreamTransportService.cpp => netwerk/base/nsStreamTransportService.cpp
rename : netwerk/base/src/nsStreamTransportService.h => netwerk/base/nsStreamTransportService.h
rename : netwerk/base/src/nsSyncStreamListener.cpp => netwerk/base/nsSyncStreamListener.cpp
rename : netwerk/base/src/nsSyncStreamListener.h => netwerk/base/nsSyncStreamListener.h
rename : netwerk/base/src/nsTemporaryFileInputStream.cpp => netwerk/base/nsTemporaryFileInputStream.cpp
rename : netwerk/base/src/nsTemporaryFileInputStream.h => netwerk/base/nsTemporaryFileInputStream.h
rename : netwerk/base/src/nsTransportUtils.cpp => netwerk/base/nsTransportUtils.cpp
rename : netwerk/base/src/nsTransportUtils.h => netwerk/base/nsTransportUtils.h
rename : netwerk/base/src/nsUDPSocket.cpp => netwerk/base/nsUDPSocket.cpp
rename : netwerk/base/src/nsUDPSocket.h => netwerk/base/nsUDPSocket.h
rename : netwerk/base/src/nsURIChecker.cpp => netwerk/base/nsURIChecker.cpp
rename : netwerk/base/src/nsURIChecker.h => netwerk/base/nsURIChecker.h
rename : netwerk/base/public/nsURIHashKey.h => netwerk/base/nsURIHashKey.h
rename : netwerk/base/src/nsURLHelper.cpp => netwerk/base/nsURLHelper.cpp
rename : netwerk/base/src/nsURLHelper.h => netwerk/base/nsURLHelper.h
rename : netwerk/base/src/nsURLHelperOSX.cpp => netwerk/base/nsURLHelperOSX.cpp
rename : netwerk/base/src/nsURLHelperUnix.cpp => netwerk/base/nsURLHelperUnix.cpp
rename : netwerk/base/src/nsURLHelperWin.cpp => netwerk/base/nsURLHelperWin.cpp
rename : netwerk/base/src/nsURLParsers.cpp => netwerk/base/nsURLParsers.cpp
rename : netwerk/base/src/nsURLParsers.h => netwerk/base/nsURLParsers.h
rename : netwerk/base/src/nsUnicharStreamLoader.cpp => netwerk/base/nsUnicharStreamLoader.cpp
rename : netwerk/base/src/nsUnicharStreamLoader.h => netwerk/base/nsUnicharStreamLoader.h
rename : netwerk/base/public/security-prefs.js => netwerk/base/security-prefs.js
extra : rebase_source : 1c3a3af5609aceeb11b12604aeda6f864fbcd5e0
2015-01-20 03:58:00 -05:00

439 lines
10 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 "nsNetUtil.h"
#include "nsSocketTransportService2.h"
#ifdef DEBUG
#include "MainThreadUtils.h"
#endif
#ifdef XP_WIN
#include <windows.h>
#include <mmsystem.h>
#endif
extern PRThread *gSocketThread;
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
{
MOZ_COUNT_CTOR(EventTokenBucket);
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()));
MOZ_COUNT_DTOR(EventTokenBucket);
if (mTimer && mTimerArmed)
mTimer->Cancel();
#ifdef XP_WIN
NormalTimers();
if (mFineGrainResetTimerArmed) {
mFineGrainResetTimerArmed = false;
mFineGrainResetTimer->Cancel();
}
#endif
// Complete any queued events to prevent hangs
while (mEvents.GetSize()) {
nsRefPtr<TokenBucketCancelable> cancelable =
dont_AddRef(static_cast<TokenBucketCancelable *>(mEvents.PopFront()));
cancelable->Fire();
}
}
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();
}
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();
nsRefPtr<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) {
nsRefPtr<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
} // mozilla::net
} // mozilla