From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8492 invoked by alias); 11 Jul 2013 12:30:17 -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 8447 invoked by uid 89); 11 Jul 2013 12:30:12 -0000 X-Spam-SWARE-Status: No, score=-4.7 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_CP autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 11 Jul 2013 12:30:11 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UxG0e-0004AF-JS from Ali_Anwar@mentor.com ; Thu, 11 Jul 2013 05:30:08 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 11 Jul 2013 05:30:08 -0700 Received: from [137.202.157.39] (147.34.91.1) by mail-na.mentorg.com (147.34.97.43) with Microsoft SMTP Server (TLS) id 14.2.247.3; Thu, 11 Jul 2013 05:30:07 -0700 Message-ID: <51DEA530.3020306@codesourcery.com> Date: Thu, 11 Jul 2013 12:30:00 -0000 From: ali_anwar User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-Version: 1.0 To: Tom Tromey , Joel Brobecker CC: Pedro Alves , Subject: Re: Updated patch for Bug 13217 - thread apply all detach throws a SEGFAULT References: <5062EA9B.1060505@codesourcery.com> <871uhnwkf3.fsf@fleche.redhat.com> <50C62BBB.6010404@codesourcery.com> <87hantek1p.fsf@fleche.redhat.com> <50C75319.9080903@codesourcery.com> <50C7628F.5080004@redhat.com> <51DD37FA.8010306@codesourcery.com> <87k3kyfgf1.fsf@fleche.redhat.com> In-Reply-To: <87k3kyfgf1.fsf@fleche.redhat.com> Content-Type: multipart/mixed; boundary="------------030700090906020809050503" X-Virus-Found: No X-SW-Source: 2013-07/txt/msg00313.txt.bz2 --------------030700090906020809050503 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Content-length: 654 On 07/10/2013 10:55 PM, Tom Tromey wrote: >>>>>> "Ali" == ali anwar writes: > > > This installs the cleanups at the wrong point. > They must be installed before any potential exception is thrown. > > That is, the xfree cleanup ought to be created just after initialization; > and the refcount cleanup ought to be created after the refcounts are > incremented. > > Also, make_cleanup_thread_refcount is misnamed. > By convention, a "make_cleanup_" function creates a new cleanup. > The function that does the work of cleaning up is given a different name. > Thanks for the Review. Please find attached updated patch. -Ali --------------030700090906020809050503 Content-Type: text/x-patch; name="PR13217.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="PR13217.patch" Content-length: 4334 Index: gdb/ChangeLog =================================================================== RCS file: /cvs/src/src/gdb/ChangeLog,v retrieving revision 1.15797 diff -u -r1.15797 ChangeLog --- gdb/ChangeLog 11 Jul 2013 09:07:41 -0000 1.15797 +++ gdb/ChangeLog 11 Jul 2013 12:11:08 -0000 @@ -1,3 +1,11 @@ +2013-07-11 Ali Anwar + + PR threads/13217 + * thread.c (thread_apply_all_command): Check for valid threads + and thread count. + (thread_array_cleanup): New struct. + (set_thread_refcount): New function. + 2013-07-11 Andrew Burgess * infcmd.c (default_print_one_register_info): Reuse function Index: gdb/thread.c =================================================================== RCS file: /cvs/src/src/gdb/thread.c,v retrieving revision 1.154 diff -u -r1.154 thread.c --- gdb/thread.c 23 May 2013 17:12:51 -0000 1.154 +++ gdb/thread.c 11 Jul 2013 12:18:00 -0000 @@ -65,6 +65,19 @@ static void restore_current_thread (ptid_t); static void prune_threads (void); +/* Data to cleanup thread array. */ + +struct thread_array_cleanup +{ + /* Array of thread pointers used to set + reference count. */ + struct thread_info **tp_array; + + /* Thread count in the array. */ + int count; +}; + + struct thread_info* inferior_thread (void) { @@ -1132,6 +1145,18 @@ xfree (old); } +/* Set the thread reference count. */ + +static void +set_thread_refcount (void *data) +{ + int k; + struct thread_array_cleanup *ta_cleanup = data; + + for (k = 0; k != ta_cleanup->count; k++) + ta_cleanup->tp_array[k]->refcount--; +} + struct cleanup * make_cleanup_restore_current_thread (void) { @@ -1187,9 +1212,10 @@ static void thread_apply_all_command (char *cmd, int from_tty) { - struct thread_info *tp; struct cleanup *old_chain; char *saved_cmd; + int tc; + struct thread_array_cleanup ta_cleanup; if (cmd == NULL || *cmd == '\000') error (_("Please specify a command following the thread ID list")); @@ -1202,17 +1228,44 @@ execute_command. */ saved_cmd = xstrdup (cmd); make_cleanup (xfree, saved_cmd); - for (tp = thread_list; tp; tp = tp->next) - if (thread_alive (tp)) - { - switch_to_thread (tp->ptid); + tc = thread_count (); - printf_filtered (_("\nThread %d (%s):\n"), - tp->num, target_pid_to_str (inferior_ptid)); - execute_command (cmd, from_tty); - strcpy (cmd, saved_cmd); /* Restore exact command used - previously. */ - } + if (tc) + { + struct thread_info **tp_array; + struct thread_info *tp; + int i, k; + i = 0; + + /* Save a copy of the thread_list in case we execute detach + command. */ + tp_array = xmalloc (sizeof (struct thread_info *) * tc); + make_cleanup (xfree, tp_array); + ta_cleanup.tp_array = tp_array; + ta_cleanup.count = tc; + + ALL_THREADS (tp) + { + tp_array[i] = tp; + tp->refcount++; + i++; + } + + make_cleanup (set_thread_refcount, &ta_cleanup); + + for (k = 0; k != i; k++) + if (thread_alive (tp_array[k])) + { + switch_to_thread (tp_array[k]->ptid); + printf_filtered (_("\nThread %d (%s):\n"), + tp_array[k]->num, + target_pid_to_str (inferior_ptid)); + execute_command (cmd, from_tty); + + /* Restore exact command used previously. */ + strcpy (cmd, saved_cmd); + } + } do_cleanups (old_chain); } Index: gdb/testsuite/gdb.threads/threadapply.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/threadapply.exp,v retrieving revision 1.16 diff -u -r1.16 threadapply.exp --- gdb/testsuite/gdb.threads/threadapply.exp 1 Jan 2013 06:41:27 -0000 1.16 +++ gdb/testsuite/gdb.threads/threadapply.exp 10 Jul 2013 09:51:08 -0000 @@ -63,3 +63,4 @@ gdb_test "up" ".*in main.*" "go up in the stack frame" gdb_test "thread apply all print 1" "Thread ..*\\\$\[0-9]+ = 1.*Thread ..*\\\$\[0-9]+ = 1.*Thread ..*\\\$\[0-9]+ = 1.*Thread ..*\\\$\[0-9]+ = 1.*Thread ..*\\\$\[0-9]+ = 1.*Thread ..*\\\$\[0-9]+ = 1" "run a simple print command on all threads" gdb_test "down" "#0.*thread_function.*" "go down and check selected frame" +gdb_test "thread apply all detach" "Thread .*" --------------030700090906020809050503--