i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Corrected the read() behavior on a read-shutdown socket. All the data

Browse Source 
that arrived before the shutdown can still be read.
* Debug some more returns.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25514 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-05-15 20:50:42 +00:00
parent 049dbc4652
commit 8a1852a447
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/unix/UnixFifo.cpp
+19 -17
View File
@@ -311,8 +311,8 @@ UnixFifo::Read(const iovec* vecs, size_t vecCount,
TRACE("[%ld] %p->UnixFifo::Read(%p, %ld, %lld)\n", find_thread(NULL), TRACE("[%ld] %p->UnixFifo::Read(%p, %ld, %lld)\n", find_thread(NULL),
this, vecs, vecCount, timeout); this, vecs, vecCount, timeout);
if (IsReadShutdown()) if (IsReadShutdown() && fBuffer.Readable() == 0)
return UNIX_FIFO_SHUTDOWN; RETURN_ERROR(UNIX_FIFO_SHUTDOWN);
UnixRequest request(vecs, vecCount, NULL); UnixRequest request(vecs, vecCount, NULL);
fReaders.Add(&request); fReaders.Add(&request);
@@ -357,10 +357,10 @@ UnixFifo::Write(const iovec* vecs, size_t vecCount,
this, vecs, vecCount, ancillaryData, timeout); this, vecs, vecCount, ancillaryData, timeout);
if (IsWriteShutdown()) if (IsWriteShutdown())
return UNIX_FIFO_SHUTDOWN; RETURN_ERROR(UNIX_FIFO_SHUTDOWN);
if (IsReadShutdown()) if (IsReadShutdown())
return EPIPE; RETURN_ERROR(EPIPE);
UnixRequest request(vecs, vecCount, ancillaryData); UnixRequest request(vecs, vecCount, ancillaryData);
fWriters.Add(&request); fWriters.Add(&request);
@@ -444,7 +444,8 @@ UnixFifo::_Read(UnixRequest& request, bigtime_t timeout)
if (fReaders.Head() != &request && timeout == 0) if (fReaders.Head() != &request && timeout == 0)
RETURN_ERROR(B_WOULD_BLOCK); RETURN_ERROR(B_WOULD_BLOCK);
while (fReaders.Head() != &request && !IsReadShutdown()) { while (fReaders.Head() != &request
&& !(IsReadShutdown() && fBuffer.Readable() == 0)) {
ConditionVariableEntry entry; ConditionVariableEntry entry;
fReadCondition.Add(&entry, B_CAN_INTERRUPT); fReadCondition.Add(&entry, B_CAN_INTERRUPT);
@@ -456,10 +457,10 @@ UnixFifo::_Read(UnixRequest& request, bigtime_t timeout)
RETURN_ERROR(error); RETURN_ERROR(error);
} }
if (IsReadShutdown())
return UNIX_FIFO_SHUTDOWN;
if (fBuffer.Readable() == 0) { if (fBuffer.Readable() == 0) {
if (IsReadShutdown())
RETURN_ERROR(UNIX_FIFO_SHUTDOWN);
if (IsWriteShutdown()) if (IsWriteShutdown())
RETURN_ERROR(0); RETURN_ERROR(0);
@@ -482,11 +483,12 @@ UnixFifo::_Read(UnixRequest& request, bigtime_t timeout)
RETURN_ERROR(error); RETURN_ERROR(error);
} }
if (IsReadShutdown()) if (fBuffer.Readable() == 0) {
return UNIX_FIFO_SHUTDOWN; if (IsReadShutdown())
RETURN_ERROR(UNIX_FIFO_SHUTDOWN);
if (fBuffer.Readable() == 0 && IsWriteShutdown()) if (IsWriteShutdown())
RETURN_ERROR(0); RETURN_ERROR(0);
}
RETURN_ERROR(fBuffer.Read(request)); RETURN_ERROR(fBuffer.Read(request));
} }
@@ -512,10 +514,10 @@ UnixFifo::_Write(UnixRequest& request, bigtime_t timeout)
} }
if (IsWriteShutdown()) if (IsWriteShutdown())
return UNIX_FIFO_SHUTDOWN; RETURN_ERROR(UNIX_FIFO_SHUTDOWN);
if (IsReadShutdown()) if (IsReadShutdown())
return EPIPE; RETURN_ERROR(EPIPE);
if (request.TotalSize() == 0) if (request.TotalSize() == 0)
return 0; return 0;
@@ -538,10 +540,10 @@ UnixFifo::_Write(UnixRequest& request, bigtime_t timeout)
} }
if (IsWriteShutdown()) if (IsWriteShutdown())
return UNIX_FIFO_SHUTDOWN; RETURN_ERROR(UNIX_FIFO_SHUTDOWN);
if (IsReadShutdown()) if (IsReadShutdown())
return EPIPE; RETURN_ERROR(EPIPE);
// write as much as we can // write as much as we can
error = fBuffer.Write(request); error = fBuffer.Write(request);