mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix race condition in linuxWaitFd

Browse Source
This commit is contained in:
Bill Nagel 2021-01-11 22:21:18 -05:00 committed by Veikka Tuominen
parent 1bd434fd18
commit cc5e5cca83
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/std/event/loop.zig
View File

@ -440,13 +440,11 @@ pub const Loop = struct {
.overlapped = ResumeNode.overlapped_init, .overlapped = ResumeNode.overlapped_init,
}, },
}; };
var need_to_delete = false; var need_to_delete = true;
defer if (need_to_delete) self.linuxRemoveFd(fd); defer if (need_to_delete) self.linuxRemoveFd(fd);
suspend { suspend {
if (self.linuxAddFd(fd, &resume_node.base, flags)) |_| { self.linuxAddFd(fd, &resume_node.base, flags) catch |err| switch (err) {
need_to_delete = true;
} else |err| switch (err) {
error.FileDescriptorNotRegistered => unreachable, error.FileDescriptorNotRegistered => unreachable,
error.OperationCausesCircularLoop => unreachable, error.OperationCausesCircularLoop => unreachable,
error.FileDescriptorIncompatibleWithEpoll => unreachable, error.FileDescriptorIncompatibleWithEpoll => unreachable,
@ -456,6 +454,7 @@ pub const Loop = struct {
error.UserResourceLimitReached, error.UserResourceLimitReached,
error.Unexpected, error.Unexpected,
=> { => {
need_to_delete = false;
// Fall back to a blocking poll(). Ideally this codepath is never hit, since // Fall back to a blocking poll(). Ideally this codepath is never hit, since
// epoll should be just fine. But this is better than incorrect behavior. // epoll should be just fine. But this is better than incorrect behavior.
var poll_flags: i16 = 0; var poll_flags: i16 = 0;
@ -479,7 +478,7 @@ pub const Loop = struct {
}; };
resume @frame(); resume @frame();
}, },
} };
} }
} }