summaryrefslogtreecommitdiff
path: root/test/fs_bench.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-30 17:35:06 -0300
committerGabriel Schneider <[email protected]>2026-10-30 17:35:06 -0300
commit6d8da8721141284cf33bb901168b26135893eb86 (patch)
tree791d63401d4e85fbca1d597a8ce0326e70efd545 /test/fs_bench.zig
parentefd43a3a2cf03bb741366331158b368abf9ac583 (diff)
parentbf6810a8f9d6cc82050e7d9c0cfb06358301b574 (diff)
downloadpardes-6d8da8721141284cf33bb901168b26135893eb86.tar.gz
pardes-6d8da8721141284cf33bb901168b26135893eb86.zip
Merge latest upstream into the macOS branch for Zig 0.17
Retain the macOS branch history and local Acme selection color while adopting upstream's current core and platform changes. Pin Zig and ZLS to 0.17.0, and fetch the existing zstbi compatibility commit through upstream after its original fork was removed.
Diffstat (limited to 'test/fs_bench.zig')
-rw-r--r--test/fs_bench.zig27
1 files changed, 14 insertions, 13 deletions
diff --git a/test/fs_bench.zig b/test/fs_bench.zig
index f9735ee2..a8a8fd8c 100644
--- a/test/fs_bench.zig
+++ b/test/fs_bench.zig
@@ -65,7 +65,7 @@ const Session = struct {
.file_id = id,
.file_serial = pane.serial,
.body_bytes = pane.file.?.content.len,
- .tag = try core.tagText(backing, pane),
+ .tag = try pardes.tagline.tagText(core, backing, pane),
};
}
@@ -113,7 +113,7 @@ fn checkReply(s: *Session, req: ctlfs.Req, reply: ctlfs.Reply) !void {
if (reply.payload != .staged or reply.payload.staged != bytes.len or bytes.len > req.size)
return error.IncorrectReply;
const pane = s.core.panes[s.file_id].?;
- if (req.node == @intFromEnum(ctlfs.TopFile.index)) {
+ if (req.node == @backingInt(ctlfs.TopFile.index)) {
var expected_buf: [4200]u8 = undefined;
const expected = try std.fmt.bufPrint(&expected_buf, "{d} text {d} {s}\n", .{ s.file_serial, @intFromBool(pane.file.?.revision != pane.file.?.saved_revision), pane.file.?.path });
if (!std.mem.eql(u8, expected, bytes)) return error.IncorrectReply;
@@ -123,7 +123,8 @@ fn checkReply(s: *Session, req: ctlfs.Req, reply: ctlfs.Reply) !void {
if (req.node == s.node(.ctl)) {
const tail = try checkNumbers(rest, &.{pane.cols});
if (!std.mem.startsWith(u8, tail, "default ")) return error.IncorrectReply;
- if ((try checkNumbers(tail[8..], &.{pardes.config.tab_width})).len != 0)
+ const current = try checkNumbers(tail[8..], &.{pardes.config.tab_width});
+ if (!std.mem.eql(u8, current, "current ") and !std.mem.eql(u8, current, "notcurrent "))
return error.IncorrectReply;
} else return error.UnmeasuredOperation;
}
@@ -132,8 +133,8 @@ fn checkReply(s: *Session, req: ctlfs.Req, reply: ctlfs.Reply) !void {
const bytes = s.core.fs.out.items;
if (reply.payload != .staged or reply.payload.staged != bytes.len or bytes.len > req.size)
return error.IncorrectReply;
- const names = [_][]const u8{ "README", "index", "ctl", "new", "log", "screen", "listeners", "pane", "os" };
- const nodes = [_]u64{ @intFromEnum(ctlfs.TopFile.README), @intFromEnum(ctlfs.TopFile.index), @intFromEnum(ctlfs.TopFile.ctl), @intFromEnum(ctlfs.TopFile.new), @intFromEnum(ctlfs.TopFile.log), @intFromEnum(ctlfs.TopFile.screen), @intFromEnum(ctlfs.TopFile.listeners), @intFromEnum(ctlfs.TopFile.pane), filesystem.os_root };
+ const names = [_][]const u8{ "README", "index", "status", "focus", "ctl", "commands", "look", "exec", "log", "screen", "listeners", "pane", "os" };
+ const nodes = [_]u64{ @backingInt(ctlfs.TopFile.README), @backingInt(ctlfs.TopFile.index), @backingInt(ctlfs.TopFile.status), @backingInt(ctlfs.TopFile.focus), @backingInt(ctlfs.TopFile.ctl), @backingInt(ctlfs.TopFile.commands), @backingInt(ctlfs.TopFile.look), @backingInt(ctlfs.TopFile.exec), @backingInt(ctlfs.TopFile.log), @backingInt(ctlfs.TopFile.screen), @backingInt(ctlfs.TopFile.listeners), @backingInt(ctlfs.TopFile.pane), filesystem.os_root };
var off: usize = 0;
var entry: usize = 0;
while (off < bytes.len) : (entry += 1) {
@@ -143,7 +144,7 @@ fn checkReply(s: *Session, req: ctlfs.Req, reply: ctlfs.Reply) !void {
const size: usize = bytes[off + 9];
off += 10;
if (dir > 1 or size == 0 or size > bytes.len - off) return error.IncorrectReply;
- if (entry < names.len and (node != nodes[entry] or dir != @intFromBool(entry >= 7) or
+ if (entry < names.len and (node != nodes[entry] or dir != @intFromBool(entry >= 11) or
!std.mem.eql(u8, names[entry], bytes[off..][0..size]))) return error.IncorrectReply;
off += size;
}
@@ -252,7 +253,7 @@ pub fn main(init: std.process.Init) !void {
try bench(&s, "read index", reps, .{
.tag = 6,
.op = .read,
- .node = @intFromEnum(ctlfs.TopFile.index),
+ .node = @backingInt(ctlfs.TopFile.index),
.size = 4096,
}, "one line per pane");
try bench(&s, "readdir root", reps, .{
@@ -271,7 +272,7 @@ pub fn main(init: std.process.Init) !void {
.tag = 9,
.op = .write,
.node = s.node(.body),
- .data = "x" ** 1024,
+ .data = &@as([1024]u8, @splat('x')),
.size = 1024,
}, "append: whole-body swap + undo snapshot");
@@ -281,11 +282,11 @@ pub fn main(init: std.process.Init) !void {
var keys = try Session.init(&counting, 32 * 1024);
defer keys.deinit();
const pane = keys.core.panes[keys.file_id].?;
- pane.mode = .insert;
+ pane.body.mode = .insert;
const initial_bytes = pane.file.?.content.len;
key_body_bytes = initial_bytes;
if (scripted) {
- keys.core.fs.panes[keys.file_id].readers = 1;
+ keys.core.panes[keys.file_id].?.fs.readers = 1;
keys.core.fs.listeners = 1;
}
counting.allocations = 0;
@@ -295,9 +296,9 @@ pub fn main(init: std.process.Init) !void {
while (keys.core.nextEffect()) |_| {}
}
const elapsed = nowNs() - start;
- if (pane.file.?.content.len != initial_bytes + key_reps or pane.cur_col != key_reps or
+ if (pane.file.?.content.len != initial_bytes + key_reps or pane.body.cur_col != key_reps or
!std.mem.allEqual(u8, pane.file.?.content[0..key_reps], 'x')) return error.MissingKeystroke;
- const events = &keys.core.fs.panes[keys.file_id].events;
+ const events = &keys.core.panes[keys.file_id].?.fs.events;
if (scripted) for (0..key_reps) |i| {
var buf: [64]u8 = undefined;
const expected = try std.fmt.bufPrint(&buf, "KI{d} {d} 0 1 x\n", .{ i, i + 1 });
@@ -326,7 +327,7 @@ pub fn main(init: std.process.Init) !void {
try w.writeAll("]}\n");
} else {
try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ "request", "ns/op", "allocs", "note" });
- try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ "-" ** 26, "-" ** 9, "-" ** 8, "-" ** 20 });
+ try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ &@as([26]u8, @splat('-')), &@as([9]u8, @splat('-')), &@as([8]u8, @splat('-')), &@as([20]u8, @splat('-')) });
for (rows.items) |r|
try w.print("{s:<26} {d:>9} {d:>8} {s}\n", .{ r.name, r.ns, r.allocs, r.note });
}