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

Removed superfluous ConditionVariableEntry::WaitStatus() checks. Wait() always

Browse Source 
returns the correct value.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34686 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-12-17 11:06:16 +00:00
parent 3ffeff0770
commit c3bc71d6e2
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/port.cpp
+4 -10
View File
@@ -1070,8 +1070,6 @@ _get_port_message_info_etc(port_id id, port_message_info* info,
// block if no message, or, if B_TIMEOUT flag set, block with timeout
status_t status = entry.Wait(flags, timeout);
if (status == B_OK && entry.WaitStatus() != B_OK)
status = entry.WaitStatus();
if (status != B_OK) {
T(Info(sPorts[slot], 0, status));
@@ -1183,11 +1181,10 @@ read_port_etc(port_id id, int32* _code, void* buffer, size_t bufferSize,
return B_BAD_PORT_ID;
}
if (status != B_OK || entry.WaitStatus() != B_OK) {
T(Read(sPorts[slot], 0,
status != B_OK ? status : entry.WaitStatus()));
if (status != B_OK) {
T(Read(sPorts[slot], 0, status));
sPorts[slot].read_count++;
return status != B_OK ? status : entry.WaitStatus();
return status;
}
}
@@ -1307,11 +1304,8 @@ writev_port_etc(port_id id, int32 msgCode, const iovec* msgVecs,
return B_BAD_PORT_ID;
}
if (status != B_OK || entry.WaitStatus() != B_OK) {
if (status == B_OK)
status = entry.WaitStatus();
if (status != B_OK)
goto error;
}
} else
sPorts[slot].write_count--;