1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 23:34:47 -05:00

Add SetGlobalTimeout().

To be used for a timers implementation soon.
This commit is contained in:
Ryan Dahl 2018-09-24 22:46:36 -04:00
parent 4fd2b19f64
commit b088b58f76
6 changed files with 33 additions and 0 deletions

View file

@ -15,4 +15,5 @@ export { ErrorKind, DenoError } from "./errors";
export { libdeno } from "./libdeno"; export { libdeno } from "./libdeno";
export { arch, platform } from "./platform"; export { arch, platform } from "./platform";
export { trace } from "./trace"; export { trace } from "./trace";
export { setGlobalTimeout } from "./timers";
export const args: string[] = []; export const args: string[] = [];

View file

@ -19,6 +19,15 @@ interface Timer {
delay: number; // milliseconds delay: number; // milliseconds
} }
export function setGlobalTimeout(timeout: number) {
const builder = new flatbuffers.Builder();
fbs.SetTimeout.startSetTimeout(builder);
fbs.SetTimeout.addTimeout(builder, timeout);
const msg = fbs.SetTimeout.endSetTimeout(builder);
const res = sendSync(builder, fbs.Any.SetTimeout, msg);
assert(res == null);
}
function startTimer( function startTimer(
id: number, id: number,
cb: TimerCallback, cb: TimerCallback,

View file

@ -1,4 +1,5 @@
import { test, assertEqual } from "./test_util.ts"; import { test, assertEqual } from "./test_util.ts";
import { setGlobalTimeout } from "deno";
function deferred() { function deferred() {
let resolve; let resolve;
@ -95,3 +96,7 @@ test(async function intervalCancelInvalidSilentFail() {
// Should silently fail (no panic) // Should silently fail (no panic)
clearInterval(2147483647); clearInterval(2147483647);
}); });
test(async function SetGlobalTimeoutSmoke() {
setGlobalTimeout(50);
});

View file

@ -45,6 +45,7 @@ pub fn msg_from_js(state: Arc<IsolateState>, bytes: &[u8]) -> (bool, Box<Op>) {
msg::Any::Start => handle_start, msg::Any::Start => handle_start,
msg::Any::CodeFetch => handle_code_fetch, msg::Any::CodeFetch => handle_code_fetch,
msg::Any::CodeCache => handle_code_cache, msg::Any::CodeCache => handle_code_cache,
msg::Any::SetTimeout => handle_set_timeout,
msg::Any::Environ => handle_env, msg::Any::Environ => handle_env,
msg::Any::FetchReq => handle_fetch_req, msg::Any::FetchReq => handle_fetch_req,
msg::Any::TimerStart => handle_timer_start, msg::Any::TimerStart => handle_timer_start,
@ -236,6 +237,15 @@ fn handle_code_cache(state: Arc<IsolateState>, base: &msg::Base) -> Box<Op> {
}())) }()))
} }
fn handle_set_timeout(state: Arc<IsolateState>, base: &msg::Base) -> Box<Op> {
let msg = base.msg_as_set_timeout().unwrap();
let val = msg.timeout() as isize;
state
.timeout
.swap(val, std::sync::atomic::Ordering::Relaxed);
ok_future(empty_buf())
}
fn handle_set_env(state: Arc<IsolateState>, base: &msg::Base) -> Box<Op> { fn handle_set_env(state: Arc<IsolateState>, base: &msg::Base) -> Box<Op> {
let msg = base.msg_as_set_env().unwrap(); let msg = base.msg_as_set_env().unwrap();
let key = msg.key().unwrap(); let key = msg.key().unwrap();

View file

@ -16,6 +16,7 @@ use std;
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::CStr; use std::ffi::CStr;
use std::ffi::CString; use std::ffi::CString;
use std::sync::atomic::AtomicIsize;
use std::sync::mpsc; use std::sync::mpsc;
use std::sync::Arc; use std::sync::Arc;
use std::sync::Mutex; use std::sync::Mutex;
@ -48,6 +49,7 @@ pub struct Isolate {
// Isolate cannot be passed between threads but IsolateState can. So any state that // Isolate cannot be passed between threads but IsolateState can. So any state that
// needs to be accessed outside the main V8 thread should be inside IsolateState. // needs to be accessed outside the main V8 thread should be inside IsolateState.
pub struct IsolateState { pub struct IsolateState {
pub timeout: AtomicIsize,
pub dir: deno_dir::DenoDir, pub dir: deno_dir::DenoDir,
pub timers: Mutex<HashMap<u32, futures::sync::oneshot::Sender<()>>>, pub timers: Mutex<HashMap<u32, futures::sync::oneshot::Sender<()>>>,
pub argv: Vec<String>, pub argv: Vec<String>,
@ -85,6 +87,7 @@ impl Isolate {
rx, rx,
ntasks: 0, ntasks: 0,
state: Arc::new(IsolateState { state: Arc::new(IsolateState {
timeout: AtomicIsize::new(-1),
dir: deno_dir::DenoDir::new(flags.reload, None).unwrap(), dir: deno_dir::DenoDir::new(flags.reload, None).unwrap(),
timers: Mutex::new(HashMap::new()), timers: Mutex::new(HashMap::new()),
argv: argv_rest, argv: argv_rest,

View file

@ -4,6 +4,7 @@ union Any {
CodeFetch, CodeFetch,
CodeFetchRes, CodeFetchRes,
CodeCache, CodeCache,
SetTimeout,
Exit, Exit,
TimerStart, TimerStart,
TimerReady, TimerReady,
@ -115,6 +116,10 @@ table CodeCache {
output_code: string; output_code: string;
} }
table SetTimeout {
timeout: int;
}
table Exit { table Exit {
code: int; code: int;
} }