Attachment 312485 Details for Bug 254229 – Fills NT_PRPSINFO on Linux by parsing /proc/$PID/stat

[patch] Fills NT_PRPSINFO on Linux by parsing /proc/$PID/stat

2.patch (text/plain), 5.55 KB, created by Denys Vlasenko on 2008-07-23 15:10:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denys Vlasenko

Created: 2008-07-23 15:10:16 UTC

Size: 5.55 KB

patch

obsolete

>diff -d -urpN gdb-6.8.1/bfd/elf-bfd.h gdb-6.8.2/bfd/elf-bfd.h
>--- gdb-6.8.1/bfd/elf-bfd.h	2008-02-15 09:27:18.000000000 +0100
>+++ gdb-6.8.2/bfd/elf-bfd.h	2008-07-23 17:05:45.000000000 +0200
>@@ -2125,7 +2125,7 @@ extern Elf_Internal_Phdr * _bfd_elf_find
> extern char *elfcore_write_note
>   (bfd *, char *, int *, const char *, int, const void *, int);
> extern char *elfcore_write_prpsinfo
>-  (bfd *, char *, int *, const char *, const char *);
>+  (bfd *, char *, int *, void *, const char *, const char *);
> extern char *elfcore_write_prstatus
>   (bfd *, char *, int *, long, int, const void *);
> extern char * elfcore_write_pstatus
>diff -d -urpN gdb-6.8.1/bfd/elf.c gdb-6.8.2/bfd/elf.c
>--- gdb-6.8.1/bfd/elf.c	2008-02-18 00:45:23.000000000 +0100
>+++ gdb-6.8.2/bfd/elf.c	2008-07-23 17:06:22.000000000 +0200
>@@ -8256,6 +8256,7 @@ char *
> elfcore_write_prpsinfo (bfd  *abfd,
> 			char *buf,
> 			int  *bufsiz,
>+			void *info,
> 			const char *fname,
> 			const char *psargs)
> {
>@@ -8299,7 +8300,10 @@ elfcore_write_prpsinfo (bfd  *abfd,
>       int note_type = NT_PRPSINFO;
> #endif
> 
>-      memset (&data, 0, sizeof (data));
>+      if (info)
>+	memcpy (&data, info, sizeof (data));
>+      else
>+	memset (&data, 0, sizeof (data));
>       strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
>       strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
>       return elfcore_write_note (abfd, buf, bufsiz,
>diff -d -urpN gdb-6.8.1/gdb/fbsd-nat.c gdb-6.8.2/gdb/fbsd-nat.c
>--- gdb-6.8.1/gdb/fbsd-nat.c	2008-01-01 23:53:09.000000000 +0100
>+++ gdb-6.8.2/gdb/fbsd-nat.c	2008-07-23 17:06:30.000000000 +0200
>@@ -184,6 +184,7 @@ fbsd_make_corefile_notes (bfd *obfd, int
> 	psargs = reconcat (psargs, psargs, " ", get_inferior_args (), NULL);
> 
>       note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
>+				          NULL,
> 					  fname, psargs);
>     }
> 
>diff -d -urpN gdb-6.8.1/gdb/linux-nat.c gdb-6.8.2/gdb/linux-nat.c
>--- gdb-6.8.1/gdb/linux-nat.c	2008-01-29 23:47:20.000000000 +0100
>+++ gdb-6.8.2/gdb/linux-nat.c	2008-07-23 17:07:47.000000000 +0200
>@@ -2723,6 +2723,81 @@ linux_nat_do_registers (bfd *obfd, ptid_
> 					note_data, note_size);
> }
> 
>+/* Should be always true for Linux */
>+#define HAVE_PRPSINFO_T 1
>+
>+#if defined (HAVE_PRPSINFO_T)
>+
>+/* Fills prpsinfo_t structure as much as possible. Unknown values
>+   are filled with zeroes.  */
>+
>+static void
>+fill_prpsinfo (prpsinfo_t *info)
>+{
>+  struct stat sb;
>+  char filename[sizeof ("/proc//stat") + sizeof (int) * 3 + 2];
>+  char buf[1024];
>+  char proc_state[5];
>+  long proc_nice;
>+  unsigned proc_ppid;
>+  unsigned proc_pgid;
>+  unsigned proc_sid;
>+  pid_t pid;
>+  int fd, n;
>+  char *cp;
>+
>+  memset (info, 0, sizeof (info));
>+
>+  pid = ptid_get_pid (inferior_ptid);
>+  sprintf (filename, "/proc/%u/stat", (unsigned)pid);
>+  fd = open (filename, O_RDONLY);
>+  if (fd < 0)
>+    return;
>+  n = read (fd, buf, sizeof(buf) - 1);
>+  fstat (fd, &sb); /* ignore (im)possible error */
>+  close (fd);
>+  if (n < 0)
>+    return;
>+  buf[n] = 0;
>+  cp = strrchr (buf, ')'); /* split into "PID (cmd" and "<rest>" */
>+  if (!cp)
>+    return;
>+
>+  /* see proc(5) for some details on this */
>+  n = sscanf (cp + 2, /* skip ") " */
>+	"%4s %u "               /* state, ppid */
>+	"%u %u %*s %*s "        /* pgid, sid, tty, tpgid */
>+	"%*s %*s %*s %*s %*s "  /* flags, min_flt, cmin_flt, maj_flt, cmaj_flt */
>+	"%*s %*s "              /* utime, stime */
>+	"%*s %*s %*s "          /* cutime, cstime, priority */
>+	"%ld "                  /* nice */
>+	/*"%*s %*s "               timeout, it_real_value */
>+	/*"%lu "                   start_time */
>+	/*"%lu "                   vsize */
>+	/*"%lu "                   rss */
>+	/*"%lu %lu %lu %lu %lu %lu " rss_rlim, start_code, end_code, start_stack, kstk_esp, kstk_eip */
>+	/*"%u %u %u %u "           signal, blocked, sigignore, sigcatch */
>+	/*"%lu %lu %lu"            wchan, nswap, cnswap */
>+	, proc_state, &proc_ppid,
>+	&proc_pgid, &proc_sid,
>+	&proc_nice);
>+  if (n != 5)
>+    return;
>+
>+  /*info->pr_state is "numeric process state" - ?! */
>+  info->pr_sname = proc_state[0]; /* guess */
>+  info->pr_zomb = (proc_state[0] == 'Z');
>+  info->pr_nice = proc_nice; /* guess */
>+  /* info->pr_flag; - no idea */
>+  info->pr_uid = sb.st_uid;
>+  info->pr_gid = sb.st_gid;
>+  info->pr_pid = pid;
>+  info->pr_ppid = proc_ppid;
>+  info->pr_pgrp = proc_pgid;
>+  info->pr_sid = proc_sid;
>+}
>+#endif
>+
> /* Fills the "to_make_corefile_note" target vector.  Builds the note
>    section for a corefile, and returns it in a malloc buffer.  */
> 
>@@ -2742,6 +2817,13 @@ linux_nat_make_corefile_notes (bfd *obfd
> 
>   if (get_exec_file (0))
>     {
>+#if defined (HAVE_PRPSINFO_T)
>+      prpsinfo_t data;
>+      fill_prpsinfo (&data);
>+#define DATAPTR (&data)
>+#else
>+#define DATAPTR NULL
>+#endif
>       strncpy (fname, strrchr (get_exec_file (0), '/') + 1, sizeof (fname));
>       strncpy (psargs, get_exec_file (0), sizeof (psargs));
>       if (get_inferior_args ())
>@@ -2760,8 +2842,9 @@ linux_nat_make_corefile_notes (bfd *obfd
> 	    }
> 	}
>       note_data = (char *) elfcore_write_prpsinfo (obfd,
>-						   note_data,
>-						   note_size, fname, psargs);
>+						   note_data, note_size,
>+						   DATAPTR, fname, psargs);
>+#undef DATAPTR
>     }
> 
>   /* Dump information for threads.  */
>diff -d -urpN gdb-6.8.1/gdb/procfs.c gdb-6.8.2/gdb/procfs.c
>--- gdb-6.8.1/gdb/procfs.c	2008-03-12 21:03:12.000000000 +0100
>+++ gdb-6.8.2/gdb/procfs.c	2008-07-23 17:06:26.000000000 +0200
>@@ -6116,6 +6116,7 @@ procfs_make_note_section (bfd *obfd, int
>   note_data = (char *) elfcore_write_prpsinfo (obfd,
> 					       note_data,
> 					       note_size,
>+					       NULL,
> 					       fname,
> 					       psargs);
>

Actions: View | Diff

Attachments on bug 254229: 312485 | 312566 | 312652 | 312653 | 312823 | 312860 | 312861