Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved the test for being suspended inside of the main Process() loop since doRead() can suspend the transport... Also call nsSocketTransportStream::GetWriteAmount() to determine how much data can be written to the stream...

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@34782 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
1999-06-11 08:28:22 +00:00
parent 273643c438
commit 0846133faf
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mozilla/netwerk/base/src/nsSocketTransport.cpp
View File

@@ -265,20 +265,21 @@ nsresult nsSocketTransport::Process(PRInt16 aSelectFlags)
"CurrentState = %d\n",
this, aSelectFlags, mCurrentState));
//
// If the transport has been suspended, then return NS_OK immediately...
// This removes the transport from the select list...
//
if (mSuspendCount) {
PR_LOG(gSocketLog, PR_LOG_DEBUG,
("Transport [this=%x] is suspended.\n", this));
done = PR_TRUE;
rv = NS_OK;
}
while (!done)
{
//
// If the transport has been suspended, then return NS_OK immediately...
// This removes the transport from the select list...
//
if (mSuspendCount) {
PR_LOG(gSocketLog, PR_LOG_DEBUG,
("Transport [this=%x] is suspended.\n", this));
done = PR_TRUE;
rv = NS_OK;
continue;
}
switch (mCurrentState) {
case eSocketState_Created:
case eSocketState_Closed:
@@ -644,12 +645,10 @@ nsresult nsSocketTransport::doRead(PRInt16 aSelectFlags)
// Since, the data is being read into a global buffer from the net, unless
// it can all be pushed into the stream it will be lost!
//
mReadStream->GetLength(&size);
size = MAX_IO_BUFFER_SIZE - size;
rv = mReadStream->GetWriteAmount(&size);
if (size > MAX_IO_BUFFER_SIZE) {
size = MAX_IO_BUFFER_SIZE;
}
if (size > 0) {
len = PR_Read(mSocketFD, gIOBuffer, size);
if (len > 0) {
@@ -693,8 +692,10 @@ nsresult nsSocketTransport::doRead(PRInt16 aSelectFlags)
// resumed...
//
else {
mSuspendCount += 1;
mReadStream->BlockTransport();
if (0 == totalBytesWritten) {
mSuspendCount += 1;
mReadStream->BlockTransport();
}
rv = NS_BASE_STREAM_WOULD_BLOCK;
}
}