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

kernel/events: Fix wait_for_objects.

Browse Source 
In the preceding commit, I missed that "events" was cleared
inside the select loop, making a use later on useless.

Now we don't clear it in the loop, but wait till the end
to do so. (Considering we return without clearing it in
case of out-of-memory or other problems, this may not
even be necessary, but it at least preserves existing
behavior.)
This commit is contained in:
Augustin Cavalier
2024-07-16 17:59:03 -04:00
parent 9a4c543934
commit 72b440df7d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/events/wait_for_objects.cpp
+2 -2
View File
@@ -682,7 +682,6 @@ common_wait_for_objects(object_wait_info* infos, int numInfos, uint32 flags,
infos[i].events |= B_EVENT_INVALID | B_EVENT_ERROR | B_EVENT_DISCONNECTED; infos[i].events |= B_EVENT_INVALID | B_EVENT_ERROR | B_EVENT_DISCONNECTED;
sync->set[i].selected_events = infos[i].events; sync->set[i].selected_events = infos[i].events;
sync->set[i].events = 0; sync->set[i].events = 0;
infos[i].events = 0;
if (select_object(type, object, sync->set + i, kernel) != B_OK) { if (select_object(type, object, sync->set + i, kernel) != B_OK) {
// If the object returned events as well as an error, ignore the error. // If the object returned events as well as an error, ignore the error.
@@ -705,7 +704,6 @@ common_wait_for_objects(object_wait_info* infos, int numInfos, uint32 flags,
for (int i = 0; i < numInfos; i++) { for (int i = 0; i < numInfos; i++) {
uint16 type = infos[i].type; uint16 type = infos[i].type;
if ((infos[i].events & B_EVENT_INVALID) == 0) if ((infos[i].events & B_EVENT_INVALID) == 0)
deselect_object(type, infos[i].object, sync->set + i, kernel); deselect_object(type, infos[i].object, sync->set + i, kernel);
} }
@@ -722,6 +720,8 @@ common_wait_for_objects(object_wait_info* infos, int numInfos, uint32 flags,
} else { } else {
// B_INTERRUPTED, B_TIMED_OUT, and B_WOULD_BLOCK // B_INTERRUPTED, B_TIMED_OUT, and B_WOULD_BLOCK
count = status; count = status;
for (int i = 0; i < numInfos; i++)
infos[i].events = 0;
} }
put_select_sync(sync); put_select_sync(sync);