5 files changed, 11 insertions, 1 deletions
diff --git a/console-client/ncursesw.c b/console-client/ncursesw.c
index 8e8962fd..ce62660c 100644
--- a/console-client/ncursesw.c
+++ b/console-client/ncursesw.c
@@ -293,6 +293,8 @@ input_loop (void *unused)
   fd_set rfds;
   int w_escaped = 0;
 
+  pthread_setname_np (pthread_self (), "input");
+
   FD_ZERO (&rfds);
   FD_SET (fd, &rfds);
 
diff --git a/console-client/pc-kbd.c b/console-client/pc-kbd.c
index 9e03cff8..a637205f 100644
--- a/console-client/pc-kbd.c
+++ b/console-client/pc-kbd.c
@@ -785,6 +785,8 @@ read_keycode (void)
 static void *
 input_loop (void *unused)
 {
+  pthread_setname_np (pthread_self (), "kbd_input");
+
 #ifdef XKB_SUPPORT
   /* XXX: until conversion from scancode to keycode is properly implemented
      XKB won't work on anything but scancode set 1.
diff --git a/console-client/pc-mouse.c b/console-client/pc-mouse.c
index 40a569d0..e6e8970d 100644
--- a/console-client/pc-mouse.c
+++ b/console-client/pc-mouse.c
@@ -246,7 +246,9 @@ input_loop (void *unused)
   kd_event *ev;
   vm_offset_t buf;
   mach_msg_type_number_t buf_size;
-  
+
+  pthread_setname_np (pthread_self (), "mouse_input");
+
   while (1)
     {
       struct mouse_event evt = { 0 };
diff --git a/console-client/timer.c b/console-client/timer.c
index 69cc643d..4abe1321 100644
--- a/console-client/timer.c
+++ b/console-client/timer.c
@@ -91,6 +91,8 @@ timer_function (void *this_is_a_pointless_variable_with_a_rather_long_name)
   mach_port_t recv = mach_reply_port ();
   int wait = 0;
 
+  pthread_setname_np (pthread_self (), "timer");
+
   timer_thread = mach_thread_self ();
 
   pthread_mutex_lock (&timer_lock);
diff --git a/console-client/trans.c b/console-client/trans.c
index b7d56cb0..afdf5acd 100644
--- a/console-client/trans.c
+++ b/console-client/trans.c
@@ -784,6 +784,8 @@ console_client_translator (void *unused)
 {
   error_t err;
 
+  pthread_setname_np (pthread_self (), "netfs");
+
   do
     {
       ports_manage_port_operations_multithread (netfs_port_bucket,