Force callstacks to only run on untainted threads #7914
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
wiktork
force-pushed
the
dev/wiktork/fixTaintedThread
branch
from
14f2917 to
d5fd831
Compare
jander-msft
previously approved these changes
Feb 4, 2025
|
Let's add release notes for this change and backport to all in-support versions. |
wiktork
force-pushed
the
dev/wiktork/fixTaintedThread
branch
from
2c74d89 to
effc599
Compare
jander-msft
approved these changes
Feb 4, 2025
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/dotnet-monitor/actions/runs/13128542067 |
|
/backport to release/8.x |
|
@wiktork backporting to release/8.0 failed, the patch most likely resulted in conflicts. Please backport manually using one of the below commands, followed by PowerShell (Invoke-WebRequest "https://github.com/dotnet/dotnet-monitor/commit/403f3620bae3e10f2423578625eb097ce75622d5.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patchBash curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/403f3620bae3e10f2423578625eb097ce75622d5.patch" | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch
$ git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch changes.patch
Applying: Force callstacks to only run on untainted threads (#7914)
.git/rebase-apply/patch:205: trailing whitespace.
CallbackInfo(bool unmanagedOnly, std::function<HRESULT (const IpcMessage& message)> callback)
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/Profilers/MonitorProfiler/Communication/CommandServer.cpp
M src/Profilers/MonitorProfiler/Communication/CommandServer.h
A src/Profilers/MonitorProfiler/Communication/MessageCallbackManager.cpp
A src/Profilers/MonitorProfiler/Communication/MessageCallbackManager.h
M src/Profilers/MonitorProfiler/MainProfiler/MainProfiler.cpp
M src/Profilers/MutatingMonitorProfiler/ProbeInstrumentation/ProbeInstrumentation.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/Profilers/MutatingMonitorProfiler/ProbeInstrumentation/ProbeInstrumentation.cpp
Auto-merging src/Profilers/MonitorProfiler/MainProfiler/MainProfiler.cpp
CONFLICT (content): Merge conflict in src/Profilers/MonitorProfiler/MainProfiler/MainProfiler.cpp
CONFLICT (modify/delete): src/Profilers/MonitorProfiler/Communication/MessageCallbackManager.h deleted in HEAD and modified in Force callstacks to only run on untainted threads (#7914). Version Force callstacks to only run on untainted threads (#7914) of src/Profilers/MonitorProfiler/Communication/MessageCallbackManager.h left in tree.
CONFLICT (modify/delete): src/Profilers/MonitorProfiler/Communication/MessageCallbackManager.cpp deleted in HEAD and modified in Force callstacks to only run on untainted threads (#7914). Version Force callstacks to only run on untainted threads (#7914) of src/Profilers/MonitorProfiler/Communication/MessageCallbackManager.cpp left in tree.
Auto-merging src/Profilers/MonitorProfiler/Communication/CommandServer.h
CONFLICT (content): Merge conflict in src/Profilers/MonitorProfiler/Communication/CommandServer.h
Auto-merging src/Profilers/MonitorProfiler/Communication/CommandServer.cpp
CONFLICT (content): Merge conflict in src/Profilers/MonitorProfiler/Communication/CommandServer.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Force callstacks to only run on untainted threads (#7914)
Error: The process '/usr/bin/git' failed with exit code 128 |
|
Started backporting to release/8.x: https://github.com/dotnet/dotnet-monitor/actions/runs/13128544775 |
github-actions bot
pushed a commit
that referenced
this pull request
Feb 4, 2025
* Force callstacks to only run on untainted threads * Fix build warning * Fix ctor * Change name * Fix key check
|
/backport to release/8.x |
|
Started backporting to release/8.x: https://github.com/dotnet/dotnet-monitor/actions/runs/13128548453 |
github-actions bot
pushed a commit
that referenced
this pull request
Feb 4, 2025
* Force callstacks to only run on untainted threads * Fix build warning * Fix ctor * Change name * Fix key check
|
/backport to release/9.x |
|
Started backporting to release/9.x: https://github.com/dotnet/dotnet-monitor/actions/runs/13128554407 |
github-actions bot
pushed a commit
that referenced
this pull request
Feb 4, 2025
* Force callstacks to only run on untainted threads * Fix build warning * Fix ctor * Change name * Fix key check
schmittjoseph
added
the
update-release-notes
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.
Summary
Use another thread to process non-managed commands in the profiler. This fixes an issue where /parameters (which causes a managed callback in the inproc code) breaks /stacks (which requires a thread that has never ran managed code).
Release Notes Entry
Fix an issue where
/stacksroute can fail to collect call stacks after/parametersroute is used