mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-11 03:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak how we handle bun's process initialization (#9588)

Browse Source 
* Tweak how we handle bun's process initialization

* Update panic_handler.zig

* Update output.zig

* Update __global.zig

* Update __global.zig

* Delete WindowsSpawnWorkaround, fix tests

* Fix bug in Bun.spawn on Linux when O_CLOEXEC is set on stdin stdout or stderr

* More errors

* tweak

* Bounds check

* Update install.zig

* Update dependency.zig

---------

Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Co-authored-by: Zack Radisic <zack@theradisic.com>
This commit is contained in:
Jarred Sumner
2024-03-24 12:09:16 -07:00
committed by GitHub
parent 73fc225c4c
commit e8bb3389ef
17 changed files with 404 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/cli/create_command.zig
View File

@@ -109,8 +109,6 @@ fn execTask(allocator: std.mem.Allocator, task_: string, cwd: string, _: string,
const npm_args = 2 * @as(usize, @intCast(@intFromBool(npm_client != null)));
const total = count + npm_args;
var argv = allocator.alloc(string, total) catch return;
var proc: std.ChildProcess = undefined;
defer if (argv.len > 32) allocator.free(argv);
if (npm_client) |client| {
argv[0] = client.bin;
@@ -146,19 +144,19 @@ fn execTask(allocator: std.mem.Allocator, task_: string, cwd: string, _: string,
Output.disableBuffering();
defer Output.enableBuffering();
proc = std.ChildProcess.init(argv, allocator);
proc.stdin_behavior = .Inherit;
proc.stdout_behavior = .Inherit;
proc.stderr_behavior = .Inherit;
proc.cwd = cwd;
_ = bun.spawnSync(&.{
.argv = argv,
.envp = null,
if (Environment.isWindows) {
bun.WindowsSpawnWorkaround.spawnWindows(&proc) catch return;
} else {
proc.spawn() catch return;
}
.cwd = cwd,
.stderr = .inherit,
.stdout = .inherit,
.stdin = .inherit,
_ = proc.wait() catch {};
.windows = if (Environment.isWindows) .{
.loop = bun.JSC.EventLoopHandle.init(bun.JSC.MiniEventLoop.initGlobal(null)),
} else {},
}) catch return;
}
// We don't want to allocate memory each time
@@ -1427,10 +1425,6 @@ pub const CreateCommand = struct {
Output.pretty("<r>\n", .{});
Output.flush();
var process = std.ChildProcess.init(install_args, ctx.allocator);
process.cwd = destination;
defer {
Output.printErrorln("\n", .{});
Output.printStartEnd(start_time, std.time.nanoTimestamp());
@@ -1441,13 +1435,19 @@ pub const CreateCommand = struct {
Output.flush();
}
if (Environment.isWindows) {
try bun.WindowsSpawnWorkaround.spawnWindows(&process);
} else {
try process.spawn();
}
_ = try process.wait();
_ = try process.kill();
const process = try bun.spawnSync(&.{
.argv = install_args,
.envp = null,
.cwd = destination,
.stderr = .inherit,
.stdout = .inherit,
.stdin = .inherit,
.windows = if (Environment.isWindows) .{
.loop = bun.JSC.EventLoopHandle.init(bun.JSC.MiniEventLoop.initGlobal(null)),
} else {},
});
_ = try process.unwrap();
}
if (postinstall_tasks.items.len > 0) {