mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-02 07:28:21 +00:00
poll: fix deadlock and only record first event
This commit is contained in:
+14
-5
@@ -138,15 +138,24 @@ void poll_event(pollheader_t *header, int events) {
|
|||||||
polldata_t *next = iterator->next;
|
polldata_t *next = iterator->next;
|
||||||
spinlock_acquire(&desc->eventlock);
|
spinlock_acquire(&desc->eventlock);
|
||||||
int revents = (iterator->events | POLLHUP | POLLERR) & events;
|
int revents = (iterator->events | POLLHUP | POLLERR) & events;
|
||||||
|
bool wake = false;
|
||||||
if (revents == 0 || spinlock_try(&desc->lock) == false || spinlock_try(&desc->wakeuplock) == false) {
|
|
||||||
removefromlist(&pending, iterator);
|
|
||||||
insertinheader(header, iterator);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (desc->event == NULL && revents) {
|
if (desc->event == NULL && revents) {
|
||||||
iterator->revents = revents;
|
iterator->revents = revents;
|
||||||
desc->event = iterator;
|
desc->event = iterator;
|
||||||
|
|
||||||
|
if (spinlock_try(&desc->lock)) {
|
||||||
|
if (spinlock_try(&desc->wakeuplock)) {
|
||||||
|
wake = true;
|
||||||
|
} else {
|
||||||
|
spinlock_release(&desc->lock);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wake == false) {
|
||||||
|
removefromlist(&pending, iterator);
|
||||||
|
insertinheader(header, iterator);
|
||||||
}
|
}
|
||||||
|
|
||||||
spinlock_release(&desc->eventlock);
|
spinlock_release(&desc->eventlock);
|
||||||
|
|||||||
Reference in New Issue
Block a user