authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-16 19:47:58-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-19 19:57:37-07:00
log93378e2e7be964a7362a9875e3292e9d6a697177
tree0b19c42423bdd2f346fe5c3cdb86292d9f976b50
parenta0d16829215f56fe42548f1014cba0f2df5a1609

std.zig: finish updating to new I/O API

14 files changed, 201 insertions(+), 546 deletions(-)

lib/compiler/objcopy.zig+9-9
......@@ -10,6 +10,9 @@ const assert = std.debug.assert;
1010const fatal = std.process.fatal;
1111const Server = std.zig.Server;
1212
13var stdin_buffer: [1024]u8 = undefined;
14var stdout_buffer: [1024]u8 = undefined;
15
1316pub fn main() !void {
1417 var arena_instance = std.heap.ArenaAllocator.init(std.heap.page_allocator);
1518 defer arena_instance.deinit();
......@@ -22,11 +25,8 @@ pub fn main() !void {
2225 return cmdObjCopy(gpa, arena, args[1..]);
2326}
2427
25fn cmdObjCopy(
26 gpa: Allocator,
27 arena: Allocator,
28 args: []const []const u8,
29) !void {
28fn cmdObjCopy(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
29 _ = gpa;
3030 var i: usize = 0;
3131 var opt_out_fmt: ?std.Target.ObjectFormat = null;
3232 var opt_input: ?[]const u8 = null;
......@@ -225,13 +225,13 @@ fn cmdObjCopy(
225225 }
226226
227227 if (listen) {
228 var stdin_reader = fs.File.stdin().reader(&stdin_buffer);
229 var stdout_writer = fs.File.stdout().writer(&stdout_buffer);
228230 var server = try Server.init(.{
229 .gpa = gpa,
230 .in = .stdin(),
231 .out = .stdout(),
231 .in = &stdin_reader.interface,
232 .out = &stdout_writer.interface,
232233 .zig_version = builtin.zig_version_string,
233234 });
234 defer server.deinit();
235235
236236 var seen_update = false;
237237 while (true) {
lib/compiler/resinator/main.zig+4-2
......@@ -13,6 +13,8 @@ const hasDisjointCodePage = @import("disjoint_code_page.zig").hasDisjointCodePag
1313const fmtResourceType = @import("res.zig").NameOrOrdinal.fmtResourceType;
1414const aro = @import("aro");
1515
16var stdout_buffer: [1024]u8 = undefined;
17
1618pub fn main() !void {
1719 var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init;
1820 defer std.debug.assert(gpa.deinit() == .ok);
......@@ -41,12 +43,12 @@ pub fn main() !void {
4143 cli_args = args[3..];
4244 }
4345
46 var stdout_writer2 = std.fs.File.stdout().writer(&stdout_buffer);
4447 var error_handler: ErrorHandler = switch (zig_integration) {
4548 true => .{
4649 .server = .{
47 .out = std.fs.File.stdout(),
50 .out = &stdout_writer2.interface,
4851 .in = undefined, // won't be receiving messages
49 .receive_fifo = undefined, // won't be receiving messages
5052 },
5153 },
5254 false => .{
lib/compiler/test_runner.zig+6-5
......@@ -2,7 +2,6 @@
22const builtin = @import("builtin");
33
44const std = @import("std");
5const io = std.io;
65const testing = std.testing;
76const assert = std.debug.assert;
87
......@@ -13,6 +12,8 @@ pub const std_options: std.Options = .{
1312var log_err_count: usize = 0;
1413var fba_buffer: [8192]u8 = undefined;
1514var fba = std.heap.FixedBufferAllocator.init(&fba_buffer);
15var stdin_buffer: [std.heap.page_size_min]u8 align(std.heap.page_size_min) = undefined;
16var stdout_buffer: [std.heap.page_size_min]u8 align(std.heap.page_size_min) = undefined;
1617
1718const crippled = switch (builtin.zig_backend) {
1819 .stage2_powerpc,
......@@ -67,13 +68,13 @@ pub fn main() void {
6768
6869fn mainServer() !void {
6970 @disableInstrumentation();
71 var stdin_reader = std.fs.File.stdin().reader(&stdin_buffer);
72 var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
7073 var server = try std.zig.Server.init(.{
71 .gpa = fba.allocator(),
72 .in = .stdin(),
73 .out = .stdout(),
74 .in = &stdin_reader.interface,
75 .out = &stdout_writer.interface,
7476 .zig_version = builtin.zig_version_string,
7577 });
76 defer server.deinit();
7778
7879 if (builtin.fuzz) {
7980 const coverage_id = fuzzer_coverage_id();
lib/std/zig.zig+1
......@@ -905,4 +905,5 @@ test {
905905 _ = system;
906906 _ = target;
907907 _ = c_translation;
908 _ = llvm;
908909}
lib/std/zig/LibCInstallation.zig+3-4
......@@ -370,7 +370,7 @@ fn findNativeIncludeDirWindows(
370370
371371 for (installs) |install| {
372372 result_buf.shrinkAndFree(0);
373 try result_buf.writer().print("{s}\\Include\\{s}\\ucrt", .{ install.path, install.version });
373 try result_buf.print("{s}\\Include\\{s}\\ucrt", .{ install.path, install.version });
374374
375375 var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
376376 error.FileNotFound,
......@@ -417,7 +417,7 @@ fn findNativeCrtDirWindows(
417417
418418 for (installs) |install| {
419419 result_buf.shrinkAndFree(0);
420 try result_buf.writer().print("{s}\\Lib\\{s}\\ucrt\\{s}", .{ install.path, install.version, arch_sub_dir });
420 try result_buf.print("{s}\\Lib\\{s}\\ucrt\\{s}", .{ install.path, install.version, arch_sub_dir });
421421
422422 var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
423423 error.FileNotFound,
......@@ -484,8 +484,7 @@ fn findNativeKernel32LibDir(
484484
485485 for (installs) |install| {
486486 result_buf.shrinkAndFree(0);
487 const stream = result_buf.writer();
488 try stream.print("{s}\\Lib\\{s}\\um\\{s}", .{ install.path, install.version, arch_sub_dir });
487 try result_buf.print("{s}\\Lib\\{s}\\um\\{s}", .{ install.path, install.version, arch_sub_dir });
489488
490489 var dir = fs.cwd().openDir(result_buf.items, .{}) catch |err| switch (err) {
491490 error.FileNotFound,
lib/std/zig/Server.zig+57-157
......@@ -1,6 +1,20 @@
1in: std.fs.File,
2out: std.fs.File,
3receive_fifo: std.fifo.LinearFifo(u8, .Dynamic),
1const Server = @This();
2
3const builtin = @import("builtin");
4
5const std = @import("std");
6const Allocator = std.mem.Allocator;
7const assert = std.debug.assert;
8const native_endian = builtin.target.cpu.arch.endian();
9const need_bswap = native_endian != .little;
10const Cache = std.Build.Cache;
11const OutMessage = std.zig.Server.Message;
12const InMessage = std.zig.Client.Message;
13const Reader = std.Io.Reader;
14const Writer = std.Io.Writer;
15
16in: *Reader,
17out: *Writer,
418
519pub const Message = struct {
620 pub const Header = extern struct {
......@@ -94,9 +108,8 @@ pub const Message = struct {
94108};
95109
96110pub const Options = struct {
97 gpa: Allocator,
98 in: std.fs.File,
99 out: std.fs.File,
111 in: *Reader,
112 out: *Writer,
100113 zig_version: []const u8,
101114};
102115
......@@ -104,96 +117,40 @@ pub fn init(options: Options) !Server {
104117 var s: Server = .{
105118 .in = options.in,
106119 .out = options.out,
107 .receive_fifo = std.fifo.LinearFifo(u8, .Dynamic).init(options.gpa),
108120 };
109121 try s.serveStringMessage(.zig_version, options.zig_version);
110122 return s;
111123}
112124
113pub fn deinit(s: *Server) void {
114 s.receive_fifo.deinit();
115 s.* = undefined;
116}
117
118125pub fn receiveMessage(s: *Server) !InMessage.Header {
119 const Header = InMessage.Header;
120 const fifo = &s.receive_fifo;
121 var last_amt_zero = false;
122
123 while (true) {
124 const buf = fifo.readableSlice(0);
125 assert(fifo.readableLength() == buf.len);
126 if (buf.len >= @sizeOf(Header)) {
127 const header: *align(1) const Header = @ptrCast(buf[0..@sizeOf(Header)]);
128 const bytes_len = bswap(header.bytes_len);
129 const tag = bswap(header.tag);
130
131 if (buf.len - @sizeOf(Header) >= bytes_len) {
132 fifo.discard(@sizeOf(Header));
133 return .{
134 .tag = tag,
135 .bytes_len = bytes_len,
136 };
137 } else {
138 const needed = bytes_len - (buf.len - @sizeOf(Header));
139 const write_buffer = try fifo.writableWithSize(needed);
140 const amt = try s.in.read(write_buffer);
141 fifo.update(amt);
142 continue;
143 }
144 }
145
146 const write_buffer = try fifo.writableWithSize(256);
147 const amt = try s.in.read(write_buffer);
148 fifo.update(amt);
149 if (amt == 0) {
150 if (last_amt_zero) return error.BrokenPipe;
151 last_amt_zero = true;
152 }
153 }
126 return s.in.takeStruct(InMessage.Header, .little);
154127}
155128
156129pub fn receiveBody_u32(s: *Server) !u32 {
157 const fifo = &s.receive_fifo;
158 const buf = fifo.readableSlice(0);
159 const result = @as(*align(1) const u32, @ptrCast(buf[0..4])).*;
160 fifo.discard(4);
161 return bswap(result);
130 return s.in.takeInt(u32, .little);
162131}
163132
164133pub fn serveStringMessage(s: *Server, tag: OutMessage.Tag, msg: []const u8) !void {
165 return s.serveMessage(.{
134 try s.serveMessageHeader(.{
166135 .tag = tag,
167 .bytes_len = @as(u32, @intCast(msg.len)),
168 }, &.{msg});
136 .bytes_len = @intCast(msg.len),
137 });
138 try s.out.writeAll(msg);
139 try s.out.flush();
169140}
170141
171pub fn serveMessage(
172 s: *const Server,
173 header: OutMessage.Header,
174 bufs: []const []const u8,
175) !void {
176 var iovecs: [10]std.posix.iovec_const = undefined;
177 const header_le = bswap(header);
178 iovecs[0] = .{
179 .base = @as([*]const u8, @ptrCast(&header_le)),
180 .len = @sizeOf(OutMessage.Header),
181 };
182 for (bufs, iovecs[1 .. bufs.len + 1]) |buf, *iovec| {
183 iovec.* = .{
184 .base = buf.ptr,
185 .len = buf.len,
186 };
187 }
188 try s.out.writevAll(iovecs[0 .. bufs.len + 1]);
142/// Don't forget to flush!
143pub fn serveMessageHeader(s: *const Server, header: OutMessage.Header) !void {
144 try s.out.writeStruct(header, .little);
189145}
190146
191pub fn serveU64Message(s: *Server, tag: OutMessage.Tag, int: u64) !void {
192 const msg_le = bswap(int);
193 return s.serveMessage(.{
147pub fn serveU64Message(s: *const Server, tag: OutMessage.Tag, int: u64) !void {
148 try serveMessageHeader(s, .{
194149 .tag = tag,
195150 .bytes_len = @sizeOf(u64),
196 }, &.{std.mem.asBytes(&msg_le)});
151 });
152 try s.out.writeInt(u64, int, .little);
153 try s.out.flush();
197154}
198155
199156pub fn serveEmitDigest(
......@@ -201,26 +158,22 @@ pub fn serveEmitDigest(
201158 digest: *const [Cache.bin_digest_len]u8,
202159 header: OutMessage.EmitDigest,
203160) !void {
204 try s.serveMessage(.{
161 try s.serveMessageHeader(.{
205162 .tag = .emit_digest,
206163 .bytes_len = @intCast(digest.len + @sizeOf(OutMessage.EmitDigest)),
207 }, &.{
208 std.mem.asBytes(&header),
209 digest,
210164 });
165 try s.out.writeStruct(header, .little);
166 try s.out.writeAll(digest);
167 try s.out.flush();
211168}
212169
213pub fn serveTestResults(
214 s: *Server,
215 msg: OutMessage.TestResults,
216) !void {
217 const msg_le = bswap(msg);
218 try s.serveMessage(.{
170pub fn serveTestResults(s: *Server, msg: OutMessage.TestResults) !void {
171 try s.serveMessageHeader(.{
219172 .tag = .test_results,
220173 .bytes_len = @intCast(@sizeOf(OutMessage.TestResults)),
221 }, &.{
222 std.mem.asBytes(&msg_le),
223174 });
175 try s.out.writeStruct(msg, .little);
176 try s.out.flush();
224177}
225178
226179pub fn serveErrorBundle(s: *Server, error_bundle: std.zig.ErrorBundle) !void {
......@@ -230,91 +183,38 @@ pub fn serveErrorBundle(s: *Server, error_bundle: std.zig.ErrorBundle) !void {
230183 };
231184 const bytes_len = @sizeOf(OutMessage.ErrorBundle) +
232185 4 * error_bundle.extra.len + error_bundle.string_bytes.len;
233 try s.serveMessage(.{
186 try s.serveMessageHeader(.{
234187 .tag = .error_bundle,
235188 .bytes_len = @intCast(bytes_len),
236 }, &.{
237 std.mem.asBytes(&eb_hdr),
238 // TODO: implement @ptrCast between slices changing the length
239 std.mem.sliceAsBytes(error_bundle.extra),
240 error_bundle.string_bytes,
241189 });
190 try s.out.writeStruct(eb_hdr, .little);
191 try s.out.writeSliceEndian(u32, error_bundle.extra, .little);
192 try s.out.writeAll(error_bundle.string_bytes);
193 try s.out.flush();
242194}
243195
244196pub const TestMetadata = struct {
245 names: []u32,
246 expected_panic_msgs: []u32,
197 names: []const u32,
198 expected_panic_msgs: []const u32,
247199 string_bytes: []const u8,
248200};
249201
250202pub fn serveTestMetadata(s: *Server, test_metadata: TestMetadata) !void {
251203 const header: OutMessage.TestMetadata = .{
252 .tests_len = bswap(@as(u32, @intCast(test_metadata.names.len))),
253 .string_bytes_len = bswap(@as(u32, @intCast(test_metadata.string_bytes.len))),
204 .tests_len = @as(u32, @intCast(test_metadata.names.len)),
205 .string_bytes_len = @as(u32, @intCast(test_metadata.string_bytes.len)),
254206 };
255207 const trailing = 2;
256208 const bytes_len = @sizeOf(OutMessage.TestMetadata) +
257209 trailing * @sizeOf(u32) * test_metadata.names.len + test_metadata.string_bytes.len;
258210
259 if (need_bswap) {
260 bswap_u32_array(test_metadata.names);
261 bswap_u32_array(test_metadata.expected_panic_msgs);
262 }
263 defer if (need_bswap) {
264 bswap_u32_array(test_metadata.names);
265 bswap_u32_array(test_metadata.expected_panic_msgs);
266 };
267
268 return s.serveMessage(.{
211 try s.serveMessageHeader(.{
269212 .tag = .test_metadata,
270213 .bytes_len = @intCast(bytes_len),
271 }, &.{
272 std.mem.asBytes(&header),
273 // TODO: implement @ptrCast between slices changing the length
274 std.mem.sliceAsBytes(test_metadata.names),
275 std.mem.sliceAsBytes(test_metadata.expected_panic_msgs),
276 test_metadata.string_bytes,
277214 });
215 try s.out.writeStruct(header, .little);
216 try s.out.writeSliceEndian(u32, test_metadata.names, .little);
217 try s.out.writeSliceEndian(u32, test_metadata.expected_panic_msgs, .little);
218 try s.out.writeAll(test_metadata.string_bytes);
219 try s.out.flush();
278220}
279
280fn bswap(x: anytype) @TypeOf(x) {
281 if (!need_bswap) return x;
282
283 const T = @TypeOf(x);
284 switch (@typeInfo(T)) {
285 .@"enum" => return @as(T, @enumFromInt(@byteSwap(@intFromEnum(x)))),
286 .int => return @byteSwap(x),
287 .@"struct" => |info| switch (info.layout) {
288 .@"extern" => {
289 var result: T = undefined;
290 inline for (info.fields) |field| {
291 @field(result, field.name) = bswap(@field(x, field.name));
292 }
293 return result;
294 },
295 .@"packed" => {
296 const I = info.backing_integer.?;
297 return @as(T, @bitCast(@byteSwap(@as(I, @bitCast(x)))));
298 },
299 .auto => @compileError("auto layout struct"),
300 },
301 else => @compileError("bswap on type " ++ @typeName(T)),
302 }
303}
304
305fn bswap_u32_array(slice: []u32) void {
306 comptime assert(need_bswap);
307 for (slice) |*elem| elem.* = @byteSwap(elem.*);
308}
309
310const OutMessage = std.zig.Server.Message;
311const InMessage = std.zig.Client.Message;
312
313const Server = @This();
314const builtin = @import("builtin");
315const std = @import("std");
316const Allocator = std.mem.Allocator;
317const assert = std.debug.assert;
318const native_endian = builtin.target.cpu.arch.endian();
319const need_bswap = native_endian != .little;
320const Cache = std.Build.Cache;
lib/std/zig/WindowsSdk.zig+7-7
......@@ -1,11 +1,12 @@
1const WindowsSdk = @This();
2const builtin = @import("builtin");
3const std = @import("std");
4const Writer = std.Io.Writer;
5
16windows10sdk: ?Installation,
27windows81sdk: ?Installation,
38msvc_lib_dir: ?[]const u8,
49
5const WindowsSdk = @This();
6const std = @import("std");
7const builtin = @import("builtin");
8
910const windows = std.os.windows;
1011const RRF = windows.advapi32.RRF;
1112
......@@ -759,14 +760,13 @@ const MsvcLibDir = struct {
759760 while (instances_dir_it.next() catch return error.PathNotFound) |entry| {
760761 if (entry.kind != .directory) continue;
761762
762 var fbs = std.io.fixedBufferStream(&state_subpath_buf);
763 const writer = fbs.writer();
763 var writer: Writer = .fixed(&state_subpath_buf);
764764
765765 writer.writeAll(entry.name) catch unreachable;
766766 writer.writeByte(std.fs.path.sep) catch unreachable;
767767 writer.writeAll("state.json") catch unreachable;
768768
769 const json_contents = instances_dir.readFileAlloc(allocator, fbs.getWritten(), std.math.maxInt(usize)) catch continue;
769 const json_contents = instances_dir.readFileAlloc(allocator, writer.buffered(), std.math.maxInt(usize)) catch continue;
770770 defer allocator.free(json_contents);
771771
772772 var parsed = std.json.parseFromSlice(std.json.Value, allocator, json_contents, .{}) catch continue;
lib/std/zig/llvm.zig+6
......@@ -1,3 +1,9 @@
11pub const BitcodeReader = @import("llvm/BitcodeReader.zig");
22pub const bitcode_writer = @import("llvm/bitcode_writer.zig");
33pub const Builder = @import("llvm/Builder.zig");
4
5test {
6 _ = BitcodeReader;
7 _ = bitcode_writer;
8 _ = Builder;
9}
lib/std/zig/llvm/BitcodeReader.zig+16-12
......@@ -1,6 +1,11 @@
1const BitcodeReader = @This();
2
3const std = @import("../../std.zig");
4const assert = std.debug.assert;
5
16allocator: std.mem.Allocator,
27record_arena: std.heap.ArenaAllocator.State,
3reader: std.io.AnyReader,
8reader: *std.Io.Reader,
49keep_names: bool,
510bit_buffer: u32,
611bit_offset: u5,
......@@ -93,7 +98,7 @@ pub const Record = struct {
9398};
9499
95100pub const InitOptions = struct {
96 reader: std.io.AnyReader,
101 reader: *std.Io.Reader,
97102 keep_names: bool = false,
98103};
99104pub fn init(allocator: std.mem.Allocator, options: InitOptions) BitcodeReader {
......@@ -172,7 +177,7 @@ pub fn next(bc: *BitcodeReader) !?Item {
172177
173178pub fn skipBlock(bc: *BitcodeReader, block: Block) !void {
174179 assert(bc.bit_offset == 0);
175 try bc.reader.skipBytes(@as(u34, block.len) * 4, .{});
180 try bc.reader.discardAll(4 * @as(u34, block.len));
176181 try bc.endBlock();
177182}
178183
......@@ -371,19 +376,19 @@ fn align32Bits(bc: *BitcodeReader) void {
371376
372377fn read32Bits(bc: *BitcodeReader) !u32 {
373378 assert(bc.bit_offset == 0);
374 return bc.reader.readInt(u32, .little);
379 return bc.reader.takeInt(u32, .little);
375380}
376381
377382fn readBytes(bc: *BitcodeReader, bytes: []u8) !void {
378383 assert(bc.bit_offset == 0);
379 try bc.reader.readNoEof(bytes);
384 try bc.reader.readSliceAll(bytes);
380385
381386 const trailing_bytes = bytes.len % 4;
382387 if (trailing_bytes > 0) {
383 var bit_buffer = [1]u8{0} ** 4;
384 try bc.reader.readNoEof(bit_buffer[trailing_bytes..]);
388 var bit_buffer: [4]u8 = @splat(0);
389 try bc.reader.readSliceAll(bit_buffer[trailing_bytes..]);
385390 bc.bit_buffer = std.mem.readInt(u32, &bit_buffer, .little);
386 bc.bit_offset = @intCast(trailing_bytes * 8);
391 bc.bit_offset = @intCast(8 * trailing_bytes);
387392 }
388393}
389394
......@@ -509,7 +514,6 @@ const Abbrev = struct {
509514 };
510515};
511516
512const assert = std.debug.assert;
513const std = @import("../../std.zig");
514
515const BitcodeReader = @This();
517test {
518 _ = &skipBlock;
519}
lib/std/zig/perf_test.zig+6-8
......@@ -1,7 +1,6 @@
11const std = @import("std");
22const mem = std.mem;
33const Tokenizer = std.zig.Tokenizer;
4const io = std.io;
54const fmtIntSizeBin = std.fmt.fmtIntSizeBin;
65
76const source = @embedFile("../os.zig");
......@@ -22,16 +21,15 @@ pub fn main() !void {
2221 const bytes_per_sec_float = @as(f64, @floatFromInt(source.len * iterations)) / elapsed_s;
2322 const bytes_per_sec = @as(u64, @intFromFloat(@floor(bytes_per_sec_float)));
2423
25 var stdout_file: std.fs.File = .stdout();
26 const stdout = stdout_file.deprecatedWriter();
27 try stdout.print("parsing speed: {:.2}/s, {:.2} used \n", .{
28 fmtIntSizeBin(bytes_per_sec),
29 fmtIntSizeBin(memory_used),
30 });
24 var stdout_buffer: [1024]u8 = undefined;
25 var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
26 const stdout = &stdout_writer.interface;
27 try stdout.print("parsing speed: {Bi:.2}/s, {Bi:.2} used \n", .{ bytes_per_sec, memory_used });
28 try stdout.flush();
3129}
3230
3331fn testOnce() usize {
34 var fixed_buf_alloc = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
32 var fixed_buf_alloc = std.heap.FixedBufferAllocator.init(&fixed_buffer_mem);
3533 const allocator = fixed_buf_alloc.allocator();
3634 _ = std.zig.Ast.parse(allocator, source, .zig) catch @panic("parse failure");
3735 return fixed_buf_alloc.end_index;
lib/std/zig/system/linux.zig+17-18
......@@ -1,7 +1,6 @@
11const std = @import("std");
22const builtin = @import("builtin");
33const mem = std.mem;
4const io = std.io;
54const fs = std.fs;
65const fmt = std.fmt;
76const testing = std.testing;
......@@ -344,8 +343,8 @@ fn testParser(
344343 expected_model: *const Target.Cpu.Model,
345344 input: []const u8,
346345) !void {
347 var fbs = io.fixedBufferStream(input);
348 const result = try parser.parse(arch, fbs.reader());
346 var r: std.Io.Reader = .fixed(input);
347 const result = try parser.parse(arch, &r);
349348 try testing.expectEqual(expected_model, result.?.model);
350349 try testing.expect(expected_model.features.eql(result.?.features));
351350}
......@@ -357,20 +356,17 @@ fn testParser(
357356// When all the lines have been analyzed the finalize method is called.
358357fn CpuinfoParser(comptime impl: anytype) type {
359358 return struct {
360 fn parse(arch: Target.Cpu.Arch, reader: anytype) anyerror!?Target.Cpu {
361 var line_buf: [1024]u8 = undefined;
359 fn parse(arch: Target.Cpu.Arch, reader: *std.Io.Reader) !?Target.Cpu {
362360 var obj: impl = .{};
363
364 while (true) {
365 const line = (try reader.readUntilDelimiterOrEof(&line_buf, '\n')) orelse break;
361 while (reader.takeDelimiterExclusive('\n')) |line| {
366362 const colon_pos = mem.indexOfScalar(u8, line, ':') orelse continue;
367363 const key = mem.trimEnd(u8, line[0..colon_pos], " \t");
368364 const value = mem.trimStart(u8, line[colon_pos + 1 ..], " \t");
369
370 if (!try obj.line_hook(key, value))
371 break;
365 if (!try obj.line_hook(key, value)) break;
366 } else |err| switch (err) {
367 error.EndOfStream => {},
368 else => |e| return e,
372369 }
373
374370 return obj.finalize(arch);
375371 }
376372 };
......@@ -383,15 +379,18 @@ inline fn getAArch64CpuFeature(comptime feat_reg: []const u8) u64 {
383379}
384380
385381pub fn detectNativeCpuAndFeatures() ?Target.Cpu {
386 var f = fs.openFileAbsolute("/proc/cpuinfo", .{}) catch |err| switch (err) {
382 var file = fs.openFileAbsolute("/proc/cpuinfo", .{}) catch |err| switch (err) {
387383 else => return null,
388384 };
389 defer f.close();
385 defer file.close();
386
387 var buffer: [4096]u8 = undefined; // "flags" lines can get pretty long.
388 var file_reader = file.reader(&buffer);
390389
391390 const current_arch = builtin.cpu.arch;
392391 switch (current_arch) {
393392 .arm, .armeb, .thumb, .thumbeb => {
394 return ArmCpuinfoParser.parse(current_arch, f.deprecatedReader()) catch null;
393 return ArmCpuinfoParser.parse(current_arch, &file_reader.interface) catch null;
395394 },
396395 .aarch64, .aarch64_be => {
397396 const registers = [12]u64{
......@@ -413,13 +412,13 @@ pub fn detectNativeCpuAndFeatures() ?Target.Cpu {
413412 return core;
414413 },
415414 .sparc64 => {
416 return SparcCpuinfoParser.parse(current_arch, f.deprecatedReader()) catch null;
415 return SparcCpuinfoParser.parse(current_arch, &file_reader.interface) catch null;
417416 },
418417 .powerpc, .powerpcle, .powerpc64, .powerpc64le => {
419 return PowerpcCpuinfoParser.parse(current_arch, f.deprecatedReader()) catch null;
418 return PowerpcCpuinfoParser.parse(current_arch, &file_reader.interface) catch null;
420419 },
421420 .riscv64, .riscv32 => {
422 return RiscvCpuinfoParser.parse(current_arch, f.deprecatedReader()) catch null;
421 return RiscvCpuinfoParser.parse(current_arch, &file_reader.interface) catch null;
423422 },
424423 else => {},
425424 }
src/Compilation.zig+44-41
......@@ -12,6 +12,7 @@ const ThreadPool = std.Thread.Pool;
1212const WaitGroup = std.Thread.WaitGroup;
1313const ErrorBundle = std.zig.ErrorBundle;
1414const fatal = std.process.fatal;
15const Writer = std.io.Writer;
1516
1617const Value = @import("Value.zig");
1718const Type = @import("Type.zig");
......@@ -44,6 +45,8 @@ const Builtin = @import("Builtin.zig");
4445const LlvmObject = @import("codegen/llvm.zig").Object;
4546const dev = @import("dev.zig");
4647
48const DeprecatedLinearFifo = @import("deprecated.zig").LinearFifo;
49
4750pub const Config = @import("Compilation/Config.zig");
4851
4952/// General-purpose allocator. Used for both temporary and long-term storage.
......@@ -121,15 +124,15 @@ work_queues: [
121124 }
122125 break :len len;
123126 }
124]std.fifo.LinearFifo(Job, .Dynamic),
127]DeprecatedLinearFifo(Job),
125128
126129/// These jobs are to invoke the Clang compiler to create an object file, which
127130/// gets linked with the Compilation.
128c_object_work_queue: std.fifo.LinearFifo(*CObject, .Dynamic),
131c_object_work_queue: DeprecatedLinearFifo(*CObject),
129132
130133/// These jobs are to invoke the RC compiler to create a compiled resource file (.res), which
131134/// gets linked with the Compilation.
132win32_resource_work_queue: if (dev.env.supports(.win32_resource)) std.fifo.LinearFifo(*Win32Resource, .Dynamic) else struct {
135win32_resource_work_queue: if (dev.env.supports(.win32_resource)) DeprecatedLinearFifo(*Win32Resource) else struct {
133136 pub fn ensureUnusedCapacity(_: @This(), _: u0) error{}!void {}
134137 pub fn readItem(_: @This()) ?noreturn {
135138 return null;
......@@ -995,13 +998,13 @@ pub const CObject = struct {
995998
996999 const file = fs.cwd().openFile(file_name, .{}) catch break :source_line 0;
9971000 defer file.close();
998 file.seekTo(diag.src_loc.offset + 1 - diag.src_loc.column) catch break :source_line 0;
999
1000 var line = std.ArrayList(u8).init(eb.gpa);
1001 defer line.deinit();
1002 file.deprecatedReader().readUntilDelimiterArrayList(&line, '\n', 1 << 10) catch break :source_line 0;
1003
1004 break :source_line try eb.addString(line.items);
1001 var buffer: [1024]u8 = undefined;
1002 var file_reader = file.reader(&buffer);
1003 file_reader.seekTo(diag.src_loc.offset + 1 - diag.src_loc.column) catch break :source_line 0;
1004 var aw: Writer.Allocating = .init(eb.gpa);
1005 defer aw.deinit();
1006 _ = file_reader.interface.streamDelimiterEnding(&aw.writer, '\n') catch break :source_line 0;
1007 break :source_line try eb.addString(aw.getWritten());
10051008 };
10061009
10071010 return .{
......@@ -1067,11 +1070,11 @@ pub const CObject = struct {
10671070 }
10681071 };
10691072
1073 var buffer: [1024]u8 = undefined;
10701074 const file = try fs.cwd().openFile(path, .{});
10711075 defer file.close();
1072 var br = std.io.bufferedReader(file.deprecatedReader());
1073 const reader = br.reader();
1074 var bc = std.zig.llvm.BitcodeReader.init(gpa, .{ .reader = reader.any() });
1076 var file_reader = file.reader(&buffer);
1077 var bc = std.zig.llvm.BitcodeReader.init(gpa, .{ .reader = &file_reader.interface });
10751078 defer bc.deinit();
10761079
10771080 var file_names: std.AutoArrayHashMapUnmanaged(u32, []const u8) = .empty;
......@@ -1873,15 +1876,12 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
18731876
18741877 if (options.verbose_llvm_cpu_features) {
18751878 if (options.root_mod.resolved_target.llvm_cpu_features) |cf| print: {
1876 std.debug.lockStdErr();
1877 defer std.debug.unlockStdErr();
1878 const stderr = fs.File.stderr().deprecatedWriter();
1879 nosuspend {
1880 stderr.print("compilation: {s}\n", .{options.root_name}) catch break :print;
1881 stderr.print(" target: {s}\n", .{try target.zigTriple(arena)}) catch break :print;
1882 stderr.print(" cpu: {s}\n", .{target.cpu.model.name}) catch break :print;
1883 stderr.print(" features: {s}\n", .{cf}) catch {};
1884 }
1879 const stderr_w = std.debug.lockStderrWriter(&.{});
1880 defer std.debug.unlockStderrWriter();
1881 stderr_w.print("compilation: {s}\n", .{options.root_name}) catch break :print;
1882 stderr_w.print(" target: {s}\n", .{try target.zigTriple(arena)}) catch break :print;
1883 stderr_w.print(" cpu: {s}\n", .{target.cpu.model.name}) catch break :print;
1884 stderr_w.print(" features: {s}\n", .{cf}) catch {};
18851885 }
18861886 }
18871887
......@@ -2483,7 +2483,7 @@ pub fn destroy(comp: *Compilation) void {
24832483 if (comp.zcu) |zcu| zcu.deinit();
24842484 comp.cache_use.deinit();
24852485
2486 for (comp.work_queues) |work_queue| work_queue.deinit();
2486 for (&comp.work_queues) |*work_queue| work_queue.deinit();
24872487 comp.c_object_work_queue.deinit();
24882488 comp.win32_resource_work_queue.deinit();
24892489
......@@ -3931,11 +3931,12 @@ pub fn getAllErrorsAlloc(comp: *Compilation) !ErrorBundle {
39313931 // This AU is referenced and has a transitive compile error, meaning it referenced something with a compile error.
39323932 // However, we haven't reported any such error.
39333933 // This is a compiler bug.
3934 const stderr = fs.File.stderr().deprecatedWriter();
3935 try stderr.writeAll("referenced transitive analysis errors, but none actually emitted\n");
3936 try stderr.print("{f} [transitive failure]\n", .{zcu.fmtAnalUnit(failed_unit)});
3934 var stderr_w = std.debug.lockStderrWriter(&.{});
3935 defer std.debug.unlockStderrWriter();
3936 try stderr_w.writeAll("referenced transitive analysis errors, but none actually emitted\n");
3937 try stderr_w.print("{f} [transitive failure]\n", .{zcu.fmtAnalUnit(failed_unit)});
39373938 while (ref) |r| {
3938 try stderr.print("referenced by: {f}{s}\n", .{
3939 try stderr_w.print("referenced by: {f}{s}\n", .{
39393940 zcu.fmtAnalUnit(r.referencer),
39403941 if (zcu.transitive_failed_analysis.contains(r.referencer)) " [transitive failure]" else "",
39413942 });
......@@ -5849,7 +5850,9 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr
58495850
58505851 try child.spawn();
58515852
5852 const stderr = try child.stderr.?.deprecatedReader().readAllAlloc(arena, std.math.maxInt(usize));
5853 var small_buffer: [1]u8 = undefined;
5854 var stderr_reader = child.stderr.?.reader(&small_buffer);
5855 const stderr = try stderr_reader.interface.allocRemaining(arena, .unlimited);
58535856
58545857 const term = child.wait() catch |err| {
58555858 return comp.failCObj(c_object, "failed to spawn zig clang {s}: {s}", .{ argv.items[0], @errorName(err) });
......@@ -6213,13 +6216,10 @@ fn spawnZigRc(
62136216 const stdout = poller.fifo(.stdout);
62146217
62156218 poll: while (true) {
6216 while (stdout.readableLength() < @sizeOf(std.zig.Server.Message.Header)) {
6217 if (!(try poller.poll())) break :poll;
6218 }
6219 const header = stdout.reader().readStruct(std.zig.Server.Message.Header) catch unreachable;
6220 while (stdout.readableLength() < header.bytes_len) {
6221 if (!(try poller.poll())) break :poll;
6222 }
6219 while (stdout.readableLength() < @sizeOf(std.zig.Server.Message.Header)) if (!try poller.poll()) break :poll;
6220 var header: std.zig.Server.Message.Header = undefined;
6221 assert(stdout.read(std.mem.asBytes(&header)) == @sizeOf(std.zig.Server.Message.Header));
6222 while (stdout.readableLength() < header.bytes_len) if (!try poller.poll()) break :poll;
62236223 const body = stdout.readableSliceOfLen(header.bytes_len);
62246224
62256225 switch (header.tag) {
......@@ -7209,13 +7209,16 @@ pub fn lockAndSetMiscFailure(
72097209}
72107210
72117211pub fn dump_argv(argv: []const []const u8) void {
7212 std.debug.lockStdErr();
7213 defer std.debug.unlockStdErr();
7214 const stderr = fs.File.stderr().deprecatedWriter();
7215 for (argv[0 .. argv.len - 1]) |arg| {
7216 nosuspend stderr.print("{s} ", .{arg}) catch return;
7212 var buffer: [64]u8 = undefined;
7213 const stderr = std.debug.lockStderrWriter(&buffer);
7214 defer std.debug.unlockStderrWriter();
7215 nosuspend {
7216 for (argv) |arg| {
7217 stderr.writeAll(arg) catch return;
7218 (stderr.writableArray(1) catch return)[0] = ' ';
7219 }
7220 stderr.buffer[stderr.end - 1] = '\n';
72177221 }
7218 nosuspend stderr.print("{s}\n", .{argv[argv.len - 1]}) catch {};
72197222}
72207223
72217224pub fn getZigBackend(comp: Compilation) std.builtin.CompilerBackend {
src/deprecated.zig-262
......@@ -52,15 +52,6 @@ pub fn LinearFifo(comptime T: type) type {
5252 }
5353 }
5454
55 /// Reduce allocated capacity to `size`.
56 pub fn shrink(self: *Self, size: usize) void {
57 assert(size >= self.count);
58 self.realign();
59 self.buf = self.allocator.realloc(self.buf, size) catch |e| switch (e) {
60 error.OutOfMemory => return, // no problem, capacity is still correct then.
61 };
62 }
63
6455 /// Ensure that the buffer can fit at least `size` items
6556 pub fn ensureTotalCapacity(self: *Self, size: usize) !void {
6657 if (self.buf.len >= size) return;
......@@ -76,11 +67,6 @@ pub fn LinearFifo(comptime T: type) type {
7667 return try self.ensureTotalCapacity(math.add(usize, self.count, size) catch return error.OutOfMemory);
7768 }
7869
79 /// Returns number of items currently in fifo
80 pub fn readableLength(self: Self) usize {
81 return self.count;
82 }
83
8470 /// Returns a writable slice from the 'read' end of the fifo
8571 fn readableSliceMut(self: Self, offset: usize) []T {
8672 if (offset > self.count) return &[_]T{};
......@@ -95,22 +81,6 @@ pub fn LinearFifo(comptime T: type) type {
9581 }
9682 }
9783
98 /// Returns a readable slice from `offset`
99 pub fn readableSlice(self: Self, offset: usize) []const T {
100 return self.readableSliceMut(offset);
101 }
102
103 pub fn readableSliceOfLen(self: *Self, len: usize) []const T {
104 assert(len <= self.count);
105 const buf = self.readableSlice(0);
106 if (buf.len >= len) {
107 return buf[0..len];
108 } else {
109 self.realign();
110 return self.readableSlice(0)[0..len];
111 }
112 }
113
11484 /// Discard first `count` items in the fifo
11585 pub fn discard(self: *Self, count: usize) void {
11686 assert(count <= self.count);
......@@ -143,28 +113,6 @@ pub fn LinearFifo(comptime T: type) type {
143113 return c;
144114 }
145115
146 /// Read data from the fifo into `dst`, returns number of items copied.
147 pub fn read(self: *Self, dst: []T) usize {
148 var dst_left = dst;
149
150 while (dst_left.len > 0) {
151 const slice = self.readableSlice(0);
152 if (slice.len == 0) break;
153 const n = @min(slice.len, dst_left.len);
154 @memcpy(dst_left[0..n], slice[0..n]);
155 self.discard(n);
156 dst_left = dst_left[n..];
157 }
158
159 return dst.len - dst_left.len;
160 }
161
162 /// Same as `read` except it returns an error union
163 /// The purpose of this function existing is to match `std.io.Reader` API.
164 fn readFn(self: *Self, dest: []u8) error{}!usize {
165 return self.read(dest);
166 }
167
168116 /// Returns number of items available in fifo
169117 pub fn writableLength(self: Self) usize {
170118 return self.buf.len - self.count;
......@@ -183,20 +131,6 @@ pub fn LinearFifo(comptime T: type) type {
183131 }
184132 }
185133
186 /// Returns a writable buffer of at least `size` items, allocating memory as needed.
187 /// Use `fifo.update` once you've written data to it.
188 pub fn writableWithSize(self: *Self, size: usize) ![]T {
189 try self.ensureUnusedCapacity(size);
190
191 // try to avoid realigning buffer
192 var slice = self.writableSlice(0);
193 if (slice.len < size) {
194 self.realign();
195 slice = self.writableSlice(0);
196 }
197 return slice;
198 }
199
200134 /// Update the tail location of the buffer (usually follows use of writable/writableWithSize)
201135 pub fn update(self: *Self, count: usize) void {
202136 assert(self.count + count <= self.buf.len);
......@@ -231,201 +165,5 @@ pub fn LinearFifo(comptime T: type) type {
231165 self.buf[tail] = item;
232166 self.update(1);
233167 }
234
235 /// Appends the data in `src` to the fifo.
236 /// Allocates more memory as necessary
237 pub fn write(self: *Self, src: []const T) !void {
238 try self.ensureUnusedCapacity(src.len);
239
240 return self.writeAssumeCapacity(src);
241 }
242
243 /// Same as `write` except it returns the number of bytes written, which is always the same
244 /// as `bytes.len`. The purpose of this function existing is to match `std.io.Writer` API.
245 fn appendWrite(self: *Self, bytes: []const u8) error{OutOfMemory}!usize {
246 try self.write(bytes);
247 return bytes.len;
248 }
249
250 /// Make `count` items available before the current read location
251 fn rewind(self: *Self, count: usize) void {
252 assert(self.writableLength() >= count);
253
254 var head = self.head + (self.buf.len - count);
255 head &= self.buf.len - 1;
256 self.head = head;
257 self.count += count;
258 }
259
260 /// Place data back into the read stream
261 pub fn unget(self: *Self, src: []const T) !void {
262 try self.ensureUnusedCapacity(src.len);
263
264 self.rewind(src.len);
265
266 const slice = self.readableSliceMut(0);
267 if (src.len < slice.len) {
268 @memcpy(slice[0..src.len], src);
269 } else {
270 @memcpy(slice, src[0..slice.len]);
271 const slice2 = self.readableSliceMut(slice.len);
272 @memcpy(slice2[0 .. src.len - slice.len], src[slice.len..]);
273 }
274 }
275
276 /// Returns the item at `offset`.
277 /// Asserts offset is within bounds.
278 pub fn peekItem(self: Self, offset: usize) T {
279 assert(offset < self.count);
280
281 var index = self.head + offset;
282 index &= self.buf.len - 1;
283 return self.buf[index];
284 }
285
286 pub fn toOwnedSlice(self: *Self) Allocator.Error![]T {
287 if (self.head != 0) self.realign();
288 assert(self.head == 0);
289 assert(self.count <= self.buf.len);
290 const allocator = self.allocator;
291 if (allocator.resize(self.buf, self.count)) {
292 const result = self.buf[0..self.count];
293 self.* = Self.init(allocator);
294 return result;
295 }
296 const new_memory = try allocator.dupe(T, self.buf[0..self.count]);
297 allocator.free(self.buf);
298 self.* = Self.init(allocator);
299 return new_memory;
300 }
301168 };
302169}
303
304test "LinearFifo(u8, .Dynamic) discard(0) from empty buffer should not error on overflow" {
305 var fifo = LinearFifo(u8, .Dynamic).init(testing.allocator);
306 defer fifo.deinit();
307
308 // If overflow is not explicitly allowed this will crash in debug / safe mode
309 fifo.discard(0);
310}
311
312test "LinearFifo(u8, .Dynamic)" {
313 var fifo = LinearFifo(u8, .Dynamic).init(testing.allocator);
314 defer fifo.deinit();
315
316 try fifo.write("HELLO");
317 try testing.expectEqual(@as(usize, 5), fifo.readableLength());
318 try testing.expectEqualSlices(u8, "HELLO", fifo.readableSlice(0));
319
320 {
321 var i: usize = 0;
322 while (i < 5) : (i += 1) {
323 try fifo.write(&[_]u8{fifo.peekItem(i)});
324 }
325 try testing.expectEqual(@as(usize, 10), fifo.readableLength());
326 try testing.expectEqualSlices(u8, "HELLOHELLO", fifo.readableSlice(0));
327 }
328
329 {
330 try testing.expectEqual(@as(u8, 'H'), fifo.readItem().?);
331 try testing.expectEqual(@as(u8, 'E'), fifo.readItem().?);
332 try testing.expectEqual(@as(u8, 'L'), fifo.readItem().?);
333 try testing.expectEqual(@as(u8, 'L'), fifo.readItem().?);
334 try testing.expectEqual(@as(u8, 'O'), fifo.readItem().?);
335 }
336 try testing.expectEqual(@as(usize, 5), fifo.readableLength());
337
338 { // Writes that wrap around
339 try testing.expectEqual(@as(usize, 11), fifo.writableLength());
340 try testing.expectEqual(@as(usize, 6), fifo.writableSlice(0).len);
341 fifo.writeAssumeCapacity("6<chars<11");
342 try testing.expectEqualSlices(u8, "HELLO6<char", fifo.readableSlice(0));
343 try testing.expectEqualSlices(u8, "s<11", fifo.readableSlice(11));
344 try testing.expectEqualSlices(u8, "11", fifo.readableSlice(13));
345 try testing.expectEqualSlices(u8, "", fifo.readableSlice(15));
346 fifo.discard(11);
347 try testing.expectEqualSlices(u8, "s<11", fifo.readableSlice(0));
348 fifo.discard(4);
349 try testing.expectEqual(@as(usize, 0), fifo.readableLength());
350 }
351
352 {
353 const buf = try fifo.writableWithSize(12);
354 try testing.expectEqual(@as(usize, 12), buf.len);
355 var i: u8 = 0;
356 while (i < 10) : (i += 1) {
357 buf[i] = i + 'a';
358 }
359 fifo.update(10);
360 try testing.expectEqualSlices(u8, "abcdefghij", fifo.readableSlice(0));
361 }
362
363 {
364 try fifo.unget("prependedstring");
365 var result: [30]u8 = undefined;
366 try testing.expectEqualSlices(u8, "prependedstringabcdefghij", result[0..fifo.read(&result)]);
367 try fifo.unget("b");
368 try fifo.unget("a");
369 try testing.expectEqualSlices(u8, "ab", result[0..fifo.read(&result)]);
370 }
371
372 fifo.shrink(0);
373
374 {
375 try fifo.writer().print("{s}, {s}!", .{ "Hello", "World" });
376 var result: [30]u8 = undefined;
377 try testing.expectEqualSlices(u8, "Hello, World!", result[0..fifo.read(&result)]);
378 try testing.expectEqual(@as(usize, 0), fifo.readableLength());
379 }
380
381 {
382 try fifo.writer().writeAll("This is a test");
383 var result: [30]u8 = undefined;
384 try testing.expectEqualSlices(u8, "This", (try fifo.reader().readUntilDelimiterOrEof(&result, ' ')).?);
385 try testing.expectEqualSlices(u8, "is", (try fifo.reader().readUntilDelimiterOrEof(&result, ' ')).?);
386 try testing.expectEqualSlices(u8, "a", (try fifo.reader().readUntilDelimiterOrEof(&result, ' ')).?);
387 try testing.expectEqualSlices(u8, "test", (try fifo.reader().readUntilDelimiterOrEof(&result, ' ')).?);
388 }
389
390 {
391 try fifo.ensureTotalCapacity(1);
392 var in_fbs = std.io.fixedBufferStream("pump test");
393 var out_buf: [50]u8 = undefined;
394 var out_fbs = std.io.fixedBufferStream(&out_buf);
395 try fifo.pump(in_fbs.reader(), out_fbs.writer());
396 try testing.expectEqualSlices(u8, in_fbs.buffer, out_fbs.getWritten());
397 }
398}
399
400test LinearFifo {
401 inline for ([_]type{ u1, u8, u16, u64 }) |T| {
402 const FifoType = LinearFifo(T);
403 var fifo: FifoType = .init(testing.allocator);
404 defer fifo.deinit();
405
406 try fifo.write(&[_]T{ 0, 1, 1, 0, 1 });
407 try testing.expectEqual(@as(usize, 5), fifo.readableLength());
408
409 {
410 try testing.expectEqual(@as(T, 0), fifo.readItem().?);
411 try testing.expectEqual(@as(T, 1), fifo.readItem().?);
412 try testing.expectEqual(@as(T, 1), fifo.readItem().?);
413 try testing.expectEqual(@as(T, 0), fifo.readItem().?);
414 try testing.expectEqual(@as(T, 1), fifo.readItem().?);
415 try testing.expectEqual(@as(usize, 0), fifo.readableLength());
416 }
417
418 {
419 try fifo.writeItem(1);
420 try fifo.writeItem(1);
421 try fifo.writeItem(1);
422 try testing.expectEqual(@as(usize, 3), fifo.readableLength());
423 }
424
425 {
426 var readBuf: [3]T = undefined;
427 const n = fifo.read(&readBuf);
428 try testing.expectEqual(@as(usize, 3), n); // NOTE: It should be the number of items.
429 }
430 }
431}
src/main.zig+25-21
......@@ -65,8 +65,10 @@ pub fn wasi_cwd() std.os.wasi.fd_t {
6565
6666const fatal = std.process.fatal;
6767
68/// This can be global since stdin is a singleton.
69var stdin_buffer: [4096]u8 = undefined;
6870/// This can be global since stdout is a singleton.
69var stdio_buffer: [4096]u8 = undefined;
71var stdout_buffer: [4096]u8 = undefined;
7072
7173/// Shaming all the locations that inappropriately use an O(N) search algorithm.
7274/// Please delete this and fix the compilation errors!
......@@ -3561,10 +3563,12 @@ fn buildOutputType(
35613563 switch (listen) {
35623564 .none => {},
35633565 .stdio => {
3566 var stdin_reader = fs.File.stdin().reader(&stdin_buffer);
3567 var stdout_writer = fs.File.stdout().writer(&stdout_buffer);
35643568 try serve(
35653569 comp,
3566 .stdin(),
3567 .stdout(),
3570 &stdin_reader.interface,
3571 &stdout_writer.interface,
35683572 test_exec_args.items,
35693573 self_exe_path,
35703574 arg_mode,
......@@ -3584,10 +3588,13 @@ fn buildOutputType(
35843588 const conn = try server.accept();
35853589 defer conn.stream.close();
35863590
3591 var input = conn.stream.reader(&stdin_buffer);
3592 var output = conn.stream.writer(&stdout_buffer);
3593
35873594 try serve(
35883595 comp,
3589 .{ .handle = conn.stream.handle },
3590 .{ .handle = conn.stream.handle },
3596 input.interface(),
3597 &output.interface,
35913598 test_exec_args.items,
35923599 self_exe_path,
35933600 arg_mode,
......@@ -4053,8 +4060,8 @@ fn saveState(comp: *Compilation, incremental: bool) void {
40534060
40544061fn serve(
40554062 comp: *Compilation,
4056 in: fs.File,
4057 out: fs.File,
4063 in: *std.Io.Reader,
4064 out: *std.Io.Writer,
40584065 test_exec_args: []const ?[]const u8,
40594066 self_exe_path: ?[]const u8,
40604067 arg_mode: ArgMode,
......@@ -4064,12 +4071,10 @@ fn serve(
40644071 const gpa = comp.gpa;
40654072
40664073 var server = try Server.init(.{
4067 .gpa = gpa,
40684074 .in = in,
40694075 .out = out,
40704076 .zig_version = build_options.version,
40714077 });
4072 defer server.deinit();
40734078
40744079 var child_pid: ?std.process.Child.Id = null;
40754080
......@@ -5491,10 +5496,10 @@ fn jitCmd(
54915496 defer comp.destroy();
54925497
54935498 if (options.server) {
5499 var stdout_writer = fs.File.stdout().writer(&stdout_buffer);
54945500 var server: std.zig.Server = .{
5495 .out = fs.File.stdout(),
5501 .out = &stdout_writer.interface,
54965502 .in = undefined, // won't be receiving messages
5497 .receive_fifo = undefined, // won't be receiving messages
54985503 };
54995504
55005505 try comp.update(root_prog_node);
......@@ -6058,7 +6063,7 @@ fn cmdAstCheck(
60586063 };
60596064 } else fs.File.stdin();
60606065 defer if (zig_source_path != null) f.close();
6061 var file_reader: fs.File.Reader = f.reader(&stdio_buffer);
6066 var file_reader: fs.File.Reader = f.reader(&stdin_buffer);
60626067 break :s std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch |err| {
60636068 fatal("unable to load file '{s}' for ast-check: {s}", .{ display_path, @errorName(err) });
60646069 };
......@@ -6076,7 +6081,7 @@ fn cmdAstCheck(
60766081
60776082 const tree = try Ast.parse(arena, source, mode);
60786083
6079 var stdout_writer = fs.File.stdout().writerStreaming(&stdio_buffer);
6084 var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);
60806085 const stdout_bw = &stdout_writer.interface;
60816086 switch (mode) {
60826087 .zig => {
......@@ -6291,7 +6296,7 @@ fn detectNativeCpuWithLLVM(
62916296}
62926297
62936298fn printCpu(cpu: std.Target.Cpu) !void {
6294 var stdout_writer = fs.File.stdout().writerStreaming(&stdio_buffer);
6299 var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);
62956300 const stdout_bw = &stdout_writer.interface;
62966301
62976302 if (cpu.model.llvm_name) |llvm_name| {
......@@ -6340,7 +6345,7 @@ fn cmdDumpLlvmInts(
63406345 const dl = tm.createTargetDataLayout();
63416346 const context = llvm.Context.create();
63426347
6343 var stdout_writer = fs.File.stdout().writerStreaming(&stdio_buffer);
6348 var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);
63446349 const stdout_bw = &stdout_writer.interface;
63456350 for ([_]u16{ 1, 8, 16, 32, 64, 128, 256 }) |bits| {
63466351 const int_type = context.intType(bits);
......@@ -6369,9 +6374,8 @@ fn cmdDumpZir(
63696374 defer f.close();
63706375
63716376 const zir = try Zcu.loadZirCache(arena, f);
6372 var stdout_writer = fs.File.stdout().writerStreaming(&stdio_buffer);
6377 var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);
63736378 const stdout_bw = &stdout_writer.interface;
6374
63756379 {
63766380 const instruction_bytes = zir.instructions.len *
63776381 // Here we don't use @sizeOf(Zir.Inst.Data) because it would include
......@@ -6417,7 +6421,7 @@ fn cmdChangelist(
64176421 var f = fs.cwd().openFile(old_source_path, .{}) catch |err|
64186422 fatal("unable to open old source file '{s}': {s}", .{ old_source_path, @errorName(err) });
64196423 defer f.close();
6420 var file_reader: fs.File.Reader = f.reader(&stdio_buffer);
6424 var file_reader: fs.File.Reader = f.reader(&stdin_buffer);
64216425 break :source std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch |err|
64226426 fatal("unable to read old source file '{s}': {s}", .{ old_source_path, @errorName(err) });
64236427 };
......@@ -6425,7 +6429,7 @@ fn cmdChangelist(
64256429 var f = fs.cwd().openFile(new_source_path, .{}) catch |err|
64266430 fatal("unable to open new source file '{s}': {s}", .{ new_source_path, @errorName(err) });
64276431 defer f.close();
6428 var file_reader: fs.File.Reader = f.reader(&stdio_buffer);
6432 var file_reader: fs.File.Reader = f.reader(&stdin_buffer);
64296433 break :source std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch |err|
64306434 fatal("unable to read new source file '{s}': {s}", .{ new_source_path, @errorName(err) });
64316435 };
......@@ -6457,7 +6461,7 @@ fn cmdChangelist(
64576461 var inst_map: std.AutoHashMapUnmanaged(Zir.Inst.Index, Zir.Inst.Index) = .empty;
64586462 try Zcu.mapOldZirToNew(arena, old_zir, new_zir, &inst_map);
64596463
6460 var stdout_writer = fs.File.stdout().writerStreaming(&stdio_buffer);
6464 var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);
64616465 const stdout_bw = &stdout_writer.interface;
64626466 {
64636467 try stdout_bw.print("Instruction mappings:\n", .{});
......@@ -6917,7 +6921,7 @@ fn cmdFetch(
69176921
69186922 const name = switch (save) {
69196923 .no => {
6920 var stdout = fs.File.stdout().writerStreaming(&stdio_buffer);
6924 var stdout = fs.File.stdout().writerStreaming(&stdout_buffer);
69216925 try stdout.interface.print("{s}\n", .{package_hash_slice});
69226926 try stdout.interface.flush();
69236927 return cleanExit();