aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cli/run_command.zig6
-rw-r--r--src/install/install.zig6
-rw-r--r--src/install/lockfile.zig2
3 files changed, 8 insertions, 6 deletions
diff --git a/src/cli/run_command.zig b/src/cli/run_command.zig
index cf1e4dc99..1c5f3e1ec 100644
--- a/src/cli/run_command.zig
+++ b/src/cli/run_command.zig
@@ -397,9 +397,9 @@ pub const RunCommand = struct {
}
pub fn deinit(this: *PostinstallSubprocess, alloc: std.mem.Allocator) void {
- _ = this.stdout_poll.unregister(this.package_manager.uws_event_loop);
- _ = this.stderr_poll.unregister(this.package_manager.uws_event_loop);
- _ = this.pid_poll.unregister(this.package_manager.uws_event_loop);
+ _ = this.stdout_poll.unregister(this.package_manager.uws_event_loop, false);
+ _ = this.stderr_poll.unregister(this.package_manager.uws_event_loop, false);
+ _ = this.pid_poll.unregister(this.package_manager.uws_event_loop, false);
_ = bun.sys.close(this.stdout_poll.fileDescriptor());
_ = bun.sys.close(this.stderr_poll.fileDescriptor());
diff --git a/src/install/install.zig b/src/install/install.zig
index 4a20d1b9f..52025aa04 100644
--- a/src/install/install.zig
+++ b/src/install/install.zig
@@ -5622,7 +5622,7 @@ pub const PackageManager = struct {
.resolve_tasks = TaskChannel.init(),
.lockfile = undefined,
.root_package_json_file = package_json_file,
- .waiter = try Waker.init(ctx.allocator),
+ .waiter = Waiter.fromUWSLoop(uws.Loop.get()),
.workspaces = workspaces,
// .progress
.uws_event_loop = uws.Loop.get(),
@@ -5703,7 +5703,9 @@ pub const PackageManager = struct {
.resolve_tasks = TaskChannel.init(),
.lockfile = undefined,
.root_package_json_file = undefined,
- .waiter = try Waker.init(allocator),
+ .waiter = Waiter.fromUWSLoop(uws.Loop.get()),
+ .uws_event_loop = uws.Loop.get(),
+ .file_poll_store = JSC.FilePoll.Store.init(allocator),
.workspaces = std.StringArrayHashMap(?Semver.Version).init(allocator),
};
manager.lockfile = try allocator.create(Lockfile);
diff --git a/src/install/lockfile.zig b/src/install/lockfile.zig
index bcfd72038..5acf326c6 100644
--- a/src/install/lockfile.zig
+++ b/src/install/lockfile.zig
@@ -166,7 +166,7 @@ pub const Scripts = struct {
}
while (ctx.pending_tasks > 0) {
- ctx.uws_event_loop.tick();
+ ctx.uws_event_loop.tick(null);
}
}
}