diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2019-11-14 04:16:57 +0100 |
---|---|---|
committer | Ry Dahl <ry@tinyclouds.org> | 2019-11-13 22:16:57 -0500 |
commit | fd62379eafde6571f126df5650b80cfda9f74229 (patch) | |
tree | 34579151043837aaae17b36179c0aa5cf6b5e5aa /cli/ops/repl.rs | |
parent | af448e864c4ac7e2ec601a25d46f95861ff5ade0 (diff) |
refactor: per-worker resource table (#3306)
- removes global `RESOURCE_TABLE` - resource tables are now created per `Worker`
in `State`
- renames `CliResource` to `StreamResource` and moves all logic related
to it to `cli/ops/io.rs`
- removes `cli/resources.rs`
- adds `state` argument to `op_read` and `op_write` and consequently adds
`stateful_minimal_op` to `State`
- IMPORTANT NOTE: workers don't have access to process stdio - this is
caused by fact that dropping worker would close stdout for process
(because it's constructed from raw handle, which closes underlying file
descriptor on drop)
Diffstat (limited to 'cli/ops/repl.rs')
-rw-r--r-- | cli/ops/repl.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cli/ops/repl.rs b/cli/ops/repl.rs index 723fb2571..5919ea586 100644 --- a/cli/ops/repl.rs +++ b/cli/ops/repl.rs @@ -4,9 +4,8 @@ use crate::deno_error::bad_resource; use crate::ops::json_op; use crate::repl; use crate::repl::Repl; -use crate::resources; -use crate::resources::Resource; use crate::state::ThreadSafeState; +use deno::Resource; use deno::*; use std::sync::Arc; use std::sync::Mutex; @@ -44,7 +43,7 @@ fn op_repl_start( repl::history_path(&state.global_state.dir, &args.history_file); let repl = repl::Repl::new(history_path); let resource = ReplResource(Arc::new(Mutex::new(repl))); - let mut table = resources::lock_resource_table(); + let mut table = state.lock_resource_table(); let rid = table.add("repl", Box::new(resource)); Ok(JsonOp::Sync(json!(rid))) } @@ -56,7 +55,7 @@ struct ReplReadlineArgs { } fn op_repl_readline( - _state: &ThreadSafeState, + state: &ThreadSafeState, args: Value, _zero_copy: Option<PinnedBuf>, ) -> Result<JsonOp, ErrBox> { @@ -64,9 +63,10 @@ fn op_repl_readline( let rid = args.rid as u32; let prompt = args.prompt; debug!("op_repl_readline {} {}", rid, prompt); + let state = state.clone(); blocking_json(false, move || { - let table = resources::lock_resource_table(); + let table = state.lock_resource_table(); let resource = table.get::<ReplResource>(rid).ok_or_else(bad_resource)?; let repl = resource.0.clone(); let line = repl.lock().unwrap().readline(&prompt)?; |