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

Bug 811683 - Changed UnixSocketRawData to take variable sizes up to 64k, r=cjones

Browse Source
This commit is contained in:
Kyle Machulis
2012-12-20 18:36:55 +08:00
parent 8ddd2af096
commit d3f01c9b65
3 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ipc/unixsocket/UnixSocket.cpp
View File

@@ -24,6 +24,8 @@
#include "nsTArray.h"
#include "nsXULAppAPI.h"
static const size_t MAX_READ_SIZE = 1 << 16;
#undef LOG
#if defined(MOZ_WIDGET_GONK)
#include <android/log.h>
@@ -585,7 +587,7 @@ UnixSocketConsumer::SendSocketData(const nsACString& aStr)
if (!mImpl) {
return false;
}
if (aStr.Length() > UnixSocketRawData::MAX_DATA_SIZE) {
if (aStr.Length() > MAX_READ_SIZE) {
return false;
}
nsCString str(aStr);
@@ -629,15 +631,14 @@ UnixSocketImpl::OnFileCanReadWithoutBlocking(int aFd)
// If so, break;
while (true) {
if (!mIncoming) {
mIncoming = new UnixSocketRawData();
ssize_t ret = read(aFd, mIncoming->mData, UnixSocketRawData::MAX_DATA_SIZE);
uint8_t data[MAX_READ_SIZE];
ssize_t ret = read(aFd, data, MAX_READ_SIZE);
if (ret <= 0) {
if (ret == -1) {
if (errno == EINTR) {
continue; // retry system call when interrupted
}
else if (errno == EAGAIN || errno == EWOULDBLOCK) {
mIncoming.forget();
return; // no data available: return and re-poll
}
// else fall through to error handling on other errno's
@@ -647,19 +648,18 @@ UnixSocketImpl::OnFileCanReadWithoutBlocking(int aFd)
#endif
// At this point, assume that we can't actually access
// the socket anymore
mIncoming.forget();
mReadWatcher.StopWatchingFileDescriptor();
mWriteWatcher.StopWatchingFileDescriptor();
nsRefPtr<SocketCloseTask> t = new SocketCloseTask(this);
NS_DispatchToMainThread(t);
return;
}
mIncoming->mData[ret] = 0;
mIncoming->mSize = ret;
mIncoming = new UnixSocketRawData(ret);
memcpy(mIncoming->mData, data, ret);
nsRefPtr<SocketReceiveTask> t =
new SocketReceiveTask(this, mIncoming.forget());
NS_DispatchToMainThread(t);
if (ret < ssize_t(UnixSocketRawData::MAX_DATA_SIZE)) {
if (ret < ssize_t(MAX_READ_SIZE)) {
return;
}
}