From f4a4e793aa964ba2d0883a19205c32ec01eaf8f0 Mon Sep 17 00:00:00 2001 From: Jarred SUmner Date: Sun, 3 Oct 2021 02:22:00 -0700 Subject: Add Three.js benchmark --- src/global.zig | 2 +- src/http.zig | 3 ++- src/main.zig | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/global.zig b/src/global.zig index 64d5f1a82..b3f648850 100644 --- a/src/global.zig +++ b/src/global.zig @@ -3,7 +3,7 @@ pub usingnamespace @import("strings.zig"); pub const Environment = @import("env.zig"); -pub const default_allocator: *std.mem.Allocator = if (isTest or Environment.isLinux) +pub const default_allocator: *std.mem.Allocator = if (isTest) std.heap.c_allocator else @import("./memory_allocator.zig").c_allocator; diff --git a/src/http.zig b/src/http.zig index 72a452327..5b43cd9f7 100644 --- a/src/http.zig +++ b/src/http.zig @@ -1119,13 +1119,14 @@ pub const RequestContext = struct { javascript_disabled = true; } var start_timer = std.time.Timer.start() catch unreachable; - + var stdout = std.io.getStdOut(); var stderr = std.io.getStdErr(); var output_source = Output.Source.init(stdout, stderr); defer Output.flush(); Output.Source.set(&output_source); + @import("javascript/jsc/JavascriptCore.zig").JSCInitialize(); js_ast.Stmt.Data.Store.create(std.heap.c_allocator); diff --git a/src/main.zig b/src/main.zig index f73f9c292..7b86f7360 100644 --- a/src/main.zig +++ b/src/main.zig @@ -22,7 +22,6 @@ pub fn panic(msg: []const u8, error_return_trace: ?*std.builtin.StackTrace) nore } pub var start_time: i128 = 0; pub fn main() anyerror!void { - @import("javascript/jsc/JavascriptCore.zig").JSCInitialize(); start_time = std.time.nanoTimestamp(); // The memory allocator makes a massive difference. -- cgit v1.2.3