authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-07 19:11:03-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-07 19:13:21-05:00
log0720f338d4979578498aaa86766171774230a7e9
treebc1f3e4f0f07dbf1ca3568993c98288f708c39b4
parentc5885f012a2d8785d505bb3ec03a8dfab99331d2
signaturelock-open Commit is signed but in an unrecognized format.

add std.event.Loop pread and faccessat

progress towards std lib tests passing with evented I/O mode

2 files changed, 79 insertions(+), 1 deletions(-)

lib/std/event/loop.zig+78
......@@ -809,6 +809,28 @@ pub const Loop = struct {
809809 return req_node.data.msg.readv.result;
810810 }
811811
812 /// Performs an async `os.pread` using a separate thread.
813 /// `fd` must block and not return EAGAIN.
814 pub fn pread(self: *Loop, fd: os.fd_t, buf: []u8, offset: u64) os.PReadError!usize {
815 var req_node = Request.Node{
816 .data = .{
817 .msg = .{
818 .pread = .{
819 .fd = fd,
820 .buf = buf,
821 .offset = offset,
822 .result = undefined,
823 },
824 },
825 .finish = .{ .TickNode = .{ .data = @frame() } },
826 },
827 };
828 suspend {
829 self.posixFsRequest(&req_node);
830 }
831 return req_node.data.msg.pread.result;
832 }
833
812834 /// Performs an async `os.preadv` using a separate thread.
813835 /// `fd` must block and not return EAGAIN.
814836 pub fn preadv(self: *Loop, fd: os.fd_t, iov: []const os.iovec, offset: u64) os.ReadError!usize {
......@@ -895,6 +917,35 @@ pub const Loop = struct {
895917 return req_node.data.msg.pwritev.result;
896918 }
897919
920 /// Performs an async `os.faccessatZ` using a separate thread.
921 /// `fd` must block and not return EAGAIN.
922 pub fn faccessatZ(
923 self: *Loop,
924 dirfd: os.fd_t,
925 path_z: [*:0]const u8,
926 mode: u32,
927 flags: u32,
928 ) os.AccessError!void {
929 var req_node = Request.Node{
930 .data = .{
931 .msg = .{
932 .faccessat = .{
933 .dirfd = dirfd,
934 .path = path_z,
935 .mode = mode,
936 .flags = flags,
937 .result = undefined,
938 },
939 },
940 .finish = .{ .TickNode = .{ .data = @frame() } },
941 },
942 };
943 suspend {
944 self.posixFsRequest(&req_node);
945 }
946 return req_node.data.msg.faccessat.result;
947 }
948
898949 fn workerRun(self: *Loop) void {
899950 while (true) {
900951 while (true) {
......@@ -1038,6 +1089,9 @@ pub const Loop = struct {
10381089 .pwritev => |*msg| {
10391090 msg.result = noasync os.pwritev(msg.fd, msg.iov, msg.offset);
10401091 },
1092 .pread => |*msg| {
1093 msg.result = noasync os.pread(msg.fd, msg.buf, msg.offset);
1094 },
10411095 .preadv => |*msg| {
10421096 msg.result = noasync os.preadv(msg.fd, msg.iov, msg.offset);
10431097 },
......@@ -1047,6 +1101,9 @@ pub const Loop = struct {
10471101 .openat => |*msg| {
10481102 msg.result = noasync os.openatC(msg.fd, msg.path, msg.flags, msg.mode);
10491103 },
1104 .faccessat => |*msg| {
1105 msg.result = noasync os.faccessatZ(msg.dirfd, msg.path, msg.mode, msg.flags);
1106 },
10501107 .close => |*msg| noasync os.close(msg.fd),
10511108 }
10521109 switch (node.data.finish) {
......@@ -1120,10 +1177,12 @@ pub const Loop = struct {
11201177 write: Write,
11211178 writev: WriteV,
11221179 pwritev: PWriteV,
1180 pread: PRead,
11231181 preadv: PReadV,
11241182 open: Open,
11251183 openat: OpenAt,
11261184 close: Close,
1185 faccessat: FAccessAt,
11271186
11281187 /// special - means the fs thread should exit
11291188 end,
......@@ -1161,6 +1220,15 @@ pub const Loop = struct {
11611220 pub const Error = os.PWriteError;
11621221 };
11631222
1223 pub const PRead = struct {
1224 fd: os.fd_t,
1225 buf: []u8,
1226 offset: usize,
1227 result: Error!usize,
1228
1229 pub const Error = os.PReadError;
1230 };
1231
11641232 pub const PReadV = struct {
11651233 fd: os.fd_t,
11661234 iov: []const os.iovec,
......@@ -1192,6 +1260,16 @@ pub const Loop = struct {
11921260 pub const Close = struct {
11931261 fd: os.fd_t,
11941262 };
1263
1264 pub const FAccessAt = struct {
1265 dirfd: os.fd_t,
1266 path: [*:0]const u8,
1267 mode: u32,
1268 flags: u32,
1269 result: Error!void,
1270
1271 pub const Error = os.AccessError;
1272 };
11951273 };
11961274 };
11971275};
lib/std/fs.zig+1-1
......@@ -1365,7 +1365,7 @@ pub const Dir = struct {
13651365 else
13661366 @as(u32, os.F_OK);
13671367 const result = if (need_async_thread)
1368 std.event.Loop.instance.?.faccessatZ(self.fd, sub_path, os_mode)
1368 std.event.Loop.instance.?.faccessatZ(self.fd, sub_path, os_mode, 0)
13691369 else
13701370 os.faccessatZ(self.fd, sub_path, os_mode, 0);
13711371 return result;