From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13044 invoked by alias); 19 Aug 2013 02:52:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 13035 invoked by uid 89); 19 Aug 2013 02:52:46 -0000 X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,MSGID_MULTIPLE_AT,SPF_PASS autolearn=no version=3.3.2 Received: from out524-80.mail.aliyun.com (HELO out524-80.mail.aliyun.com) (42.121.24.80) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 19 Aug 2013 02:52:43 +0000 Received: from ALIYUN032621(182.92.247.1) by smtp.aliyun-inc.com(127.0.0.1); Mon, 19 Aug 2013 10:52:35 +0800 From: "Will Huang" To: "'Yao Qi'" , Cc: References: <00b201ce98a6$7cf69150$76e3b3f0$@huang@aliyun-inc.com> <520D8D9A.3050003@codesourcery.com> <016701ce9a41$f39086d0$dab19470$@huang@aliyun-inc.com> <520DF2E2.3020407@codesourcery.com> <01a201ce9a6a$74436db0$5cca4910$@huang@aliyun-inc.com> <520E0CFB.9010203@codesourcery.com> In-Reply-To: <520E0CFB.9010203@codesourcery.com> Subject: RE: [PATCH][PR threads/15824] when get threads name failed from info threads with linux kernel version earlier than 2.6.33 Date: Mon, 19 Aug 2013 02:52:00 -0000 Message-ID: <000301ce9c87$19927630$4cb76290$@huang@aliyun-inc.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-SW-Source: 2013-08/txt/msg00491.txt.bz2 Thanks Yao, Ok, switch to mainline. Patch is updated, please review it again. Thanks. diff -ruN ./gdb.org/ChangeLog ./gdb/ChangeLog --- ./gdb.org/ChangeLog 2013-08-16 12:30:22.000000000 +0800 +++ ./gdb/ChangeLog 2013-08-19 09:39:32.000000000 +0800 @@ -1,3 +1,11 @@ +2013-08-14 Will Huang + + PR threads/15824 + * linux-nat.c (linux_nat_thread_name): Add get thread name from + procfs "/proc/$pid/task/$tid/status". + * commo/linux-procfs.c (linux_proc_get_thread_name): New. + (linux_proc_get_string): New. + 2013-08-15 Kevin Buettner * rl78-tdep.c (RL78_RAW_PC_REGNUM): New enum. diff -ruN ./gdb.org/common/linux-procfs.c ./gdb/common/linux-procfs.c --- ./gdb.org/common/linux-procfs.c 2013-04-23 00:46:15.000000000 +0800 +++ ./gdb/common/linux-procfs.c 2013-08-19 10:32:55.000000000 +0800 @@ -56,6 +56,57 @@ return retval; } + +/* Return the string length of FILED /proc/LWPID/task/TID/status. + Return -1 if not found. */ + +static int +linux_proc_get_string (pid_t lwpid, pid_t tid, char *target, + size_t t_size, const char *field) +{ + size_t field_len =3D strlen (field); + FILE *status_file; + char buf[100]; + int retval =3D -1; + + if (tid > 0) + xsnprintf (buf, sizeof (buf), "/proc/%d/task/%d/status", + (int) lwpid, (int) tid); + else + { + /*if TID is zero, ingnore it */ + xsnprintf (buf, sizeof (buf), "/proc/%d/status", (int) lwpid); + } + + status_file =3D gdb_fopen_cloexec (buf, "r"); + if (status_file =3D=3D NULL) + { + warning (_("unable to open /proc file '%s'"), buf); + return -1; + } + + while (fgets (buf, sizeof (buf), status_file)) + if (strncmp (buf, field, field_len) =3D=3D 0 && buf[field_len] =3D=3D = ':') + { + size_t pos =3D field_len + 1; + + while ((buf[pos] =3D=3D ' ' || buf[pos] =3D=3D '\t') + && (pos < sizeof (buf) - 1)) + pos++; + + strncpy (target, &buf[pos], t_size); + target[t_size - 1] =3D '\0'; + retval =3D strlen (target); + if (retval > 0 && target[retval - 1] =3D=3D '\n') + target[retval - 1] =3D '\0'; + + break; + } + + fclose (status_file); + return retval; +} + /* Return the TGID of LWPID from /proc/pid/status. Returns -1 if not found. */ @@ -119,3 +170,13 @@ { return linux_proc_pid_has_state (pid, "Z (zombie)"); } + +/* Save the name of thread PID/TID into buffer NAME. SIZE is the size + of buffer NAME. Return the length of the name if success, + otherwise return -1. */ + +int +linux_proc_get_thread_name (pid_t pid, pid_t tid, char *name, size_t size) +{ + return linux_proc_get_string (pid, tid, name, size, "Name"); +} diff -ruN ./gdb.org/common/linux-procfs.h ./gdb/common/linux-procfs.h --- ./gdb.org/common/linux-procfs.h 2013-01-01 14:32:54.000000000 +0800 +++ ./gdb/common/linux-procfs.h 2013-08-19 10:32:57.000000000 +0800 @@ -40,4 +40,10 @@ extern int linux_proc_pid_is_zombie (pid_t pid); +/* Save the name of thread PID/TID into buffer NAME. SIZE is the size + of buffer NAME. Return the length of the name if success, + otherwise return -1. */ + +extern int linux_proc_get_thread_name (pid_t pid, pid_t tid, + char *name, size_t size); #endif /* COMMON_LINUX_PROCFS_H */ diff -ruN ./gdb.org/linux-nat.c ./gdb/linux-nat.c --- ./gdb.org/linux-nat.c 2013-07-01 19:28:30.000000000 +0800 +++ ./gdb/linux-nat.c 2013-08-19 09:45:34.000000000 +0800 @@ -4291,6 +4291,17 @@ fclose (comm_file); } + else + { + static char comm[COMM_LEN + 1]; + int size =3D linux_proc_get_thread_name ((pid_t) pid, (pid_t) lwp, + comm, COMM_LEN + 1); + + if (size > 0) + result =3D comm; + + } + #undef COMM_LEN #undef FORMAT diff -ruN ./gdb.org/testsuite/ChangeLog ./gdb/testsuite/ChangeLog --- ./gdb.org/testsuite/ChangeLog 2013-08-17 01:44:21.000000000 +0800 +++ ./gdb/testsuite/ChangeLog 2013-08-19 09:46:08.000000000 +0800 @@ -1,3 +1,9 @@ +2013-08-14 Will Huang + + PR threads/15824 + * gdb.threads/manythreads.exp: Add test for get thread + original name. + 2013-08-16 Doug Evans * lib/prelink-support.exp (prelink_yes): Flag test as unsupported if diff -ruN ./gdb.org/testsuite/gdb.threads/manythreads.exp ./gdb/testsuite/g= db.threads/manythreads.exp --- ./gdb.org/testsuite/gdb.threads/manythreads.exp 2013-01-01 14:41:27= .000000000 +0800 +++ ./gdb/testsuite/gdb.threads/manythreads.exp 2013-08-19 09:47:10.0000000= 00 +0800 @@ -93,6 +93,7 @@ } } +gdb_test "info threads" ".*manythreads.*" "check thread original name" gdb_test_no_output "thread name zardoz" "give a name to the thread" gdb_test "info threads" ".*zardoz.*" "check thread name" Thanks, Will.huang > -----Original Message----- > From: Yao Qi [mailto:yao@codesourcery.com] > Sent: Friday, August 16, 2013 7:29 PM > To: Will Huang > Cc: gdb-patches@sourceware.org > Subject: Re: [PATCH][PR threads/15824] when get threads name failed from = info > threads with linux kernel version earlier than 2.6.33 >=20 > On 08/16/2013 06:22 PM, Will Huang wrote: > > Sorry for mistakes. There is no gdb_fopen_cloexec in gdb-7.6. Excep= t that > all comments are accepted. > > >=20 > Are you proposing a patch for GDB 7.6 tree only? This problem exists on > mainline too. We post patch for mainline, and backport the patch to inte= rnal > tree or older tree. >=20 > > + > > +static int > > +linux_proc_get_string (pid_t lwpid, pid_t tid, char *target, > > + size_t t_size, const char *field) { > > + size_t field_len =3D strlen (field); > > + FILE *status_file; > > + char buf[100]; > > + int retval =3D -1; > > + > > + if (tid > 0) > > + xsnprintf (buf, sizeof (buf), "/proc/%d/task/%d/status", > > + (int) lwpid, (int) tid); else { > > + /*if TID is zero, ingnore it*/ >=20 > /* If TID is zero, ignore it. */ >=20 > > + xsnprintf (buf, sizeof (buf), "/proc/%d/status", (int) lwpid); > > + } > > + > > + status_file =3D fopen (buf, "r"); > > + if (status_file =3D=3D NULL) > > + { > > + warning (_("unable to open /proc file '%s'"), buf); > > + return -1; > > + } > > + > > + while (fgets (buf, sizeof (buf), status_file)) > > + if (strncmp (buf, field, field_len) =3D=3D 0 && buf[field_len] =3D= =3D ':') > > + { > > + size_t pos =3D field_len + 1; >=20 > Blank line is needed here. >=20 > > diff -ruN ./gdb.org/linux-nat.c ./gdb/linux-nat.c > > --- ./gdb.org/linux-nat.c 2013-02-13 22:59:49.000000000 +0800 > > +++ ./gdb/linux-nat.c 2013-08-16 17:55:19.000000000 +0800 > > @@ -4294,6 +4294,15 @@ > > > > fclose (comm_file); > > } > > + else > > + { > > + static char comm[COMM_LEN + 1]; > > + int size =3D linux_proc_get_thread_name ((pid_t) pid, (pid_t) > > + lwp, comm, COMM_LEN + 1); >=20 > This line is too long. >=20 > Otherwise, I don't have comments to this patch. >=20 > -- > Yao (=E9=BD=90=E5=B0=A7)