summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDivy Srivastava <dj.srivastava23@gmail.com>2023-12-15 16:20:05 +0530
committerGitHub <noreply@github.com>2023-12-15 11:50:05 +0100
commit81a6504e670d32bdc5e0a8328c328fdf8e208913 (patch)
tree27a90846e42edd1863e45e9792375d7777f10667
parent62e3f5060ef9cc6a31b3e496dd15548c0abd07e6 (diff)
refactor: setup child process pipe in Rust (#21579)
Avoid passing the fd into JS and back into Rust. Instead we setup the child's end of the pipe directly using a special Rust op.
-rw-r--r--ext/node/lib.rs2
-rw-r--r--ext/node/ops/ipc.rs24
-rw-r--r--ext/node/polyfills/02_init.js3
-rw-r--r--ext/node/polyfills/child_process.ts4
-rw-r--r--runtime/js/99_main.js3
-rw-r--r--runtime/worker.rs11
-rw-r--r--runtime/worker_bootstrap.rs3
7 files changed, 41 insertions, 9 deletions
diff --git a/ext/node/lib.rs b/ext/node/lib.rs
index 77f01b3d3..dd3acd17c 100644
--- a/ext/node/lib.rs
+++ b/ext/node/lib.rs
@@ -30,6 +30,7 @@ mod path;
mod polyfill;
mod resolution;
+pub use ops::ipc::ChildPipeFd;
pub use ops::v8::VM_CONTEXT_INDEX;
pub use package_json::PackageJson;
pub use path::PathClean;
@@ -313,6 +314,7 @@ deno_core::extension!(deno_node,
ops::util::op_node_guess_handle_type,
ops::crypto::op_node_create_private_key,
ops::ipc::op_node_ipc_pipe,
+ ops::ipc::op_node_child_ipc_pipe,
ops::ipc::op_node_ipc_write,
ops::ipc::op_node_ipc_read,
],
diff --git a/ext/node/ops/ipc.rs b/ext/node/ops/ipc.rs
index d1aeeb40c..afaccc49f 100644
--- a/ext/node/ops/ipc.rs
+++ b/ext/node/ops/ipc.rs
@@ -6,6 +6,8 @@ pub use unix::*;
#[cfg(windows)]
pub use windows::*;
+pub struct ChildPipeFd(pub i32);
+
#[cfg(unix)]
mod unix {
use std::cell::RefCell;
@@ -46,6 +48,22 @@ mod unix {
Ok(state.resource_table.add(IpcJsonStreamResource::new(fd)?))
}
+ // Open IPC pipe from bootstrap options.
+ #[op2]
+ #[smi]
+ pub fn op_node_child_ipc_pipe(
+ state: &mut OpState,
+ ) -> Result<Option<ResourceId>, AnyError> {
+ let fd = match state.try_borrow_mut::<crate::ChildPipeFd>() {
+ Some(child_pipe_fd) => child_pipe_fd.0,
+ None => return Ok(None),
+ };
+
+ Ok(Some(
+ state.resource_table.add(IpcJsonStreamResource::new(fd)?),
+ ))
+ }
+
#[op2(async)]
pub async fn op_node_ipc_write(
state: Rc<RefCell<OpState>>,
@@ -492,6 +510,12 @@ mod windows {
Err(deno_core::error::not_supported())
}
+ #[op2(fast)]
+ #[smi]
+ pub fn op_node_child_ipc_pipe() -> Result<i32, AnyError> {
+ Ok(-1)
+ }
+
#[op2(async)]
pub async fn op_node_ipc_write() -> Result<(), AnyError> {
Err(deno_core::error::not_supported())
diff --git a/ext/node/polyfills/02_init.js b/ext/node/polyfills/02_init.js
index e5a0279a5..8d9405c16 100644
--- a/ext/node/polyfills/02_init.js
+++ b/ext/node/polyfills/02_init.js
@@ -12,7 +12,6 @@ let initialized = false;
function initialize(
usesLocalNodeModulesDir,
argv0,
- ipcFd,
) {
if (initialized) {
throw Error("Node runtime already initialized");
@@ -38,7 +37,7 @@ function initialize(
// but it's the only way to get `args` and `version` and this point.
internals.__bootstrapNodeProcess(argv0, Deno.args, Deno.version);
internals.__initWorkerThreads();
- internals.__setupChildProcessIpcChannel(ipcFd);
+ internals.__setupChildProcessIpcChannel();
// `Deno[Deno.internal].requireImpl` will be unreachable after this line.
delete internals.requireImpl;
}
diff --git a/ext/node/polyfills/child_process.ts b/ext/node/polyfills/child_process.ts
index c7d007f46..da82546f6 100644
--- a/ext/node/polyfills/child_process.ts
+++ b/ext/node/polyfills/child_process.ts
@@ -49,6 +49,7 @@ import {
} from "ext:deno_node/internal/util.mjs";
const { core } = globalThis.__bootstrap;
+const ops = core.ops;
const MAX_BUFFER = 1024 * 1024;
@@ -822,7 +823,8 @@ export function execFileSync(
return ret.stdout as string | Buffer;
}
-function setupChildProcessIpcChannel(fd: number) {
+function setupChildProcessIpcChannel() {
+ const fd = ops.op_node_child_ipc_pipe();
if (typeof fd != "number" || fd < 0) return;
setupChannel(process, fd);
}
diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js
index 5b4b164a2..0469b38bf 100644
--- a/runtime/js/99_main.js
+++ b/runtime/js/99_main.js
@@ -440,7 +440,6 @@ function bootstrapMainRuntime(runtimeOptions) {
3: inspectFlag,
5: hasNodeModulesDir,
6: maybeBinaryNpmCommandName,
- 7: nodeIpcFd,
} = runtimeOptions;
performance.setTimeOrigin(DateNow());
@@ -546,7 +545,7 @@ function bootstrapMainRuntime(runtimeOptions) {
ObjectDefineProperty(globalThis, "Deno", util.readOnly(finalDenoNs));
if (nodeBootstrap) {
- nodeBootstrap(hasNodeModulesDir, maybeBinaryNpmCommandName, nodeIpcFd);
+ nodeBootstrap(hasNodeModulesDir, maybeBinaryNpmCommandName);
}
}
diff --git a/runtime/worker.rs b/runtime/worker.rs
index 94b0d9606..549a6cdd6 100644
--- a/runtime/worker.rs
+++ b/runtime/worker.rs
@@ -487,7 +487,16 @@ impl MainWorker {
}
pub fn bootstrap(&mut self, options: BootstrapOptions) {
- self.js_runtime.op_state().borrow_mut().put(options.clone());
+ // Setup bootstrap options for ops.
+ {
+ let op_state = self.js_runtime.op_state();
+ let mut state = op_state.borrow_mut();
+ state.put(options.clone());
+ if let Some(node_ipc_fd) = options.node_ipc_fd {
+ state.put(deno_node::ChildPipeFd(node_ipc_fd));
+ }
+ }
+
let scope = &mut self.js_runtime.handle_scope();
let args = options.as_v8(scope);
let bootstrap_fn = self.bootstrap_fn_global.take().unwrap();
diff --git a/runtime/worker_bootstrap.rs b/runtime/worker_bootstrap.rs
index 8674190f3..97d66158b 100644
--- a/runtime/worker_bootstrap.rs
+++ b/runtime/worker_bootstrap.rs
@@ -117,8 +117,6 @@ struct BootstrapV8<'a>(
bool,
// maybe_binary_npm_command_name
Option<&'a str>,
- // node_ipc_fd
- i32,
);
impl BootstrapOptions {
@@ -138,7 +136,6 @@ impl BootstrapOptions {
self.enable_testing_features,
self.has_node_modules_dir,
self.maybe_binary_npm_command_name.as_deref(),
- self.node_ipc_fd.unwrap_or(-1),
);
bootstrap.serialize(ser).unwrap()