aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bun.js/api/bun.zig3
-rw-r--r--src/bun.js/javascript.zig1
-rw-r--r--src/bun.js/web_worker.zig6
-rw-r--r--src/bun_js.zig17
-rw-r--r--src/cli/test_command.zig7
-rw-r--r--src/http.zig12
6 files changed, 23 insertions, 23 deletions
diff --git a/src/bun.js/api/bun.zig b/src/bun.js/api/bun.zig
index 85d2e7f83..5b7f9a513 100644
--- a/src/bun.js/api/bun.zig
+++ b/src/bun.js/api/bun.zig
@@ -1375,7 +1375,8 @@ fn dump_mimalloc(
_: []const JSC.C.JSValueRef,
_: JSC.C.ExceptionRef,
) JSC.C.JSValueRef {
- globalThis.bunVM().arena.dumpStats();
+ _ = globalThis;
+ // globalThis.bunVM().arena.dumpStats();
return JSC.JSValue.jsUndefined().asObjectRef();
}
diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig
index d8043ca44..27a037672 100644
--- a/src/bun.js/javascript.zig
+++ b/src/bun.js/javascript.zig
@@ -424,7 +424,6 @@ pub const VirtualMachine = struct {
/// source_mappings
saved_source_map_table: SavedSourceMap.HashTable = undefined,
- arena: *Arena = undefined,
has_loaded: bool = false,
transpiled_count: usize = 0,
diff --git a/src/bun.js/web_worker.zig b/src/bun.js/web_worker.zig
index 130e99be1..a52eae1f6 100644
--- a/src/bun.js/web_worker.zig
+++ b/src/bun.js/web_worker.zig
@@ -169,7 +169,7 @@ pub const WebWorker = struct {
std.debug.assert(this.status == .start);
std.debug.assert(this.vm == null);
- this.arena = try bun.MimallocArena.init();
+ // this.arena = try bun.MimallocArena.init();
var vm = try JSC.VirtualMachine.initWorker(
this.arena.allocator(),
this.parent.bundler.options.transform_options,
@@ -179,7 +179,7 @@ pub const WebWorker = struct {
this,
);
vm.allocator = this.arena.allocator();
- vm.arena = &this.arena;
+ // vm.arena = &this.arena;
var b = &vm.bundler;
@@ -296,7 +296,7 @@ pub const WebWorker = struct {
vm.eventLoop().tickConcurrentWithCount() > 0)
{
vm.global.vm().releaseWeakRefs();
- _ = vm.arena.gc(false);
+ // _ = vm.arena.gc(false);
_ = vm.global.vm().runGC(false);
}
diff --git a/src/bun_js.zig b/src/bun_js.zig
index 8763f9960..a4e41b317 100644
--- a/src/bun_js.zig
+++ b/src/bun_js.zig
@@ -53,15 +53,14 @@ pub const Run = struct {
js_ast.Expr.Data.Store.create(default_allocator);
js_ast.Stmt.Data.Store.create(default_allocator);
- var arena = try Arena.init();
+ // var arena = try Arena.init();
if (!ctx.debug.loaded_bunfig) {
try bun.CLI.Arguments.loadConfigPath(ctx.allocator, true, "bunfig.toml", &ctx, .RunCommand);
}
run = .{
- .vm = try VirtualMachine.initWithModuleGraph(arena.allocator(), ctx.log, graph_ptr),
- .arena = arena,
+ .vm = try VirtualMachine.initWithModuleGraph(bun.default_allocator, ctx.log, graph_ptr),
.ctx = ctx,
.entry_path = entry_path,
};
@@ -70,8 +69,8 @@ pub const Run = struct {
var b = &vm.bundler;
vm.preload = ctx.preloads;
vm.argv = ctx.passthrough;
- vm.arena = &run.arena;
- vm.allocator = arena.allocator();
+ // vm.arena = &run.arena;
+ vm.allocator = bun.default_allocator;
b.options.install = ctx.install;
b.resolver.opts.install = ctx.install;
@@ -137,7 +136,7 @@ pub const Run = struct {
js_ast.Expr.Data.Store.create(default_allocator);
js_ast.Stmt.Data.Store.create(default_allocator);
- var arena = try Arena.init();
+ // var arena = try Arena.init();
if (!ctx.debug.loaded_bunfig) {
try bun.CLI.Arguments.loadConfigPath(ctx.allocator, true, "bunfig.toml", &ctx, .RunCommand);
@@ -153,7 +152,7 @@ pub const Run = struct {
ctx.debug.hot_reload != .none,
ctx.runtime_options.smol,
),
- .arena = arena,
+ // .arena = arena,
.ctx = ctx,
.entry_path = entry_path,
};
@@ -162,7 +161,7 @@ pub const Run = struct {
var b = &vm.bundler;
vm.preload = ctx.preloads;
vm.argv = ctx.passthrough;
- vm.arena = &run.arena;
+ // vm.arena = &run.arena;
vm.allocator = bun.default_allocator;
b.options.install = ctx.install;
@@ -294,7 +293,7 @@ pub const Run = struct {
vm.eventLoop().tickConcurrentWithCount() > 0)
{
vm.global.vm().releaseWeakRefs();
- _ = vm.arena.gc(false);
+ // _ = vm.arena.gc(false);
_ = vm.global.vm().runGC(false);
vm.tick();
}
diff --git a/src/cli/test_command.zig b/src/cli/test_command.zig
index 14eca012e..9a9de3058 100644
--- a/src/cli/test_command.zig
+++ b/src/cli/test_command.zig
@@ -720,10 +720,11 @@ pub const TestCommand = struct {
}
};
- var arena = bun.MimallocArena.init() catch @panic("Unexpected error in mimalloc");
+ // var arena = bun.MimallocArena.init() catch @panic("Unexpected error in mimalloc");
+ // _ = arena;
vm_.eventLoop().ensureWaker();
- vm_.arena = &arena;
- vm_.allocator = arena.allocator();
+ // vm_.arena = &arena;
+ vm_.allocator = bun.default_allocator;
var ctx = Context{ .reporter = reporter_, .vm = vm_, .files = files_, .allocator = allocator_ };
vm_.runWithAPILock(Context, &ctx, Context.begin);
}
diff --git a/src/http.zig b/src/http.zig
index c206fbf66..882d4e05e 100644
--- a/src/http.zig
+++ b/src/http.zig
@@ -1537,7 +1537,7 @@ pub const RequestContext = struct {
vm.global.vm().holdAPILock(handler, JavaScript.OpaqueWrap(HandlerThread, startJavaScript));
}
- var __arena: ThreadlocalArena = undefined;
+ // var __arena: ThreadlocalArena = undefined;
pub fn runLoop(vm: *JavaScript.VirtualMachine, thread: *HandlerThread) !void {
var module_map = JavaScript.ZigGlobalObject.getModuleRegistryMap(vm.global);
@@ -1550,8 +1550,8 @@ pub const RequestContext = struct {
}
while (true) {
- __arena = ThreadlocalArena.init() catch unreachable;
- JavaScript.VirtualMachine.get().arena = &__arena;
+ // __arena = ThreadlocalArena.init() catch unreachable;
+ // JavaScript.VirtualMachine.get().arena = &__arena;
JavaScript.VirtualMachine.get().has_loaded = true;
JavaScript.VirtualMachine.get().tick();
defer {
@@ -1563,7 +1563,7 @@ pub const RequestContext = struct {
js_ast.Expr.Data.Store.reset();
JavaScript.API.Bun.flushCSSImports();
Output.flush();
- JavaScript.VirtualMachine.get().arena.deinit();
+ // JavaScript.VirtualMachine.get().arena.deinit();
JavaScript.VirtualMachine.get().has_loaded = false;
}
@@ -1573,8 +1573,8 @@ pub const RequestContext = struct {
const original_origin = vm.origin;
vm.origin = handler.ctx.origin;
defer vm.origin = original_origin;
- handler.ctx.arena = __arena;
- handler.ctx.allocator = __arena.allocator();
+ // handler.ctx.arena = __arena;
+ // handler.ctx.allocator = __arena.allocator();
var req_body = handler.ctx.req_body_node;
JavaScript.EventListenerMixin.emitFetchEvent(
vm,
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-26 20:22:17 +0000