diff --git a/src/bench/page-init.zig b/src/bench/page-init.zig index 3f5e006d1..c3057cd9f 100644 --- a/src/bench/page-init.zig +++ b/src/bench/page-init.zig @@ -8,7 +8,8 @@ const assert = std.debug.assert; const Allocator = std.mem.Allocator; const ArenaAllocator = std.heap.ArenaAllocator; const cli = @import("../cli.zig"); -const terminal = @import("../terminal/main.zig"); +const terminal = @import("../terminal-old/main.zig"); +const terminal_new = @import("../terminal/main.zig"); const Args = struct { mode: Mode = .alloc, @@ -59,15 +60,15 @@ pub fn main() !void { noinline fn benchAlloc(count: usize) !void { for (0..count) |_| { - _ = try terminal.new.Page.init(terminal.new.page.std_capacity); + _ = try terminal_new.Page.init(terminal_new.page.std_capacity); } } noinline fn benchPool(alloc: Allocator, count: usize) !void { - var list = try terminal.new.PageList.init( + var list = try terminal_new.PageList.init( alloc, - terminal.new.page.std_capacity.cols, - terminal.new.page.std_capacity.rows, + terminal_new.page.std_capacity.cols, + terminal_new.page.std_capacity.rows, 0, ); defer list.deinit(); diff --git a/src/bench/resize.zig b/src/bench/resize.zig index 53261486e..d88803fe7 100644 --- a/src/bench/resize.zig +++ b/src/bench/resize.zig @@ -5,7 +5,8 @@ const assert = std.debug.assert; const Allocator = std.mem.Allocator; const ArenaAllocator = std.heap.ArenaAllocator; const cli = @import("../cli.zig"); -const terminal = @import("../terminal/main.zig"); +const terminal = @import("../terminal-old/main.zig"); +const terminal_new = @import("../terminal/main.zig"); const Args = struct { mode: Mode = .old, @@ -60,11 +61,10 @@ pub fn main() !void { }, .new => { - var t = try terminal.new.Terminal.init( - alloc, - @intCast(args.cols), - @intCast(args.rows), - ); + var t = try terminal_new.Terminal.init(alloc, .{ + .cols = @intCast(args.cols), + .rows = @intCast(args.rows), + }); defer t.deinit(alloc); try benchNew(&t, args); }, @@ -90,7 +90,7 @@ noinline fn benchOld(t: *terminal.Terminal, args: Args) !void { } } -noinline fn benchNew(t: *terminal.new.Terminal, args: Args) !void { +noinline fn benchNew(t: *terminal_new.Terminal, args: Args) !void { // We fill the terminal with letters. for (0..args.rows) |row| { for (0..args.cols) |col| { diff --git a/src/bench/screen-copy.zig b/src/bench/screen-copy.zig index 1c2b05153..15cc76658 100644 --- a/src/bench/screen-copy.zig +++ b/src/bench/screen-copy.zig @@ -5,7 +5,8 @@ const assert = std.debug.assert; const Allocator = std.mem.Allocator; const ArenaAllocator = std.heap.ArenaAllocator; const cli = @import("../cli.zig"); -const terminal = @import("../terminal/main.zig"); +const terminal = @import("../terminal-old/main.zig"); +const terminal_new = @import("../terminal/main.zig"); const Args = struct { mode: Mode = .old, @@ -61,21 +62,19 @@ pub fn main() !void { }, .new => { - var t = try terminal.new.Terminal.init( - alloc, - @intCast(args.cols), - @intCast(args.rows), - ); + var t = try terminal_new.Terminal.init(alloc, .{ + .cols = @intCast(args.cols), + .rows = @intCast(args.rows), + }); defer t.deinit(alloc); try benchNew(alloc, &t, args); }, .@"new-pooled" => { - var t = try terminal.new.Terminal.init( - alloc, - @intCast(args.cols), - @intCast(args.rows), - ); + var t = try terminal_new.Terminal.init(alloc, .{ + .cols = @intCast(args.cols), + .rows = @intCast(args.rows), + }); defer t.deinit(alloc); try benchNewPooled(alloc, &t, args); }, @@ -101,7 +100,7 @@ noinline fn benchOld(alloc: Allocator, t: *terminal.Terminal, args: Args) !void } } -noinline fn benchNew(alloc: Allocator, t: *terminal.new.Terminal, args: Args) !void { +noinline fn benchNew(alloc: Allocator, t: *terminal_new.Terminal, args: Args) !void { // We fill the terminal with letters. for (0..args.rows) |row| { for (0..args.cols) |col| { @@ -116,7 +115,7 @@ noinline fn benchNew(alloc: Allocator, t: *terminal.new.Terminal, args: Args) !v } } -noinline fn benchNewPooled(alloc: Allocator, t: *terminal.new.Terminal, args: Args) !void { +noinline fn benchNewPooled(alloc: Allocator, t: *terminal_new.Terminal, args: Args) !void { // We fill the terminal with letters. for (0..args.rows) |row| { for (0..args.cols) |col| { @@ -125,7 +124,7 @@ noinline fn benchNewPooled(alloc: Allocator, t: *terminal.new.Terminal, args: Ar } } - var pool = try terminal.new.PageList.MemoryPool.init(alloc, std.heap.page_allocator, 4); + var pool = try terminal_new.PageList.MemoryPool.init(alloc, std.heap.page_allocator, 4); defer pool.deinit(); for (0..args.count) |_| { diff --git a/src/bench/stream.zig b/src/bench/stream.zig index 4d7586be4..631c35ea1 100644 --- a/src/bench/stream.zig +++ b/src/bench/stream.zig @@ -99,11 +99,10 @@ pub fn main() !void { defer f.close(); const r = f.reader(); const TerminalStream = terminal.Stream(*NewTerminalHandler); - var t = try terminalnew.Terminal.init( - alloc, - @intCast(args.@"terminal-cols"), - @intCast(args.@"terminal-rows"), - ); + var t = try terminalnew.Terminal.init(alloc, .{ + .cols = @intCast(args.@"terminal-cols"), + .rows = @intCast(args.@"terminal-rows"), + }); var handler: NewTerminalHandler = .{ .t = &t }; var stream: TerminalStream = .{ .handler = &handler }; try benchSimd(r, &stream, buf); @@ -141,11 +140,10 @@ pub fn main() !void { .new => { const TerminalStream = terminal.Stream(*NewTerminalHandler); - var t = try terminalnew.Terminal.init( - alloc, - @intCast(args.@"terminal-cols"), - @intCast(args.@"terminal-rows"), - ); + var t = try terminalnew.Terminal.init(alloc, .{ + .cols = @intCast(args.@"terminal-cols"), + .rows = @intCast(args.@"terminal-rows"), + }); var handler: NewTerminalHandler = .{ .t = &t }; var stream: TerminalStream = .{ .handler = &handler }; switch (tag) { diff --git a/src/bench/vt-insert-lines.zig b/src/bench/vt-insert-lines.zig index 415e64895..d61d5354d 100644 --- a/src/bench/vt-insert-lines.zig +++ b/src/bench/vt-insert-lines.zig @@ -5,7 +5,8 @@ const assert = std.debug.assert; const Allocator = std.mem.Allocator; const ArenaAllocator = std.heap.ArenaAllocator; const cli = @import("../cli.zig"); -const terminal = @import("../terminal/main.zig"); +const terminal = @import("../terminal-old/main.zig"); +const terminal_new = @import("../terminal/main.zig"); const Args = struct { mode: Mode = .old, @@ -60,11 +61,10 @@ pub fn main() !void { }, .new => { - var t = try terminal.new.Terminal.init( - alloc, - @intCast(args.cols), - @intCast(args.rows), - ); + var t = try terminal_new.Terminal.init(alloc, .{ + .cols = @intCast(args.cols), + .rows = @intCast(args.rows), + }); defer t.deinit(alloc); try benchNew(&t, args); }, @@ -87,7 +87,7 @@ noinline fn benchOld(t: *terminal.Terminal, args: Args) !void { } } -noinline fn benchNew(t: *terminal.new.Terminal, args: Args) !void { +noinline fn benchNew(t: *terminal_new.Terminal, args: Args) !void { // We fill the terminal with letters. for (0..args.rows) |row| { for (0..args.cols) |col| { diff --git a/src/terminal-old/main.zig b/src/terminal-old/main.zig index e886d97c1..5f29ce70c 100644 --- a/src/terminal-old/main.zig +++ b/src/terminal-old/main.zig @@ -50,9 +50,6 @@ pub usingnamespace if (builtin.target.isWasm()) struct { pub usingnamespace @import("wasm.zig"); } else struct {}; -// TODO(paged-terminal) remove before merge -pub const new = @import("../terminal/main.zig"); - test { @import("std").testing.refAllDecls(@This()); }