aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Jarred SUmner <jarred@jarredsumner.com> 2021-10-03 02:22:00 -0700
committerGravatar Jarred SUmner <jarred@jarredsumner.com> 2021-10-03 02:22:00 -0700
commitf4a4e793aa964ba2d0883a19205c32ec01eaf8f0 (patch)
treef93dfee8d14c117bfd4077c285deebd0eaec39ba /src
parentcdabcfd9d09d2f4928ba7a918f654e001bb3c2eb (diff)
downloadbun-f4a4e793aa964ba2d0883a19205c32ec01eaf8f0.tar.gz
bun-f4a4e793aa964ba2d0883a19205c32ec01eaf8f0.tar.zst
bun-f4a4e793aa964ba2d0883a19205c32ec01eaf8f0.zip
Add Three.js benchmark
Diffstat (limited to '')
-rw-r--r--src/global.zig2
-rw-r--r--src/http.zig3
-rw-r--r--src/main.zig1
3 files changed, 3 insertions, 3 deletions
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.