Reland refactor(cli): use new sanitizer for resources #22226
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eb69100 to
a99a452
Compare
bartlomieju
reviewed
Feb 5, 2024
Comment on lines
+142
to
+215
| fn pretty_resource_name( | ||
| name: &str, | ||
| ) -> (Cow<'static, str>, &'static str, &'static str) { | ||
| let (name, action1, action2) = match name { | ||
| "fsFile" => ("A file", "opened", "closed"), | ||
| "fetchRequest" => ("A fetch request", "started", "finished"), | ||
| "fetchRequestBody" => ("A fetch request body", "created", "closed"), | ||
| "fetchResponse" => ("A fetch response body", "created", "consumed"), | ||
| "httpClient" => ("An HTTP client", "created", "closed"), | ||
| "dynamicLibrary" => ("A dynamic library", "loaded", "unloaded"), | ||
| "httpConn" => ("An inbound HTTP connection", "accepted", "closed"), | ||
| "httpStream" => ("An inbound HTTP request", "accepted", "closed"), | ||
| "tcpStream" => ("A TCP connection", "opened/accepted", "closed"), | ||
| "unixStream" => ("A Unix connection", "opened/accepted", "closed"), | ||
| "tlsStream" => ("A TLS connection", "opened/accepted", "closed"), | ||
| "tlsListener" => ("A TLS listener", "opened", "closed"), | ||
| "unixListener" => ("A Unix listener", "opened", "closed"), | ||
| "unixDatagram" => ("A Unix datagram", "opened", "closed"), | ||
| "tcpListener" => ("A TCP listener", "opened", "closed"), | ||
| "udpSocket" => ("A UDP socket", "opened", "closed"), | ||
| "timer" => ("A timer", "started", "fired/cleared"), | ||
| "textDecoder" => ("A text decoder", "created", "finished"), | ||
| "messagePort" => ("A message port", "created", "closed"), | ||
| "webSocketStream" => ("A WebSocket", "opened", "closed"), | ||
| "fsEvents" => ("A file system watcher", "created", "closed"), | ||
| "childStdin" => ("A child process stdin", "opened", "closed"), | ||
| "childStdout" => ("A child process stdout", "opened", "closed"), | ||
| "childStderr" => ("A child process stderr", "opened", "closed"), | ||
| "child" => ("A child process", "started", "closed"), | ||
| "signal" => ("A signal listener", "created", "fired/cleared"), | ||
| "stdin" => ("The stdin pipe", "opened", "closed"), | ||
| "stdout" => ("The stdout pipe", "opened", "closed"), | ||
| "stderr" => ("The stderr pipe", "opened", "closed"), | ||
| "compression" => ("A CompressionStream", "created", "closed"), | ||
| _ => return (format!("\"{name}\"").into(), "created", "cleaned up"), | ||
| }; | ||
| (name.into(), action1, action2) | ||
| } | ||
|
|
||
| fn resource_close_hint(name: &str) -> &'static str { | ||
| match name { | ||
| "fsFile" => "Close the file handle by calling `file.close()`.", | ||
| "fetchRequest" => "Await the promise returned from `fetch()` or abort the fetch with an abort signal.", | ||
| "fetchRequestBody" => "Terminate the request body `ReadableStream` by closing or erroring it.", | ||
| "fetchResponse" => "Consume or close the response body `ReadableStream`, e.g `await resp.text()` or `await resp.body.cancel()`.", | ||
| "httpClient" => "Close the HTTP client by calling `httpClient.close()`.", | ||
| "dynamicLibrary" => "Unload the dynamic library by calling `dynamicLibrary.close()`.", | ||
| "httpConn" => "Close the inbound HTTP connection by calling `httpConn.close()`.", | ||
| "httpStream" => "Close the inbound HTTP request by responding with `e.respondWith()` or closing the HTTP connection.", | ||
| "tcpStream" => "Close the TCP connection by calling `tcpConn.close()`.", | ||
| "unixStream" => "Close the Unix socket connection by calling `unixConn.close()`.", | ||
| "tlsStream" => "Close the TLS connection by calling `tlsConn.close()`.", | ||
| "tlsListener" => "Close the TLS listener by calling `tlsListener.close()`.", | ||
| "unixListener" => "Close the Unix socket listener by calling `unixListener.close()`.", | ||
| "unixDatagram" => "Close the Unix datagram socket by calling `unixDatagram.close()`.", | ||
| "tcpListener" => "Close the TCP listener by calling `tcpListener.close()`.", | ||
| "udpSocket" => "Close the UDP socket by calling `udpSocket.close()`.", | ||
| "timer" => "Clear the timer by calling `clearInterval` or `clearTimeout`.", | ||
| "textDecoder" => "Close the text decoder by calling `textDecoder.decode('')` or `await textDecoderStream.readable.cancel()`.", | ||
| "messagePort" => "Close the message port by calling `messagePort.close()`.", | ||
| "webSocketStream" => "Close the WebSocket by calling `webSocket.close()`.", | ||
| "fsEvents" => "Close the file system watcher by calling `watcher.close()`.", | ||
| "childStdin" => "Close the child process stdin by calling `proc.stdin.close()`.", | ||
| "childStdout" => "Close the child process stdout by calling `proc.stdout.close()` or `await child.stdout.cancel()`.", | ||
| "childStderr" => "Close the child process stderr by calling `proc.stderr.close()` or `await child.stderr.cancel()`.", | ||
| "child" => "Close the child process by calling `proc.kill()` or `proc.close()`.", | ||
| "signal" => "Clear the signal listener by calling `Deno.removeSignalListener`.", | ||
| "stdin" => "Close the stdin pipe by calling `Deno.stdin.close()`.", | ||
| "stdout" => "Close the stdout pipe by calling `Deno.stdout.close()`.", | ||
| "stderr" => "Close the stderr pipe by calling `Deno.stderr.close()`.", | ||
| "compression" => "Close the compression stream by calling `await stream.writable.close()`.", | ||
| _ => "Close the resource before the end of the test.", | ||
| } | ||
| } |
There was a problem hiding this comment.
Consider doing these in a separate PR - in case we need to revert again, we'll keep diffs small and we know this code is ok
There was a problem hiding this comment.
Might even add relevant ops to reach for this data into Rust, so we can apply most of the changes from 40_test.js?
c20a3d1 to
f22bd06
Compare
mmastrac
added a commit
that referenced
this pull request
Feb 5, 2024
Extract zero-risk changes from #22226
Step 1 of the Rustification of sanitizers, which unblocks the faster
timers.
This replaces the resource sanitizer with a Rust one, using the new APIs
in deno_core.
f22bd06 to
6bf85fa
Compare
bartlomieju
approved these changes
Feb 5, 2024
littledivy
pushed a commit
that referenced
this pull request
Feb 8, 2024
Extract zero-risk changes from #22226
littledivy
pushed a commit
that referenced
this pull request
Feb 8, 2024
Originally in #22125 Reverted in #22153 because of #22148 Fixed in deno_core denoland/deno_core#538 Test plan: 1. Check out: https://github.com/poolifier/poolifier-deno.git 2. `PATH=.../deno/target/release/:$PATH deno task test` 3. `ok | 13 passed (188 steps) | 0 failed (18s)`
mmastrac
added a commit
that referenced
this pull request
Feb 16, 2024
The format of the sanitizers will change a little bit: - If multiple async ops leak and traces are on, we repeat the async op header once per stack trace. - All leaks are aggregated under a "Leaks detected:" banner as the new timers are eventually going to be added, and these are neither ops nor resources. - `1 async op` is now `An async op` - If ops and resources leak, we show both (rather than op leaks masking resources) Follow-on to #22226
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Originally in #22125
Reverted in #22153 because of #22148
Fixed in deno_core denoland/deno_core#538
Test plan:
Check out: https://github.com/poolifier/poolifier-deno.git
PATH=.../deno/target/release/:$PATH deno task testok | 13 passed (188 steps) | 0 failed (18s)