Merge pull request #1509 from der-teufel-programming/fix-os-O

Update usage of std.os.O
This commit is contained in:
Mitchell Hashimoto
2024-02-13 16:45:44 -08:00
committed by GitHub
2 changed files with 11 additions and 7 deletions

12
flake.lock generated
View File

@ -147,11 +147,11 @@
}, },
"nixpkgs-zig-0-12": { "nixpkgs-zig-0-12": {
"locked": { "locked": {
"lastModified": 1707614255, "lastModified": 1707846486,
"narHash": "sha256-26jDBuCgewZb+ifR3Ow6cZS/6Mz09pwC4ukKWtOjFZk=", "narHash": "sha256-ek2NESo8WPqUIuUPVs3L2rliCFofvjhR/i3ptaxfaJ4=",
"owner": "vancluever", "owner": "vancluever",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85b992eb1a8d3a3742ddb21eba7f79b0e4f2e78b", "rev": "31119ca40f326e3a6552883fa62f2df56c17a7bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +194,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707611073, "lastModified": 1707783766,
"narHash": "sha256-sMsxVKXP5TLcaVMNlRZ7KlDsYGwDdJAMtY0DKmb+7fQ=", "narHash": "sha256-kD90pK+KAzr3UrohYRqE7fWUaEg4Mv3rk1IhubiHFUM=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "aa4edff6f53e64443ca77e8d9ffe866f29e5b3d4", "rev": "06f4507d05f90a54409a5206fcfba5966eea0c03",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1470,7 +1470,11 @@ const ReadThread = struct {
// so that we can try to read from the fd in a tight loop and only // so that we can try to read from the fd in a tight loop and only
// check the quit fd occasionally. // check the quit fd occasionally.
if (std.os.fcntl(fd, std.os.F.GETFL, 0)) |flags| { if (std.os.fcntl(fd, std.os.F.GETFL, 0)) |flags| {
_ = std.os.fcntl(fd, std.os.F.SETFL, flags | std.os.O.NONBLOCK) catch |err| { _ = std.os.fcntl(
fd,
std.os.F.SETFL,
flags | @as(u32, @bitCast(std.os.O{ .NONBLOCK = true })),
) catch |err| {
log.warn("read thread failed to set flags err={}", .{err}); log.warn("read thread failed to set flags err={}", .{err});
log.warn("this isn't a fatal error, but may cause performance issues", .{}); log.warn("this isn't a fatal error, but may cause performance issues", .{});
}; };