summaryrefslogtreecommitdiff
path: root/cli/resources.rs
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2019-04-28 14:15:15 -0700
committerGitHub <noreply@github.com>2019-04-28 14:15:15 -0700
commit1af02b405e99f40bfe76ca7dfb596e6de959106b (patch)
tree77e85f40a077093e9a733a6c2fc47d539b41bc70 /cli/resources.rs
parenta4551c853e25a08ea479c5b75f60dc4109eee72f (diff)
Revert "recover: #1517 Kill all pending accepts when TCP listener is closed (#2224)" (#2239)
Crashes while running wrk against js/deps/https/deno.land/std/http/http_bench.ts This reverts commit 972ac03858cc11e8b6bb759ee69640d17235580d.
Diffstat (limited to 'cli/resources.rs')
-rw-r--r--cli/resources.rs37
1 files changed, 0 insertions, 37 deletions
diff --git a/cli/resources.rs b/cli/resources.rs
index 66a2ebdb3..3a7121d4c 100644
--- a/cli/resources.rs
+++ b/cli/resources.rs
@@ -171,49 +171,12 @@ impl Resource {
}
}
- /// Track the current task (for TcpListener resource).
- /// Throws an error if another task is already tracked.
- pub fn track_task(&mut self) -> Result<(), std::io::Error> {
- let mut table = RESOURCE_TABLE.lock().unwrap();
- // Only track if is TcpListener.
- if let Some(Repr::TcpListener(_, t)) = table.get_mut(&self.rid) {
- // Currently, we only allow tracking a single accept task for a listener.
- // This might be changed in the future with multiple workers.
- // Caveat: TcpListener by itself also only tracks an accept task at a time.
- // See https://github.com/tokio-rs/tokio/issues/846#issuecomment-454208883
- if t.is_some() {
- return Err(std::io::Error::new(
- std::io::ErrorKind::Other,
- "Another accept task is ongoing",
- ));
- }
- t.replace(futures::task::current());
- }
- Ok(())
- }
-
- /// Stop tracking a task (for TcpListener resource).
- /// Happens when the task is done and thus no further tracking is needed.
- pub fn untrack_task(&mut self) {
- let mut table = RESOURCE_TABLE.lock().unwrap();
- // Only untrack if is TcpListener.
- if let Some(Repr::TcpListener(_, t)) = table.get_mut(&self.rid) {
- assert!(t.is_some());
- t.take();
- }
- }
-
// close(2) is done by dropping the value. Therefore we just need to remove
// the resource from the RESOURCE_TABLE.
pub fn close(&self) {
let mut table = RESOURCE_TABLE.lock().unwrap();
let r = table.remove(&self.rid);
assert!(r.is_some());
- // If TcpListener, we must kill all pending accepts!
- if let Repr::TcpListener(_, Some(t)) = r.unwrap() {
- // Call notify on the tracked task, so that they would error out.
- t.notify();
- }
}
pub fn shutdown(&mut self, how: Shutdown) -> Result<(), DenoError> {