Skip to content

Commit

Permalink
Remove unstable Deno.sleepSync (denoland#14719)
Browse files Browse the repository at this point in the history
Co-authored-by: David Sherret <[email protected]>
  • Loading branch information
ry and dsherret committed Jun 13, 2022
1 parent e6218d9 commit 21dfeea
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 83 deletions.
1 change: 0 additions & 1 deletion cli/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ const UNSTABLE_DENO_PROPS: &[&str] = &[
"setRaw",
"shutdown",
"Signal",
"sleepSync",
"startTls",
"systemMemoryInfo",
"umask",
Expand Down
11 changes: 0 additions & 11 deletions cli/dts/lib.deno.unstable.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -751,17 +751,6 @@ declare namespace Deno {
mtime: number | Date,
): Promise<void>;

/** **UNSTABLE**: new API, yet to be vetted.
*
* SleepSync puts the main thread to sleep synchronously for a given amount of
* time in milliseconds.
*
* ```ts
* Deno.sleepSync(10);
* ```
*/
export function sleepSync(millis: number): void;

/** **UNSTABLE**: new API, yet to be vetted.
*
* A generic transport listener for message-oriented protocols. */
Expand Down
8 changes: 4 additions & 4 deletions cli/tests/testdata/worker_drop_handle_race_terminate.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ const WORKER2 = getCodeBlobUrl(`
console.log("Worker 2");
self.postMessage(undefined);
// We sleep for slightly under 2 seconds in order to make sure that worker 1
// has closed, and that this worker's thread finishes normally rather than
// being killed (which happens 2 seconds after calling terminate).
Deno.sleepSync(1800);
// We sleep synchronously for slightly under 2 seconds in order to make sure
// that worker 1 has closed, and that this worker's thread finishes normally
// rather than being killed (which happens 2 seconds after calling terminate).
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 1800);
console.log("Finished sleeping in worker 2");
`);

Expand Down
2 changes: 1 addition & 1 deletion cli/tests/unit/flock_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ function runFlockTestProcess(opts: { exclusive: boolean; sync: boolean }) {
// the lock so that the enter time of the next process doesn't
// occur at the same time as this exit time
const exitTime = new Date().getTime();
Deno.sleepSync(100);
await new Promise(resolve => setTimeout(resolve, 100));
// release the lock
${opts.sync ? "Deno.funlockSync(rid);" : "await Deno.funlock(rid);"}
Expand Down
52 changes: 3 additions & 49 deletions cli/tests/unit/timers_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ Deno.test(async function callbackTakesLongerThanInterval() {
const interval = setInterval(() => {
if (timeEndOfFirstCallback === undefined) {
// First callback
Deno.sleepSync(300);
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 300);
timeEndOfFirstCallback = Date.now();
} else {
// Second callback
Expand All @@ -237,7 +237,7 @@ Deno.test(async function clearTimeoutAfterNextTimerIsDue1() {
}, 300);

const interval = setInterval(() => {
Deno.sleepSync(400);
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 400);
// Both the interval and the timeout's due times are now in the past.
clearInterval(interval);
}, 100);
Expand All @@ -255,7 +255,7 @@ Deno.test(async function clearTimeoutAfterNextTimerIsDue2() {
promise.resolve();
}, 200);

Deno.sleepSync(300);
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 300);
// Both of the timeouts' due times are now in the past.
clearTimeout(timeout1);

Expand Down Expand Up @@ -531,52 +531,6 @@ Deno.test(async function timerIgnoresDateOverride() {
assertEquals(hasThrown, 1);
});

Deno.test({ permissions: { hrtime: true } }, function sleepSync() {
const start = performance.now();
Deno.sleepSync(10);
const after = performance.now();
assert(after - start >= 10);
});

Deno.test(
{ permissions: { hrtime: true } },
async function sleepSyncShorterPromise() {
const perf = performance;
const short = 5;
const long = 10;

const start = perf.now();
const p = delay(short).then(() => {
const after = perf.now();
// pending promises should resolve after the main thread comes out of sleep
assert(after - start >= long);
});
Deno.sleepSync(long);

await p;
},
);

Deno.test(
{ permissions: { hrtime: true } },
async function sleepSyncLongerPromise() {
const perf = performance;
const short = 5;
const long = 10;

const start = perf.now();
const p = delay(long).then(() => {
const after = perf.now();
// sleeping for less than the duration of a promise should have no impact
// on the resolution of that promise
assert(after - start >= long);
});
Deno.sleepSync(short);

await p;
},
);

Deno.test({
name: "unrefTimer",
permissions: { run: true, read: true },
Expand Down
5 changes: 0 additions & 5 deletions ext/web/02_timers.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
return core.opSync("op_now");
}

function sleepSync(millis = 0) {
return core.opSync("op_sleep_sync", millis);
}

// ---------------------------------------------------------------------------

/**
Expand Down Expand Up @@ -372,7 +368,6 @@
clearInterval,
handleTimerMacrotask,
opNow,
sleepSync,
refTimer,
unrefTimer,
};
Expand Down
2 changes: 0 additions & 2 deletions ext/web/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ pub use crate::message_port::MessagePort;

use crate::timers::op_now;
use crate::timers::op_sleep;
use crate::timers::op_sleep_sync;
use crate::timers::op_timer_handle;
use crate::timers::StartTime;
pub use crate::timers::TimersPermission;
Expand Down Expand Up @@ -111,7 +110,6 @@ pub fn init<P: TimersPermission + 'static>(
op_timer_handle::decl(),
op_cancel_handle::decl(),
op_sleep::decl(),
op_sleep_sync::decl::<P>(),
])
.state(move |state| {
state.put(blob_store.clone());
Expand Down
9 changes: 0 additions & 9 deletions ext/web/timers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,3 @@ pub async fn op_sleep(
.await?;
Ok(())
}

#[op]
pub fn op_sleep_sync<TP>(state: &mut OpState, millis: u64)
where
TP: TimersPermission + 'static,
{
state.borrow::<TP>().check_unstable(state, "Deno.sleepSync");
std::thread::sleep(Duration::from_millis(millis));
}
1 change: 0 additions & 1 deletion runtime/js/90_deno_ns.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
networkInterfaces: __bootstrap.os.networkInterfaces,
getGid: __bootstrap.os.getGid,
getUid: __bootstrap.os.getUid,
sleepSync: __bootstrap.timers.sleepSync,
listen: __bootstrap.netUnstable.listen,
connect: __bootstrap.netUnstable.connect,
listenDatagram: __bootstrap.netUnstable.listenDatagram,
Expand Down

0 comments on commit 21dfeea

Please sign in to comment.