[PATCH v3 3/6] Display per-thread information for threads in FreeBSD cores.

[John Baldwin <jhb at FreeBSD dot org>]

Display the LWP ID of each thread in a FreeBSD core.  Extract thread names
from the per-thread THRMISC note.

gdb/ChangeLog:

	* fbsd_tdep.c (fbsd_core_pid_to_str): New function.
	(fbsd_init_abi): Add "core_pid_to_str" gdbarch method.
---
 gdb/ChangeLog   |  5 +++++
 gdb/fbsd-tdep.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fe8fd6c..8f28959 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-16  John Baldwin  <jhb@FreeBSD.org>
+
+	* fbsd_tdep.c (fbsd_core_pid_to_str): New function.
+	(fbsd_init_abi): Add "core_pid_to_str" gdbarch method.
+
 2016-01-15  Sandra Loosemore  <sandra@codesourcery.com>
 
 	* charset.c [PHONY_ICONV] (GDB_DEFAULT_HOST_CHARSET):
diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c
index 0ef94d6..88342cd 100644
--- a/gdb/fbsd-tdep.c
+++ b/gdb/fbsd-tdep.c
@@ -28,6 +28,52 @@
 #include "fbsd-tdep.h"
 
 
+/* This is how we want PTIDs from core files to be printed.  */
+
+static char *
+fbsd_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid)
+{
+  static char buf[80];
+  struct bfd_section *section;
+  bfd_size_type size;
+  char sectionstr[32];
+
+  if (ptid_get_lwp (ptid) != 0)
+    {
+      xsnprintf (sectionstr, sizeof sectionstr, ".thrmisc/%ld",
+		ptid_get_lwp (ptid));
+      section = bfd_get_section_by_name (core_bfd, sectionstr);
+      if (section != NULL && bfd_section_size (core_bfd, section) > 0)
+	{
+	  char *name;
+
+	  size = bfd_section_size (core_bfd, section);
+	  name = alloca (size + 1);
+	  if (bfd_get_section_contents (core_bfd, section, name, (file_ptr) 0,
+					size)
+	      && name[0] != '\0')
+	    {
+	      name[size] = '\0';
+
+	      /* Note that each thread will report the process command
+		 as its thread name instead of an empty name if a name
+		 has not been set explicitly.  Return a NULL name in
+		 that case.  */
+	      if (strcmp (name, elf_tdata (core_bfd)->core->program) != 0)
+		{
+		  xsnprintf (buf, sizeof buf, "LWP %ld \"%s\"",
+			    ptid_get_lwp (ptid), name);
+		  return buf;
+		}
+	    }
+	}
+      xsnprintf (buf, sizeof buf, "LWP %ld", ptid_get_lwp (ptid));
+      return buf;
+    }
+
+  return normal_pid_to_str (ptid);
+}
+
 static int
 find_signalled_thread (struct thread_info *info, void *data)
 {
@@ -132,5 +178,6 @@ fbsd_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
 void
 fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
+  set_gdbarch_core_pid_to_str (gdbarch, fbsd_core_pid_to_str);
   set_gdbarch_make_corefile_notes (gdbarch, fbsd_make_corefile_notes);
 }
-- 
2.7.0