tracing: fix TracingController cleanup #10623
Closed
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
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)`.
nodejs-github-bot
added
c++
|
This fixes the failure reported here: #9618 (comment) |
2 tasks
|
LGTM. Thank you for investigating this @jasongin |
|
Thanks for fixing this! |
|
LGTM too |
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>
|
Landed in 58c38c2. Thank you! |
This was referenced Jan 19, 2017
mscdex
added
the
trace_events
|
Marking don't land since it depends on #9304 |
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
|
Marking as don't land on 4 and 6 given that it apparently depends on #9304. |
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.
This fixes an incorrect deletion of the
TracingControllerinstance,which in some environments could cause an error about an invalid
pointer passed to
free(). TheTracingControllerinstance isactually owned by a
unique_ptrmember of the platform, so callingplatform::SetTracingController(nullptr)is the correct way todelete it. But before that, the
TraceBuffermust be deleted inorder for the tracing loop to exit; that is accomplished by calling
TracingController::Initialize(nullptr).Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
tracing