From bd4c8cb4db6e3a1905998f8b848e9f4624f51d52 Mon Sep 17 00:00:00 2001

From: Peter Hutterer <peter.hutterer@who-t.net>

Date: Tue, 18 Oct 2016 14:13:47 +1000

Subject: [PATCH xserver v2 7/7] inputthread: On Linux leave the main thread's

 name as-is

On Linux, setting the main thread's name changes the program name

(/proc/self/comm). Setting it to MainThread breaks scripts that rely on

the command name, e.g. ps -C Xorg.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

---

Changes in v2 (hdegoede):

-Only leave the main thread as-is in Linux, naming it is not an issue on

 other platforms

---

 os/inputthread.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/os/inputthread.c b/os/inputthread.c

index ddafa7f..8e7f2ed 100644

--- a/os/inputthread.c

+++ b/os/inputthread.c

@@ -431,11 +431,13 @@ InputThreadPreInit(void)

     }

     hotplugPipeWrite = hotplugPipe[1];

+#ifndef __linux__ /* Linux does not deal well with renaming the main thread */

 #if defined(HAVE_PTHREAD_SETNAME_NP_WITH_TID)

     pthread_setname_np (pthread_self(), "MainThread");

 #elif defined(HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID)

     pthread_setname_np ("MainThread");

 #endif

+#endif

 }

-- 

2.9.3