This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] Fix /proc pathname sizes on Solaris
- From: Rainer Orth <ro at CeBiTec dot Uni-Bielefeld dot DE>
- To: gdb-patches at sourceware dot org
- Date: Mon, 17 Sep 2018 16:11:35 +0200
- Subject: [PATCH] Fix /proc pathname sizes on Solaris
I'm slowly working my way through the gdb patches from the
solaris-userland repo
https://github.com/oracle/solaris-userland/tree/master/components/gdb/patches
Some of them are pretty obvious and should be able to go in (such as
this one and the next), while others are either incomplete
(e.g. 008-syscalls.patch, which adds XML descriptions of the Solaris
syscalls, but lacks their registration) or inappropriate in their
current form (unnecessarily intrusive).
This one (001-fix-proc-name-size.patch) should be obvious given the
patches' comment:
# In Solaris, PID_MAX is 999999 (6 digit pid).
# In Solaris, lwpid_t is an unsigned int, so theoretically the lwp id
# could be 10 digits.
Two questions about procedure here:
* AFAIK Oracle has a corporate copyright assignment on file, so the
patches should be covered. Even if that were not the case, this one
and the next are certainly below the 15-line limit for non-trivial
patches.
* Given the code isn't mine, how should we handle attribution? I
suspect the engineer who committed the patch to github is the author,
but don't know for certain. Should I attribute it to her in the
ChangeLog?
Tested on i386-pc-solaris2.11. Ok for master?
Rainer
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
2018-06-27 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* procfs.c (MAX_PROC_NAME_SIZE): Allow for 6-digit PID_MAX and
uint_t lwpid_t.
(create_procinfo): Print pids in /proc without leading zeros.
# HG changeset patch
# Parent e6140f0a7128422be8a7e2a148da8de516d676d8
Fix /proc pathname sizes on Solaris
diff --git a/gdb/procfs.c b/gdb/procfs.c
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -233,7 +233,7 @@ enum { READ_WATCHFLAG = WA_READ,
#define AS_PROC_NAME_FMT "/proc/%d/as"
#define MAP_PROC_NAME_FMT "/proc/%d/map"
#define STATUS_PROC_NAME_FMT "/proc/%d/status"
-#define MAX_PROC_NAME_SIZE sizeof("/proc/99999/lwp/8096/lstatus")
+#define MAX_PROC_NAME_SIZE sizeof("/proc/999999/lwp/0123456789/lwpstatus")
typedef struct procinfo {
struct procinfo *next;
@@ -483,7 +483,7 @@ create_procinfo (int pid, int tid)
}
else
{
- sprintf (pi->pathname, "/proc/%05d/lwp/%d", pid, tid);
+ sprintf (pi->pathname, "/proc/%d/lwp/%d", pid, tid);
pi->next = parent->thread_list;
parent->thread_list = pi;
}