tracing: fix TracingController cleanup - #10623
Closed
jasongin wants to merge 1 commit into
Closed
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
This fixes an incorrect deletion of the `TracingController` instance, which in some environments could cause an error about an invalid pointer passed to `free()`. The `TracingController` instance is actually owned by a `unique_ptr` member of the platform, so calling `platform::SetTracingController(nullptr)` is the correct way to delete it. But before that, the `TraceBuffer` must be deleted in order for the tracing loop to exit; that is accomplished by calling `TracingController::Initialize(nullptr)`.
Copy link
Copy Markdown
Member
Author
|
This fixes the failure reported here: #9618 (comment) |
Sorry, something went wrong.
2 tasks
Copy link
Copy Markdown
|
LGTM. Thank you for investigating this @jasongin |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
|
CI: https://ci.nodejs.org/job/node-test-pull-request/5717/ |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
Thanks for fixing this! |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
LGTM too |
Sorry, something went wrong.
targos
pushed a commit
that referenced
this pull request
Jan 7, 2017
This fixes an incorrect deletion of the `TracingController` instance, which in some environments could cause an error about an invalid pointer passed to `free()`. The `TracingController` instance is actually owned by a `unique_ptr` member of the platform, so calling `platform::SetTracingController(nullptr)` is the correct way to delete it. But before that, the `TraceBuffer` must be deleted in order for the tracing loop to exit; that is accomplished by calling `TracingController::Initialize(nullptr)`. PR-URL: #10623 Reviewed-By: Matthew Loring <mattloring@google.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
This was referenced Jan 19, 2017
Copy link
Copy Markdown
Contributor
|
Marking don't land since it depends on #9304 |
Sorry, something went wrong.
targos
pushed a commit
to targos/node
that referenced
this pull request
Mar 1, 2017
This fixes an incorrect deletion of the `TracingController` instance, which in some environments could cause an error about an invalid pointer passed to `free()`. The `TracingController` instance is actually owned by a `unique_ptr` member of the platform, so calling `platform::SetTracingController(nullptr)` is the correct way to delete it. But before that, the `TraceBuffer` must be deleted in order for the tracing loop to exit; that is accomplished by calling `TracingController::Initialize(nullptr)`. PR-URL: nodejs#10623 Reviewed-By: Matthew Loring <mattloring@google.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
italoacasas
pushed a commit
to italoacasas/node
that referenced
this pull request
Mar 1, 2017
This fixes an incorrect deletion of the `TracingController` instance, which in some environments could cause an error about an invalid pointer passed to `free()`. The `TracingController` instance is actually owned by a `unique_ptr` member of the platform, so calling `platform::SetTracingController(nullptr)` is the correct way to delete it. But before that, the `TraceBuffer` must be deleted in order for the tracing loop to exit; that is accomplished by calling `TracingController::Initialize(nullptr)`. PR-URL: nodejs#10623 Reviewed-By: Matthew Loring <mattloring@google.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
Merged
Copy link
Copy Markdown
Member
|
Marking as don't land on 4 and 6 given that it apparently depends on #9304. |
Sorry, something went wrong.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
This fixes an incorrect deletion of the TracingController instance,
which in some environments could cause an error about an invalid
pointer passed to free(). The TracingController instance is
actually owned by a unique_ptr member of the platform, so calling
platform::SetTracingController(nullptr) is the correct way to
delete it. But before that, the TraceBuffer must be deleted in
order for the tracing loop to exit; that is accomplished by calling
TracingController::Initialize(nullptr).
Checklist
Affected core subsystem(s)
tracing