mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix refConcurrent and unrefConcurrent (#11280)

Browse Source 
Co-authored-by: Georgijs Vilums <=>
This commit is contained in:
Georgijs
2024-05-22 16:57:05 -07:00
committed by GitHub
parent 12bb5d03a2
commit d50acbc0bd
8 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/async/posix_event_loop.zig
View File

@@ -63,13 +63,11 @@ pub const KeepAlive = struct {
}
/// From another thread, Prevent a poll from keeping the process alive.
pub fn unrefConcurrently(this: *KeepAlive, event_loop_ctx_: anytype) void {
const event_loop_ctx = JSC.AbstractVM(event_loop_ctx_);
pub fn unrefConcurrently(this: *KeepAlive, vm: *JSC.VirtualMachine) void {
if (this.status != .active)
return;
this.status = .inactive;
// vm.event_loop_handle.?.unrefConcurrently();
event_loop_ctx.platformEventLoop().unrefConcurrently();
vm.event_loop.unrefConcurrently();
}
/// Prevent a poll from keeping the process alive on the next tick.
@@ -106,13 +104,11 @@ pub const KeepAlive = struct {
}
/// Allow a poll to keep the process alive.
pub fn refConcurrently(this: *KeepAlive, event_loop_ctx_: anytype) void {
const event_loop_ctx = JSC.AbstractVM(event_loop_ctx_);
pub fn refConcurrently(this: *KeepAlive, vm: *JSC.VirtualMachine) void {
if (this.status != .inactive)
return;
this.status = .active;
// vm.event_loop_handle.?.refConcurrently();
event_loop_ctx.platformEventLoop().refConcurrently();
vm.event_loop.refConcurrently();
}
pub fn refConcurrentlyFromEventLoop(this: *KeepAlive, loop: *JSC.EventLoop) void {

7
src/async/windows_event_loop.zig
View File

@@ -68,9 +68,7 @@ pub const KeepAlive = struct {
if (this.status != .active)
return;
this.status = .inactive;
// TODO: https://github.com/oven-sh/bun/pull/4410#discussion_r1317326194
vm.event_loop_handle.?.dec();
vm.event_loop.unrefConcurrently();
}
/// Prevent a poll from keeping the process alive on the next tick.
@@ -109,8 +107,7 @@ pub const KeepAlive = struct {
if (this.status != .inactive)
return;
this.status = .active;
// TODO: https://github.com/oven-sh/bun/pull/4410#discussion_r1317326194
vm.event_loop_handle.?.inc();
vm.event_loop.refConcurrently();
}
pub fn refConcurrentlyFromEventLoop(this: *KeepAlive, loop: *JSC.EventLoop) void {

35
src/bun.js/event_loop.zig
View File

@@ -310,9 +310,9 @@ pub const JSCScheduler = struct {
JSC.markBinding(@src());
if (delta > 0) {
jsc_vm.event_loop_handle.?.refConcurrently();
jsc_vm.event_loop.refConcurrently();
} else {
jsc_vm.event_loop_handle.?.unrefConcurrently();
jsc_vm.event_loop.unrefConcurrently();
}
}
@@ -775,6 +775,7 @@ pub const EventLoop = struct {
debug: Debug = .{},
entered_event_loop_count: isize = 0,
concurrent_ref: std.atomic.Value(i32) = std.atomic.Value(i32).init(0),
pub const Debug = if (Environment.isDebug) struct {
is_inside_tick_queue: bool = false,
@@ -1270,6 +1271,24 @@ pub const EventLoop = struct {
pub fn tickConcurrentWithCount(this: *EventLoop) usize {
JSC.markBinding(@src());
const delta = this.concurrent_ref.swap(0, .Monotonic);
const loop = this.virtual_machine.event_loop_handle.?;
if (comptime Environment.isWindows) {
if (delta > 0) {
loop.active_handles += @intCast(delta);
} else {
loop.active_handles -= @intCast(-delta);
}
} else {
if (delta > 0) {
loop.num_polls += @intCast(delta);
loop.active += @intCast(delta);
} else {
loop.num_polls -= @intCast(-delta);
loop.active -= @intCast(-delta);
}
}
var concurrent = this.concurrent_tasks.popBatch();
const count = concurrent.count;
if (count == 0)
@@ -1639,6 +1658,18 @@ pub const EventLoop = struct {
this.concurrent_tasks.pushBatch(batch.front.?, batch.last.?, batch.count);
this.wakeup();
}
pub fn refConcurrently(this: *EventLoop) void {
// TODO maybe this should be AcquireRelease
_ = this.concurrent_ref.fetchAdd(1, .Monotonic);
this.wakeup();
}
pub fn unrefConcurrently(this: *EventLoop) void {
// TODO maybe this should be AcquireRelease
_ = this.concurrent_ref.fetchSub(1, .Monotonic);
this.wakeup();
}
};
pub const JsVM = struct {

3
src/bun.js/web_worker.zig
View File

@@ -123,7 +123,7 @@ pub const WebWorker = struct {
.execArgv = if (execArgv_ptr) |ptr| ptr[0..execArgv_len] else null,
};
worker.parent_poll_ref.refConcurrently(parent);
worker.parent_poll_ref.ref(parent);
return worker;
}
@@ -190,7 +190,6 @@ pub const WebWorker = struct {
fn deinit(this: *WebWorker) void {
log("[{d}] deinit", .{this.execution_context_id});
this.parent_poll_ref.unrefConcurrently(this.parent);
this.parent.event_loop_handle.?.wakeup();
bun.default_allocator.free(this.specifier);
bun.default_allocator.destroy(this);
}

4
src/bun.js/webcore/blob.zig
View File

@@ -2021,7 +2021,7 @@ pub const Blob = struct {
});
return;
}
loop.refConcurrently();
this.event_loop.refConcurrently();
}
pub fn throw(this: *CopyFileWindows, err: bun.sys.Error) void {
@@ -2039,7 +2039,7 @@ pub const Blob = struct {
var this: *CopyFileWindows = @fieldParentPtr(CopyFileWindows, "io_request", req);
assert(req.data == @as(?*anyopaque, @ptrCast(this)));
var event_loop = this.event_loop;
event_loop.virtual_machine.event_loop_handle.?.unrefConcurrently();
event_loop.unrefConcurrently();
const rc = req.result;
bun.sys.syslog("uv_fs_copyfile() = {}", .{rc});

8
src/bun.js/webcore/blob/WriteFile.zig
View File

@@ -416,7 +416,7 @@ pub const WriteFileWindows = struct {
},
}
write_file.loop().refConcurrently();
write_file.event_loop.refConcurrently();
return write_file;
}
pub const ResultType = WriteFile.ResultType;
@@ -492,7 +492,7 @@ pub const WriteFileWindows = struct {
fn mkdirp(this: *WriteFileWindows) void {
log("mkdirp", .{});
this.mkdirp_if_not_exists = false;
this.loop().refConcurrently();
this.event_loop.refConcurrently();
const path = this.file_blob.store.?.data.file.pathlike.path.slice();
JSC.Node.Async.AsyncMkdirp.new(.{
@@ -505,7 +505,7 @@ pub const WriteFileWindows = struct {
}
fn onMkdirpComplete(this: *WriteFileWindows) void {
this.loop().unrefConcurrently();
this.event_loop.unrefConcurrently();
if (this.err) |err| {
this.throw(err);
@@ -540,7 +540,7 @@ pub const WriteFileWindows = struct {
}
pub fn onFinish(container: *WriteFileWindows) void {
container.loop().unrefConcurrently();
container.event_loop.unrefConcurrently();
var event_loop = container.event_loop;
event_loop.enter();
defer event_loop.exit();

10
src/deps/libuv.zig
View File

@@ -682,16 +682,6 @@ pub const Loop = extern struct {
this.wq_async.send();
}
pub fn refConcurrently(this: *Loop) void {
log("refConcurrently", .{});
_ = @atomicRmw(c_uint, &this.active_handles, std.builtin.AtomicRmwOp.Add, 1, .Monotonic);
}
pub fn unrefConcurrently(this: *Loop) void {
log("unrefConcurrently", .{});
_ = @atomicRmw(c_uint, &this.active_handles, std.builtin.AtomicRmwOp.Sub, 1, .Monotonic);
}
pub fn unrefCount(this: *Loop, count: i32) void {
log("unrefCount({d})", .{count});
this.active_handles -= @intCast(count);

10
src/deps/uws.zig
View File

@@ -1226,16 +1226,6 @@ pub const PosixLoop = extern struct {
this.num_polls += 1;
this.active += 1;
}
pub fn refConcurrently(this: *PosixLoop) void {
_ = @atomicRmw(@TypeOf(this.num_polls), &this.num_polls, .Add, 1, .Monotonic);
_ = @atomicRmw(@TypeOf(this.active), &this.active, .Add, 1, .Monotonic);
log("refConcurrently ({d}, {d})", .{ this.num_polls, this.active });
}
pub fn unrefConcurrently(this: *PosixLoop) void {
_ = @atomicRmw(@TypeOf(this.num_polls), &this.num_polls, .Sub, 1, .Monotonic);
_ = @atomicRmw(@TypeOf(this.active), &this.active, .Sub, 1, .Monotonic);
log("unrefConcurrently ({d}, {d})", .{ this.num_polls, this.active });
}
pub fn unref(this: *PosixLoop) void {
log("unref", .{});