Skip to content

Ensure Process.ProcessName doesn't change when setting Thread.Name on Linux #34064

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
May 12, 2020
Merged

Ensure Process.ProcessName doesn't change when setting Thread.Name on Linux #34064

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a40327f
Add ThreadNameDoesNotAffectProcessName test
tmds Mar 24, 2020
2880d58
Merge remote-tracking branch 'upstream/master' into process_name
tmds Mar 24, 2020
19901e4
Assert Main Thread Name get returns set value.
tmds Mar 26, 2020
5dbbb48
Ignore requests to set main thread name.
tmds Mar 27, 2020
eced0ab
Fix GCC compilation
tmds Mar 30, 2020
376bbe5
fix mono
danmoseley May 5, 2020
b5d9209
Revert "fix mono"
danmoseley May 5, 2020
cb4c518
attempt 2
danmoseley May 5, 2020
3bc5448
[mono] (Linux) check native os thread id when setting thread name
lambdageek May 6, 2020
034ce1e
Disable ThreadNameDoesNotAffectProcessName on Mono
lambdageek May 6, 2020
d82c806
Revert mono change
lambdageek May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/coreclr/src/pal/src/thread/thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,6 +1641,13 @@ CorUnix::InternalSetThreadDescription(

pTargetThread->Lock(pThread);

// Ignore requests to set the main thread name because
// it causes the value returned by Process.ProcessName to change.
if ((pid_t)pTargetThread->GetThreadId() == getpid())
{
goto InternalSetThreadDescriptionExit;
}

/* translate the wide char lpThreadDescription string to multibyte string */
nameSize = WideCharToMultiByte(CP_ACP, 0, lpThreadDescription, -1, NULL, 0, NULL, NULL);

Expand Down
14 changes: 14 additions & 0 deletions src/libraries/System.Threading.Thread/tests/ThreadTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,20 @@ public static void NameTest()
});
}

[Fact]
public static void ThreadNameDoesNotAffectProcessName()
{
// On Linux, changing the main thread name affects ProcessName.
// To avoid that, .NET ignores requests to change the main thread name.
RemoteExecutor.Invoke(() =>
{
const string ThreadName = "my-thread";
Thread.CurrentThread.Name = ThreadName;
Assert.Equal(ThreadName, Thread.CurrentThread.Name);
Assert.NotEqual(ThreadName, Process.GetCurrentProcess().ProcessName);
}).Dispose();
}

[Fact]
public static void PriorityTest()
{
Expand Down
9 changes: 9 additions & 0 deletions src/mono/mono/utils/mono-threads-posix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,15 @@ mono_native_thread_set_name (MonoNativeThreadId tid, const char *name)
if (tid != mono_native_thread_id_get ())
return;

#if defined(__linux__)
/*
* Ignore requests to set the main thread name because
* it causes the value returned by Process.ProcessName to change.
*/
if (tid == (guint64)getpid ())
return;
#endif

if (!name) {
pthread_setname_np ("");
} else {
Expand Down