gecko-dev/netwerk/base/nsInputStreamPump.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

774 lines
26 KiB
C++

/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* vim:set ts=4 sts=4 sw=4 et cin: */
/* 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 "nsIOService.h"
#include "nsInputStreamPump.h"
#include "nsIStreamTransportService.h"
#include "nsISeekableStream.h"
#include "nsITransport.h"
#include "nsIThreadRetargetableStreamListener.h"
#include "nsThreadUtils.h"
#include "nsCOMPtr.h"
#include "prlog.h"
#include "GeckoProfiler.h"
#include "nsIStreamListener.h"
#include "nsILoadGroup.h"
#include "nsNetCID.h"
#include <algorithm>
static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID);
#if defined(PR_LOGGING)
//
// NSPR_LOG_MODULES=nsStreamPump:5
//
static PRLogModuleInfo *gStreamPumpLog = nullptr;
#endif
#undef LOG
#define LOG(args) PR_LOG(gStreamPumpLog, PR_LOG_DEBUG, args)
//-----------------------------------------------------------------------------
// nsInputStreamPump methods
//-----------------------------------------------------------------------------
nsInputStreamPump::nsInputStreamPump()
: mState(STATE_IDLE)
, mStreamOffset(0)
, mStreamLength(UINT64_MAX)
, mStatus(NS_OK)
, mSuspendCount(0)
, mLoadFlags(LOAD_NORMAL)
, mProcessingCallbacks(false)
, mWaitingForInputStreamReady(false)
, mCloseWhenDone(false)
, mRetargeting(false)
, mMonitor("nsInputStreamPump")
{
#if defined(PR_LOGGING)
if (!gStreamPumpLog)
gStreamPumpLog = PR_NewLogModule("nsStreamPump");
#endif
}
nsInputStreamPump::~nsInputStreamPump()
{
}
nsresult
nsInputStreamPump::Create(nsInputStreamPump **result,
nsIInputStream *stream,
int64_t streamPos,
int64_t streamLen,
uint32_t segsize,
uint32_t segcount,
bool closeWhenDone)
{
nsresult rv = NS_ERROR_OUT_OF_MEMORY;
nsRefPtr<nsInputStreamPump> pump = new nsInputStreamPump();
if (pump) {
rv = pump->Init(stream, streamPos, streamLen,
segsize, segcount, closeWhenDone);
if (NS_SUCCEEDED(rv)) {
*result = nullptr;
pump.swap(*result);
}
}
return rv;
}
struct PeekData {
PeekData(nsInputStreamPump::PeekSegmentFun fun, void* closure)
: mFunc(fun), mClosure(closure) {}
nsInputStreamPump::PeekSegmentFun mFunc;
void* mClosure;
};
static NS_METHOD
CallPeekFunc(nsIInputStream *aInStream, void *aClosure,
const char *aFromSegment, uint32_t aToOffset, uint32_t aCount,
uint32_t *aWriteCount)
{
NS_ASSERTION(aToOffset == 0, "Called more than once?");
NS_ASSERTION(aCount > 0, "Called without data?");
PeekData* data = static_cast<PeekData*>(aClosure);
data->mFunc(data->mClosure,
reinterpret_cast<const uint8_t*>(aFromSegment), aCount);
return NS_BINDING_ABORTED;
}
nsresult
nsInputStreamPump::PeekStream(PeekSegmentFun callback, void* closure)
{
ReentrantMonitorAutoEnter mon(mMonitor);
NS_ASSERTION(mAsyncStream, "PeekStream called without stream");
// See if the pipe is closed by checking the return of Available.
uint64_t dummy64;
nsresult rv = mAsyncStream->Available(&dummy64);
if (NS_FAILED(rv))
return rv;
uint32_t dummy = (uint32_t)std::min(dummy64, (uint64_t)UINT32_MAX);
PeekData data(callback, closure);
return mAsyncStream->ReadSegments(CallPeekFunc,
&data,
nsIOService::gDefaultSegmentSize,
&dummy);
}
nsresult
nsInputStreamPump::EnsureWaiting()
{
mMonitor.AssertCurrentThreadIn();
// no need to worry about multiple threads... an input stream pump lives
// on only one thread at a time.
MOZ_ASSERT(mAsyncStream);
if (!mWaitingForInputStreamReady && !mProcessingCallbacks) {
// Ensure OnStateStop is called on the main thread.
if (mState == STATE_STOP) {
nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
if (mTargetThread != mainThread) {
mTargetThread = do_QueryInterface(mainThread);
}
}
MOZ_ASSERT(mTargetThread);
nsresult rv = mAsyncStream->AsyncWait(this, 0, 0, mTargetThread);
if (NS_FAILED(rv)) {
NS_ERROR("AsyncWait failed");
return rv;
}
// Any retargeting during STATE_START or START_TRANSFER is complete
// after the call to AsyncWait; next callback wil be on mTargetThread.
mRetargeting = false;
mWaitingForInputStreamReady = true;
}
return NS_OK;
}
//-----------------------------------------------------------------------------
// nsInputStreamPump::nsISupports
//-----------------------------------------------------------------------------
// although this class can only be accessed from one thread at a time, we do
// allow its ownership to move from thread to thread, assuming the consumer
// understands the limitations of this.
NS_IMPL_ISUPPORTS(nsInputStreamPump,
nsIRequest,
nsIThreadRetargetableRequest,
nsIInputStreamCallback,
nsIInputStreamPump)
//-----------------------------------------------------------------------------
// nsInputStreamPump::nsIRequest
//-----------------------------------------------------------------------------
NS_IMETHODIMP
nsInputStreamPump::GetName(nsACString &result)
{
ReentrantMonitorAutoEnter mon(mMonitor);
result.Truncate();
return NS_OK;
}
NS_IMETHODIMP
nsInputStreamPump::IsPending(bool *result)
{
ReentrantMonitorAutoEnter mon(mMonitor);
*result = (mState != STATE_IDLE);
return NS_OK;
}
NS_IMETHODIMP
nsInputStreamPump::GetStatus(nsresult *status)
{
ReentrantMonitorAutoEnter mon(mMonitor);
*status = mStatus;
return NS_OK;
}
NS_IMETHODIMP
nsInputStreamPump::Cancel(nsresult status)
{
MOZ_ASSERT(NS_IsMainThread());
ReentrantMonitorAutoEnter mon(mMonitor);
LOG(("nsInputStreamPump::Cancel [this=%p status=%x]\n",
this, status));
if (NS_FAILED(mStatus)) {
LOG((" already canceled\n"));
return NS_OK;
}
NS_ASSERTION(NS_FAILED(status), "cancel with non-failure status code");
mStatus = status;
// close input stream
if (mAsyncStream) {
mAsyncStream->CloseWithStatus(status);
if (mSuspendCount == 0)
EnsureWaiting();
// Otherwise, EnsureWaiting will be called by Resume().
// Note that while suspended, OnInputStreamReady will
// not do anything, and also note that calling asyncWait
// on a closed stream works and will dispatch an event immediately.
}
return NS_OK;
}
NS_IMETHODIMP
nsInputStreamPump::Suspend()
{
ReentrantMonitorAutoEnter mon(mMonitor);
LOG(("nsInputStreamPump::Suspend [this=%p]\n", this));
NS_ENSURE_TRUE(mState != STATE_IDLE, NS_ERROR_UNEXPECTED);
++mSuspendCount;
return NS_OK;
}
NS_IMETHODIMP
nsInputStreamPump::Resume()
{
ReentrantMonitorAutoEnter mon(mMonitor);
LOG(("nsInputStreamPump::Resume [this=%p]\n", this));
NS_ENSURE_TRUE(mSuspendCount > 0, NS_ERROR_UNEXPECTED);
NS_ENSURE_TRUE(mState != STATE_IDLE, NS_ERROR_UNEXPECTED);
if (--mSuspendCount == 0)
EnsureWaiting();
return NS_OK;
}
NS_IMETHODIMP
nsInputStreamPump::GetLoadFlags(nsLoadFlags *aLoadFlags)
{
ReentrantMonitorAutoEnter mon(mMonitor);
*aLoadFlags = mLoadFlags;
return NS_OK;
}
NS_IMETHODIMP
nsInputStreamPump::SetLoadFlags(nsLoadFlags aLoadFlags)
{
ReentrantMonitorAutoEnter mon(mMonitor);
mLoadFlags = aLoadFlags;
return NS_OK;
}
NS_IMETHODIMP
nsInputStreamPump::GetLoadGroup(nsILoadGroup **aLoadGroup)
{
ReentrantMonitorAutoEnter mon(mMonitor);
NS_IF_ADDREF(*aLoadGroup = mLoadGroup);
return NS_OK;
}
NS_IMETHODIMP
nsInputStreamPump::SetLoadGroup(nsILoadGroup *aLoadGroup)
{
ReentrantMonitorAutoEnter mon(mMonitor);
mLoadGroup = aLoadGroup;
return NS_OK;
}
//-----------------------------------------------------------------------------
// nsInputStreamPump::nsIInputStreamPump implementation
//-----------------------------------------------------------------------------
NS_IMETHODIMP
nsInputStreamPump::Init(nsIInputStream *stream,
int64_t streamPos, int64_t streamLen,
uint32_t segsize, uint32_t segcount,
bool closeWhenDone)
{
NS_ENSURE_TRUE(mState == STATE_IDLE, NS_ERROR_IN_PROGRESS);
mStreamOffset = uint64_t(streamPos);
if (int64_t(streamLen) >= int64_t(0))
mStreamLength = uint64_t(streamLen);
mStream = stream;
mSegSize = segsize;
mSegCount = segcount;
mCloseWhenDone = closeWhenDone;
return NS_OK;
}
NS_IMETHODIMP
nsInputStreamPump::AsyncRead(nsIStreamListener *listener, nsISupports *ctxt)
{
ReentrantMonitorAutoEnter mon(mMonitor);
NS_ENSURE_TRUE(mState == STATE_IDLE, NS_ERROR_IN_PROGRESS);
NS_ENSURE_ARG_POINTER(listener);
MOZ_ASSERT(NS_IsMainThread(), "nsInputStreamPump should be read from the "
"main thread only.");
//
// OK, we need to use the stream transport service if
//
// (1) the stream is blocking
// (2) the stream does not support nsIAsyncInputStream
//
bool nonBlocking;
nsresult rv = mStream->IsNonBlocking(&nonBlocking);
if (NS_FAILED(rv)) return rv;
if (nonBlocking) {
mAsyncStream = do_QueryInterface(mStream);
//
// if the stream supports nsIAsyncInputStream, and if we need to seek
// to a starting offset, then we must do so here. in the non-async
// stream case, the stream transport service will take care of seeking
// for us.
//
if (mAsyncStream && (mStreamOffset != UINT64_MAX)) {
nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(mStream);
if (seekable)
seekable->Seek(nsISeekableStream::NS_SEEK_SET, mStreamOffset);
}
}
if (!mAsyncStream) {
// ok, let's use the stream transport service to read this stream.
nsCOMPtr<nsIStreamTransportService> sts =
do_GetService(kStreamTransportServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsITransport> transport;
rv = sts->CreateInputTransport(mStream, mStreamOffset, mStreamLength,
mCloseWhenDone, getter_AddRefs(transport));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIInputStream> wrapper;
rv = transport->OpenInputStream(0, mSegSize, mSegCount, getter_AddRefs(wrapper));
if (NS_FAILED(rv)) return rv;
mAsyncStream = do_QueryInterface(wrapper, &rv);
if (NS_FAILED(rv)) return rv;
}
// release our reference to the original stream. from this point forward,
// we only reference the "stream" via mAsyncStream.
mStream = 0;
// mStreamOffset now holds the number of bytes currently read. we use this
// to enforce the mStreamLength restriction.
mStreamOffset = 0;
// grab event queue (we must do this here by contract, since all notifications
// must go to the thread which called AsyncRead)
mTargetThread = do_GetCurrentThread();
NS_ENSURE_STATE(mTargetThread);
rv = EnsureWaiting();
if (NS_FAILED(rv)) return rv;
if (mLoadGroup)
mLoadGroup->AddRequest(this, nullptr);
mState = STATE_START;
mListener = listener;
mListenerContext = ctxt;
return NS_OK;
}
//-----------------------------------------------------------------------------
// nsInputStreamPump::nsIInputStreamCallback implementation
//-----------------------------------------------------------------------------
NS_IMETHODIMP
nsInputStreamPump::OnInputStreamReady(nsIAsyncInputStream *stream)
{
LOG(("nsInputStreamPump::OnInputStreamReady [this=%p]\n", this));
PROFILER_LABEL("nsInputStreamPump", "OnInputStreamReady",
js::ProfileEntry::Category::NETWORK);
// this function has been called from a PLEvent, so we can safely call
// any listener or progress sink methods directly from here.
for (;;) {
// There should only be one iteration of this loop happening at a time.
// To prevent AsyncWait() (called during callbacks or on other threads)
// from creating a parallel OnInputStreamReady(), we use:
// -- a monitor; and
// -- a boolean mProcessingCallbacks to detect parallel loops
// when exiting the monitor for callbacks.
ReentrantMonitorAutoEnter lock(mMonitor);
// Prevent parallel execution during callbacks, while out of monitor.
if (mProcessingCallbacks) {
MOZ_ASSERT(!mProcessingCallbacks);
break;
}
mProcessingCallbacks = true;
if (mSuspendCount || mState == STATE_IDLE) {
mWaitingForInputStreamReady = false;
mProcessingCallbacks = false;
break;
}
uint32_t nextState;
switch (mState) {
case STATE_START:
nextState = OnStateStart();
break;
case STATE_TRANSFER:
nextState = OnStateTransfer();
break;
case STATE_STOP:
mRetargeting = false;
nextState = OnStateStop();
break;
default:
nextState = 0;
NS_NOTREACHED("Unknown enum value.");
return NS_ERROR_UNEXPECTED;
}
bool stillTransferring = (mState == STATE_TRANSFER &&
nextState == STATE_TRANSFER);
if (stillTransferring) {
NS_ASSERTION(NS_SUCCEEDED(mStatus),
"Should not have failed status for ongoing transfer");
} else {
NS_ASSERTION(mState != nextState,
"Only OnStateTransfer can be called more than once.");
}
if (mRetargeting) {
NS_ASSERTION(mState != STATE_STOP,
"Retargeting should not happen during OnStateStop.");
}
// Set mRetargeting so EnsureWaiting will be called. It ensures that
// OnStateStop is called on the main thread.
if (nextState == STATE_STOP && !NS_IsMainThread()) {
mRetargeting = true;
}
// Unset mProcessingCallbacks here (while we have lock) so our own call to
// EnsureWaiting isn't blocked by it.
mProcessingCallbacks = false;
// We must break the loop when we're switching event delivery to another
// thread and the input stream pump is suspended, otherwise
// OnStateStop() might be called off the main thread. See bug 1026951
// comment #107 for the exact scenario.
if (mSuspendCount && mRetargeting) {
mState = nextState;
mWaitingForInputStreamReady = false;
break;
}
// Wait asynchronously if there is still data to transfer, or we're
// switching event delivery to another thread.
if (!mSuspendCount && (stillTransferring || mRetargeting)) {
mState = nextState;
mWaitingForInputStreamReady = false;
nsresult rv = EnsureWaiting();
if (NS_SUCCEEDED(rv))
break;
// Failure to start asynchronous wait: stop transfer.
// Do not set mStatus if it was previously set to report a failure.
if (NS_SUCCEEDED(mStatus)) {
mStatus = rv;
}
nextState = STATE_STOP;
}
mState = nextState;
}
return NS_OK;
}
uint32_t
nsInputStreamPump::OnStateStart()
{
mMonitor.AssertCurrentThreadIn();
PROFILER_LABEL("nsInputStreamPump", "OnStateStart",
js::ProfileEntry::Category::NETWORK);
LOG((" OnStateStart [this=%p]\n", this));
nsresult rv;
// need to check the reason why the stream is ready. this is required
// so our listener can check our status from OnStartRequest.
// XXX async streams should have a GetStatus method!
if (NS_SUCCEEDED(mStatus)) {
uint64_t avail;
rv = mAsyncStream->Available(&avail);
if (NS_FAILED(rv) && rv != NS_BASE_STREAM_CLOSED)
mStatus = rv;
}
{
// Note: Must exit monitor for call to OnStartRequest to avoid
// deadlocks when calls to RetargetDeliveryTo for multiple
// nsInputStreamPumps are needed (e.g. nsHttpChannel).
mMonitor.Exit();
rv = mListener->OnStartRequest(this, mListenerContext);
mMonitor.Enter();
}
// an error returned from OnStartRequest should cause us to abort; however,
// we must not stomp on mStatus if already canceled.
if (NS_FAILED(rv) && NS_SUCCEEDED(mStatus))
mStatus = rv;
return NS_SUCCEEDED(mStatus) ? STATE_TRANSFER : STATE_STOP;
}
uint32_t
nsInputStreamPump::OnStateTransfer()
{
mMonitor.AssertCurrentThreadIn();
PROFILER_LABEL("nsInputStreamPump", "OnStateTransfer",
js::ProfileEntry::Category::NETWORK);
LOG((" OnStateTransfer [this=%p]\n", this));
// if canceled, go directly to STATE_STOP...
if (NS_FAILED(mStatus))
return STATE_STOP;
nsresult rv;
uint64_t avail;
rv = mAsyncStream->Available(&avail);
LOG((" Available returned [stream=%x rv=%x avail=%llu]\n", mAsyncStream.get(), rv, avail));
if (rv == NS_BASE_STREAM_CLOSED) {
rv = NS_OK;
avail = 0;
}
else if (NS_SUCCEEDED(rv) && avail) {
// figure out how much data to report (XXX detect overflow??)
if (avail > mStreamLength - mStreamOffset)
avail = mStreamLength - mStreamOffset;
if (avail) {
// we used to limit avail to 16K - we were afraid some ODA handlers
// might assume they wouldn't get more than 16K at once
// we're removing that limit since it speeds up local file access.
// Now there's an implicit 64K limit of 4 16K segments
// NOTE: ok, so the story is as follows. OnDataAvailable impls
// are by contract supposed to consume exactly |avail| bytes.
// however, many do not... mailnews... stream converters...
// cough, cough. the input stream pump is fairly tolerant
// in this regard; however, if an ODA does not consume any
// data from the stream, then we could potentially end up in
// an infinite loop. we do our best here to try to catch
// such an error. (see bug 189672)
// in most cases this QI will succeed (mAsyncStream is almost always
// a nsPipeInputStream, which implements nsISeekableStream::Tell).
int64_t offsetBefore;
nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(mAsyncStream);
if (seekable && NS_FAILED(seekable->Tell(&offsetBefore))) {
NS_NOTREACHED("Tell failed on readable stream");
offsetBefore = 0;
}
uint32_t odaAvail =
avail > UINT32_MAX ?
UINT32_MAX : uint32_t(avail);
LOG((" calling OnDataAvailable [offset=%llu count=%llu(%u)]\n",
mStreamOffset, avail, odaAvail));
{
// Note: Must exit monitor for call to OnStartRequest to avoid
// deadlocks when calls to RetargetDeliveryTo for multiple
// nsInputStreamPumps are needed (e.g. nsHttpChannel).
mMonitor.Exit();
rv = mListener->OnDataAvailable(this, mListenerContext,
mAsyncStream, mStreamOffset,
odaAvail);
mMonitor.Enter();
}
// don't enter this code if ODA failed or called Cancel
if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(mStatus)) {
// test to see if this ODA failed to consume data
if (seekable) {
// NOTE: if Tell fails, which can happen if the stream is
// now closed, then we assume that everything was read.
int64_t offsetAfter;
if (NS_FAILED(seekable->Tell(&offsetAfter)))
offsetAfter = offsetBefore + odaAvail;
if (offsetAfter > offsetBefore)
mStreamOffset += (offsetAfter - offsetBefore);
else if (mSuspendCount == 0) {
//
// possible infinite loop if we continue pumping data!
//
// NOTE: although not allowed by nsIStreamListener, we
// will allow the ODA impl to Suspend the pump. IMAP
// does this :-(
//
NS_ERROR("OnDataAvailable implementation consumed no data");
mStatus = NS_ERROR_UNEXPECTED;
}
}
else
mStreamOffset += odaAvail; // assume ODA behaved well
}
}
}
// an error returned from Available or OnDataAvailable should cause us to
// abort; however, we must not stomp on mStatus if already canceled.
if (NS_SUCCEEDED(mStatus)) {
if (NS_FAILED(rv))
mStatus = rv;
else if (avail) {
// if stream is now closed, advance to STATE_STOP right away.
// Available may return 0 bytes available at the moment; that
// would not mean that we are done.
// XXX async streams should have a GetStatus method!
rv = mAsyncStream->Available(&avail);
if (NS_SUCCEEDED(rv))
return STATE_TRANSFER;
if (rv != NS_BASE_STREAM_CLOSED)
mStatus = rv;
}
}
return STATE_STOP;
}
nsresult
nsInputStreamPump::CallOnStateStop()
{
ReentrantMonitorAutoEnter mon(mMonitor);
MOZ_ASSERT(NS_IsMainThread(),
"CallOnStateStop should only be called on the main thread.");
mState = OnStateStop();
return NS_OK;
}
uint32_t
nsInputStreamPump::OnStateStop()
{
mMonitor.AssertCurrentThreadIn();
if (!NS_IsMainThread()) {
// Hopefully temporary hack: OnStateStop should only run on the main
// thread, but we're seeing some rare off-main-thread calls. For now
// just redispatch to the main thread in release builds, and crash in
// debug builds.
MOZ_ASSERT(NS_IsMainThread(),
"OnStateStop should only be called on the main thread.");
nsresult rv = NS_DispatchToMainThread(
NS_NewRunnableMethod(this, &nsInputStreamPump::CallOnStateStop));
NS_ENSURE_SUCCESS(rv, STATE_IDLE);
return STATE_IDLE;
}
PROFILER_LABEL("nsInputStreamPump", "OnStateStop",
js::ProfileEntry::Category::NETWORK);
LOG((" OnStateStop [this=%p status=%x]\n", this, mStatus));
// if an error occurred, we must be sure to pass the error onto the async
// stream. in some cases, this is redundant, but since close is idempotent,
// this is OK. otherwise, be sure to honor the "close-when-done" option.
if (!mAsyncStream || !mListener) {
MOZ_ASSERT(mAsyncStream, "null mAsyncStream: OnStateStop called twice?");
MOZ_ASSERT(mListener, "null mListener: OnStateStop called twice?");
return STATE_IDLE;
}
if (NS_FAILED(mStatus))
mAsyncStream->CloseWithStatus(mStatus);
else if (mCloseWhenDone)
mAsyncStream->Close();
mAsyncStream = 0;
mTargetThread = 0;
mIsPending = false;
{
// Note: Must exit monitor for call to OnStartRequest to avoid
// deadlocks when calls to RetargetDeliveryTo for multiple
// nsInputStreamPumps are needed (e.g. nsHttpChannel).
mMonitor.Exit();
mListener->OnStopRequest(this, mListenerContext, mStatus);
mMonitor.Enter();
}
mListener = 0;
mListenerContext = 0;
if (mLoadGroup)
mLoadGroup->RemoveRequest(this, nullptr, mStatus);
return STATE_IDLE;
}
//-----------------------------------------------------------------------------
// nsIThreadRetargetableRequest
//-----------------------------------------------------------------------------
NS_IMETHODIMP
nsInputStreamPump::RetargetDeliveryTo(nsIEventTarget* aNewTarget)
{
ReentrantMonitorAutoEnter mon(mMonitor);
NS_ENSURE_ARG(aNewTarget);
NS_ENSURE_TRUE(mState == STATE_START || mState == STATE_TRANSFER,
NS_ERROR_UNEXPECTED);
// If canceled, do not retarget. Return with canceled status.
if (NS_FAILED(mStatus)) {
return mStatus;
}
if (aNewTarget == mTargetThread) {
NS_WARNING("Retargeting delivery to same thread");
return NS_OK;
}
// Ensure that |mListener| and any subsequent listeners can be retargeted
// to another thread.
nsresult rv = NS_OK;
nsCOMPtr<nsIThreadRetargetableStreamListener> retargetableListener =
do_QueryInterface(mListener, &rv);
if (NS_SUCCEEDED(rv) && retargetableListener) {
rv = retargetableListener->CheckListenerChain();
if (NS_SUCCEEDED(rv)) {
mTargetThread = aNewTarget;
mRetargeting = true;
}
}
LOG(("nsInputStreamPump::RetargetDeliveryTo [this=%x aNewTarget=%p] "
"%s listener [%p] rv[%x]",
this, aNewTarget, (mTargetThread == aNewTarget ? "success" : "failure"),
(nsIStreamListener*)mListener, rv));
return rv;
}