Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STJ: Dispose enumerator on exception #100194

Merged
merged 9 commits into from
Jun 25, 2024

Conversation

manandre
Copy link
Contributor

Fixes #50851

@dotnet-policy-service dotnet-policy-service bot added the community-contribution Indicates that the PR has been added by a community member label Mar 23, 2024
Copy link
Member

@eiriktsarpalis eiriktsarpalis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's been a while since I last visited this problem, but IIRC fixing the issue is not as simple as proposed in this PR:

  1. It needs to take into account the state machines used in async serialization. See https://github.com/dotnet/runtime/pull/50778/files#diff-65021de09c4fb9b39607f1f3ed228e53cd04b483880f66b0ea56310f71a5e400R131-R137 for hints on how this was done for IAsyncEnumerable.
  2. The serializer is now making recursive calls within a try/finally clause in the serialization hot path. There is a good chance that this could regress performance so it would need to be benchmarked using the suite defined in the dotnet/performance repo.
  3. The change doesn't handle other enumerable converters such as the one for dictionary types.

@eiriktsarpalis
Copy link
Member

The implementation looks good to me now, however my concerns about this potentially regressing performance because we're adding a try/catch in the hot path still remain. Performance of the serializer has historically been very sensitive to changes made in this location, so I'd want to see a run of the benchmark suite against the change before I could sign off on it.

Given that this change is made to address a hypothetical bug that nobody has actually has reported (Disposable IEnumerators are largely legacy and if they do exist chances are users would be better off using IAsyncEnumerable<T> which does handle disposal correctly).

I'm going to close this PR for now and the related issue, thank you for taking the time to work on this!

@stephentoub
Copy link
Member

Disposable IEnumerators are largely legacy

Not disputing the rest of your comment, but can you elaborate on this? Any C# iterator with a try/finally is going to have a meaningful IDisposable.Dispose.

@eiriktsarpalis
Copy link
Member

I wasn't aware of that use case. It definitely adds more points in favor of us doing this, but we still need to run the benchmarks against the change.

@eiriktsarpalis
Copy link
Member

Ok, let's see if we can get this merged. I rebased the branch and pushed a change the removes the need for new try/catch clauses in the hot path. I ran the microbenchmark suite and detected no change in performance.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-System.Text.Json community-contribution Indicates that the PR has been added by a community member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

System.Text.Json not properly disposing enumerators on exceptions
4 participants