RedStealthDev/zig-raylib-engine
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dont use testing allocator

Browse Source
This commit is contained in:
Mike 2020-06-15 23:33:27 -07:00
parent df926f965c
commit 57a27bd57d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zig-ecs/src/process/scheduler.zig
View File

@ -14,9 +14,9 @@ pub const Scheduler = struct {
processes: std.ArrayList(*Process), processes: std.ArrayList(*Process),
allocator: *std.mem.Allocator, allocator: *std.mem.Allocator,
/// helper to create and prepare a process and wrap it in a ProcessHandler /// helper to create and prepare a process
fn createProcessHandler(comptime T: type, data: var) *Process { fn createProcessHandler(comptime T: type, data: var, allocator: *std.mem.Allocator) *Process {
var proc = std.testing.allocator.create(T) catch unreachable; var proc = allocator.create(T) catch unreachable;
proc.initialize(data); proc.initialize(data);
// get a closure so that we can safely deinit this later // get a closure so that we can safely deinit this later
@ -35,13 +35,14 @@ pub const Scheduler = struct {
/// returned when appending a process so that sub-processes can be added to the process /// returned when appending a process so that sub-processes can be added to the process
const Continuation = struct { const Continuation = struct {
process: *Process, process: *Process,
allocator: *std.mem.Allocator,
pub fn init(process: *Process) Continuation { pub fn init(process: *Process, allocator: *std.mem.Allocator) Continuation {
return .{ .process = process }; return .{ .process = process, .allocator = allocator };
} }
pub fn next(self: *@This(), comptime T: type, data: var) *@This() { pub fn next(self: *@This(), comptime T: type, data: var) *@This() {
self.process.next = createProcessHandler(T, data); self.process.next = createProcessHandler(T, data, self.allocator);
self.process = self.process.next.?; self.process = self.process.next.?;
return self; return self;
} }
@ -64,11 +65,11 @@ pub const Scheduler = struct {
std.debug.assert(@hasDecl(T, "initialize")); std.debug.assert(@hasDecl(T, "initialize"));
std.debug.assert(@hasField(T, "process")); std.debug.assert(@hasField(T, "process"));
var process = createProcessHandler(T, data); var process = createProcessHandler(T, data, self.allocator);
process.tick(); process.tick();
self.processes.append(process) catch unreachable; self.processes.append(process) catch unreachable;
return Continuation.init(process); return Continuation.init(process, self.allocator);
} }
fn updateProcess(process: **Process, allocator: *std.mem.Allocator) bool { fn updateProcess(process: **Process, allocator: *std.mem.Allocator) bool {