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

Tidy up some error values we're passing. Essentially remove the ERR_SEM

Browse Source 
errors, though these will need to be checked.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@211 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
David Reid
2002-07-14 10:10:22 +00:00
parent 16237a1692
commit dfc6d0bbbd
3 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/port.c
+7 -7
View File
@@ -348,7 +348,7 @@ delete_port(port_id id)
kfree(old_name);
// release the threads that were blocking on this port by deleting the sem
// read_port() will see the ERR_SEM_DELETED acq_sem() return value, and act accordingly
// read_port() will see the B_BAD_SEM_ID acq_sem() return value, and act accordingly
delete_sem(r_sem);
delete_sem(w_sem);
@@ -529,12 +529,12 @@ port_buffer_size_etc(port_id id,
res = acquire_sem_etc(ports[slot].read_sem, 1, flags & (B_TIMEOUT | B_CAN_INTERRUPT), timeout);
GRAB_PORT_LOCK(ports[slot]);
if (res == ERR_SEM_DELETED) {
if (res == B_BAD_SEM_ID) {
// somebody deleted the port
RELEASE_PORT_LOCK(ports[slot]);
return B_BAD_PORT_ID;
}
if (res == ERR_SEM_TIMED_OUT) {
if (res == B_TIMED_OUT) {
RELEASE_PORT_LOCK(ports[slot]);
return B_TIMED_OUT;
}
@@ -663,12 +663,12 @@ read_port_etc(port_id id,
// both threads will read in 2 different slots allocated above, simultaneously
// slot is a thread-local variable
if (res == ERR_SEM_DELETED || res == EINTR) {
if (res == B_BAD_SEM_ID || res == EINTR) {
/* somebody deleted the port or the sem went away */
return B_BAD_PORT_ID;
}
if (res == ERR_SEM_TIMED_OUT) {
if (res == B_TIMED_OUT) {
// timed out, or, if timeout=0, 'would block'
return B_BAD_PORT_ID;
}
@@ -833,12 +833,12 @@ write_port_etc(port_id id,
// both threads will write in 2 different slots allocated above, simultaneously
// slot is a thread-local variable
if (res == ERR_SEM_DELETED || res == EINTR) {
if (res == B_BAD_PORT_ID || res == EINTR) {
/* somebody deleted the port or the sem while we were waiting */
return B_BAD_PORT_ID;
}
if (res == ERR_SEM_TIMED_OUT) {
if (res == B_TIMED_OUT) {
// timed out, or, if timeout=0, 'would block'
return B_TIMED_OUT;
}