feat: Linux/Macos open file with non-blocking

mochalins · Sep 24, 2024 · e225214 · e225214
1 parent 98f8583
commit e225214
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/src/backend/linux.zig b/src/backend/linux.zig
@@ -28,10 +28,16 @@ pub const BaudRate = b: {
 };
 
 pub fn open(path: []const u8) !std.fs.File {
-    return try std.fs.cwd().openFile(path, .{
+    var result = try std.fs.cwd().openFile(path, .{
         .mode = .read_write,
         .allow_ctty = false,
     });
+    errdefer result.close();
+
+    var fl_flags = try std.posix.fcntl(result.handle, std.posix.F.GETFL, 0);
+    fl_flags |= @as(usize, 1 << @bitOffsetOf(std.posix.O, "NONBLOCK"));
+    _ = try std.posix.fcntl(result.handle, std.posix.F.SETFL, fl_flags);
+    return result;
 }
 
 /// Configure serial port. Returns original `termios` settings on success.
@@ -79,7 +85,7 @@ pub fn configure(
     return orig_termios;
 }
 
-fn configureBaudRate(
+pub fn configureBaudRate(
     termios: *linux.termios,
     baud_rate: BaudRate,
     input_baud_rate: ?BaudRate,
@@ -139,7 +145,7 @@ fn configureBaudRate(
     ispeed.* = in_bits;
 }
 
-fn configureParity(
+pub fn configureParity(
     termios: *linux.termios,
     parity: serialport.Config.Parity,
 ) void {
@@ -151,7 +157,7 @@ fn configureParity(
     termios.iflag.IGNPAR = parity == .none;
 }
 
-fn configureFlowControl(
+pub fn configureFlowControl(
     termios: *linux.termios,
     flow_control: serialport.Config.FlowControl,
 ) void {
@@ -372,6 +378,24 @@ test {
     try std.testing.expectEqual(false, try poll(slave));
 }
 
+test "nonblock read" {
+    var master: std.fs.File = undefined;
+    var slave: std.fs.File = undefined;
+    try openVirtualPorts(&master, &slave);
+    defer master.close();
+    defer slave.close();
+
+    const config: serialport.Config = .{ .baud_rate = .B115200 };
+    const orig_master = try configure(master, config);
+    defer std.posix.tcsetattr(master.handle, .NOW, orig_master) catch {};
+    const orig_slave = try configure(slave, config);
+    defer std.posix.tcsetattr(slave.handle, .NOW, orig_slave) catch {};
+
+    var read_buffer: [16]u8 = undefined;
+    const reader_s = slave.reader();
+    try std.testing.expectEqual(0, try reader_s.read(&read_buffer));
+}
+
 test "custom baud rate" {
     var master: std.fs.File = undefined;
     var slave: std.fs.File = undefined;

diff --git a/src/backend/macos.zig b/src/backend/macos.zig
@@ -5,10 +5,16 @@ const c = @cImport({
 });
 
 pub fn open(path: []const u8) !std.fs.File {
-    return try std.fs.cwd().openFile(path, .{
+    var result = try std.fs.cwd().openFile(path, .{
         .mode = .read_write,
         .allow_ctty = false,
     });
+    errdefer result.close();
+
+    var fl_flags = try std.posix.fcntl(result.handle, std.posix.F.GETFL, 0);
+    fl_flags |= @as(usize, 1 << @bitOffsetOf(std.posix.O, "NONBLOCK"));
+    _ = try std.posix.fcntl(result.handle, std.posix.F.SETFL, fl_flags);
+    return result;
 }
 
 pub fn configure(
@@ -63,7 +69,7 @@ pub fn configure(
     return orig_termios;
 }
 
-fn configureParity(
+pub fn configureParity(
     termios: *std.posix.termios,
     parity: serialport.Config.Parity,
 ) void {
@@ -74,7 +80,7 @@ fn configureParity(
     termios.iflag.IGNPAR = parity == .none;
 }
 
-fn configureFlowControl(
+pub fn configureFlowControl(
     termios: *std.posix.termios,
     flow_control: serialport.Config.FlowControl,
 ) void {