corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1468108 - Increase the buffer size and avoid extra runnables in NS_ReadInputStreamToBuffer, r=valentin

Browse Source
This commit is contained in:
Andrea Marchesini
2018-06-17 20:30:58 -04:00
parent d36c0561d6
commit e9435cffc2
1 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
netwerk/base/nsNetUtil.cpp
View File

@@ -1520,7 +1520,7 @@ NS_NewBufferedInputStream(nsIInputStream** aResult,
namespace { namespace {
#define BUFFER_SIZE 4096 #define BUFFER_SIZE 8192
class BufferWriter final : public Runnable class BufferWriter final : public Runnable
, public nsIInputStreamCallback , public nsIInputStreamCallback
@@ -1678,64 +1678,63 @@ private:
MonitorAutoLock lock(mMonitor); MonitorAutoLock lock(mMonitor);
if (mCompleted) { while (true) {
return NS_OK; if (mCompleted) {
} return NS_OK;
if (mCount == 0) {
OperationCompleted(lock, NS_OK);
return NS_OK;
}
if (mCount == -1 && !MaybeExpandBufferSize()) {
OperationCompleted(lock, NS_ERROR_OUT_OF_MEMORY);
return NS_OK;
}
uint64_t offset = mWrittenData;
uint64_t length = mCount == -1 ? BUFFER_SIZE : mCount;
// Let's try to read it directly.
uint32_t writtenData;
nsresult rv = mAsyncInputStream->ReadSegments(NS_CopySegmentToBuffer,
static_cast<char*>(mBuffer) + offset,
length, &writtenData);
// Operation completed.
if (NS_SUCCEEDED(rv) && writtenData == 0) {
OperationCompleted(lock, NS_OK);
return NS_OK;
}
// If we succeeded, let's try to read again.
if (NS_SUCCEEDED(rv)) {
mWrittenData += writtenData;
if (mCount != -1) {
MOZ_ASSERT(mCount >= writtenData);
mCount -= writtenData;
} }
nsCOMPtr<nsIRunnable> runnable = this; if (mCount == 0) {
rv = mTaskQueue->Dispatch(runnable.forget()); OperationCompleted(lock, NS_OK);
if (NS_WARN_IF(NS_FAILED(rv))) { return NS_OK;
OperationCompleted(lock, rv);
} }
if (mCount == -1 && !MaybeExpandBufferSize()) {
OperationCompleted(lock, NS_ERROR_OUT_OF_MEMORY);
return NS_OK;
}
uint64_t offset = mWrittenData;
uint64_t length = mCount == -1 ? BUFFER_SIZE : mCount;
// Let's try to read it directly.
uint32_t writtenData;
nsresult rv = mAsyncInputStream->ReadSegments(NS_CopySegmentToBuffer,
static_cast<char*>(mBuffer) + offset,
length, &writtenData);
// Operation completed.
if (NS_SUCCEEDED(rv) && writtenData == 0) {
OperationCompleted(lock, NS_OK);
return NS_OK;
}
// If we succeeded, let's try to read again.
if (NS_SUCCEEDED(rv)) {
mWrittenData += writtenData;
if (mCount != -1) {
MOZ_ASSERT(mCount >= writtenData);
mCount -= writtenData;
}
continue;
}
// Async wait...
if (rv == NS_BASE_STREAM_WOULD_BLOCK) {
rv = mAsyncInputStream->AsyncWait(this, 0, length, mTaskQueue);
if (NS_WARN_IF(NS_FAILED(rv))) {
OperationCompleted(lock, rv);
}
return NS_OK;
}
// Error.
OperationCompleted(lock, rv);
return NS_OK; return NS_OK;
} }
// Async wait... MOZ_ASSERT_UNREACHABLE("We should not be here");
if (rv == NS_BASE_STREAM_WOULD_BLOCK) { return NS_ERROR_FAILURE;
rv = mAsyncInputStream->AsyncWait(this, 0, length, mTaskQueue);
if (NS_WARN_IF(NS_FAILED(rv))) {
OperationCompleted(lock, rv);
}
return NS_OK;
}
// Error.
OperationCompleted(lock, rv);
return NS_OK;
} }
NS_IMETHOD NS_IMETHOD