diff options
Diffstat (limited to 'src/host/timeline.zig')
| -rw-r--r-- | src/host/timeline.zig | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/host/timeline.zig b/src/host/timeline.zig index c2eeff3..e755433 100644 --- a/src/host/timeline.zig +++ b/src/host/timeline.zig @@ -45,8 +45,8 @@ pub const Frames = struct { pub const Timeline = struct { gpa: std.mem.Allocator, - /// Live state is its slot 0. - state: *memory.StateFile, + /// Live State. + state: *memory.State, /// The running sketch's: a restore starts from its defaults. defaults: *const fn (abi.Memory, [*]u8) callconv(.c) void, mode: abi.Mode = .live, @@ -90,7 +90,7 @@ pub const Timeline = struct { pub fn restore(self: *Timeline, key: Sessions.Loaded) !void { var arena: std.heap.ArenaAllocator = .init(self.gpa); defer arena.deinit(); - _ = try memory.restore(arena.allocator(), key.layout, key.state, self.state.layout, self.state.slot(0), self.defaults); + _ = try memory.restore(arena.allocator(), key.layout, key.state, self.state.layout, self.state.live(), self.defaults); self.restored = true; self.fed = 0; self.next_check = 0; @@ -202,18 +202,14 @@ pub const Timeline = struct { test "frames are whole: input waits for its tick, in playback, seek and step" { const gpa = std.testing.allocator; - // Live state on plain memory: 8 bytes, no fields. - var file: memory.StateFile = undefined; - file.map = try gpa.alignedAlloc(u8, .fromByteUnits(memory.page), memory.header_len + memory.page); - defer gpa.free(file.map); - @memset(file.map, 0); - file.slots = 1; - file.header().* = .{ .size = 8, .alignment = 1, .hash = 1, .stride = memory.page, .used = 1, .field_count = 0, .strings_len = 0 }; - file.layout = .{ .size = 8, .hash = 1 }; + // Live State: 8 bytes, no fields. const D = struct { fn f(_: abi.Memory, _: [*]u8) callconv(.c) void {} }; - var t: Timeline = .{ .gpa = gpa, .state = &file, .defaults = D.f }; + var state: memory.State = .init(gpa); + defer state.deinit(gpa); + _ = try state.adopt(gpa, .{ .size = 8, .alignment = 1, .hash = 1, .fields = &.{} }, D.f); + var t: Timeline = .{ .gpa = gpa, .state = &state, .defaults = D.f }; defer t.deinit(); // Frame k: a move at 10k ms, its tick 5 ms later; then a move with no // tick (a frame cut off). @@ -223,7 +219,7 @@ test "frames are whole: input waits for its tick, in playback, seek and step" { try events.append(gpa, abi.Event.tick(1000 + k * 10_000_000 + 5_000_000, 16_666_667)); } try events.append(gpa, .{ .kind = .mouse_move, .time = 40_000_000 }); - const key: Sessions.Loaded = .{ .frame = 0, .batch = 0, .why = .mark, .time = 0, .stretch = 0, .build = 7, .state = try gpa.dupe(u8, &@as([8]u8, @splat(0))), .line = try gpa.dupe(u8, ""), .source = try gpa.dupe(u8, ""), .layout = try gpa.dupe(u8, file.layoutBytes()) }; + const key: Sessions.Loaded = .{ .frame = 0, .batch = 0, .why = .mark, .time = 0, .stretch = 0, .build = 7, .state = try gpa.dupe(u8, &@as([8]u8, @splat(0))), .line = try gpa.dupe(u8, ""), .source = try gpa.dupe(u8, ""), .layout = try gpa.dupe(u8, state.header) }; t.load(key, events); try t.play(0); |
