From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7824 invoked by alias); 4 Oct 2004 20:39:53 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 7811 invoked from network); 4 Oct 2004 20:39:52 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 4 Oct 2004 20:39:52 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.10) with ESMTP id i94Kdq5D031673 for ; Mon, 4 Oct 2004 16:39:52 -0400 Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com [172.16.14.4]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i94Kdqr14190 for ; Mon, 4 Oct 2004 16:39:52 -0400 Received: from touchme.toronto.redhat.com (IDENT:postfix@touchme.toronto.redhat.com [172.16.14.9]) by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id i94Kdp1l012431; Mon, 4 Oct 2004 16:39:51 -0400 Received: from [172.16.14.72] (toocool.toronto.redhat.com [172.16.14.72]) by touchme.toronto.redhat.com (Postfix) with ESMTP id 9FD638000E5; Mon, 4 Oct 2004 16:39:51 -0400 (EDT) Message-ID: <4161B517.3050607@redhat.com> Date: Mon, 04 Oct 2004 20:39:00 -0000 From: Jeff Johnston User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.2) Gecko/20040805 Netscape/7.2 MIME-Version: 1.0 To: Jeff Johnston Cc: gdb-patches@sources.redhat.com Subject: Re: [RFA]: Fix to watchthreads test case References: <4159DB0B.60907@redhat.com> In-Reply-To: <4159DB0B.60907@redhat.com> Content-Type: multipart/mixed; boundary="------------050302020909050305020609" X-SW-Source: 2004-10/txt/msg00065.txt.bz2 This is a multi-part message in MIME format. --------------050302020909050305020609 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1163 After discussing with Andrew, it was suggested that watchthreads.exp be given its own C file which is a copy of schedlock.c. This new patch replaces the old one below. Hopefully, someone will get a chance to look at it. Ok to commit? -- Jeff J. 2004-10-04 Jeff Johnston * gdb.threads/watchthreads.c: New file for use by watchthreads.exp. * gdb.threads/watchthreads.exp: Use gdb_get_line_number to find breakpoint lines and switch to use watchthreads.c. Jeff Johnston wrote: > The following fixes problems introduced by changes to schedlock.c which > watchthreads.exp also uses. It switches to use gdb_get_line_number so > that the file can change freely without affecting the watchthreads.exp > test case. > > Ok to commit? > > -- Jeff J. > > 2004-09-28 Jeff Johnston > > * gdb.threads/schedlock.c: Add comment markers to use to find > line numbers. > * gdb.threads/schedlock.exp: Adjust regex to handle the new > comments. > * gdb.threads/watchthreads.exp: Use gdb_get_line_number to find > breakpoint lines. > > --------------050302020909050305020609 Content-Type: text/plain; name="newwatchthreads.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="newwatchthreads.patch" Content-length: 4691 Index: gdb.threads/watchthreads.c =================================================================== RCS file: gdb.threads/watchthreads.c diff -N gdb.threads/watchthreads.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gdb.threads/watchthreads.c 4 Oct 2004 20:39:12 -0000 @@ -0,0 +1,66 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + + This file is copied from schedlock.c. */ + +#include +#include +#include +#include + +void *thread_function(void *arg); /* Pointer to function executed by each thread */ + +#define NUM 5 + +unsigned int args[NUM+1]; + +int main() { + int res; + pthread_t threads[NUM]; + void *thread_result; + long i; + + for (i = 0; i < NUM; i++) + { + args[i] = 1; /* Init value. */ + res = pthread_create(&threads[i], + NULL, + thread_function, + (void *) i); + } + + args[i] = 1; + thread_function ((void *) i); + + exit(EXIT_SUCCESS); +} + +void *thread_function(void *arg) { + int my_number = (long) arg; + int *myp = (int *) &args[my_number]; + + /* Don't run forever. Run just short of it :) */ + while (*myp > 0) + { + (*myp) ++; /* Loop increment. */ + } + + pthread_exit(NULL); +} + Index: gdb.threads/watchthreads.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/watchthreads.exp,v retrieving revision 1.1 diff -u -p -r1.1 watchthreads.exp --- gdb.threads/watchthreads.exp 27 Jul 2004 23:40:49 -0000 1.1 +++ gdb.threads/watchthreads.exp 4 Oct 2004 20:39:12 -0000 @@ -31,7 +31,7 @@ if [target_info exists gdb,no_hardware_w return 0; } -set testfile "schedlock" +set testfile "watchthreads" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } { @@ -60,17 +60,20 @@ set args_1 0 gdb_test "watch args\[0\]" "Hardware watchpoint 2: args\\\[0\\\]" gdb_test "watch args\[1\]" "Hardware watchpoint 3: args\\\[1\\\]" +set init_line [expr [gdb_get_line_number "Init value"]+1] +set inc_line [gdb_get_line_number "Loop increment"] + # Loop and continue to allow both watchpoints to be triggered. for {set i 0} {$i < 30} {incr i} { set test_flag 0 gdb_test_multiple "continue" "threaded watch loop" { - -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*schedlock.c:21.*$gdb_prompt $" + -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads.c:$init_line.*$gdb_prompt $" { set args_0 1; set test_flag 1 } - -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*schedlock.c:21.*$gdb_prompt $" + -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads.c:$init_line.*$gdb_prompt $" { set args_1 1; set test_flag 1 } - -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = $args_0.*New value = [expr $args_0+1].*in thread_function \\\(arg=0x0\\\) at .*schedlock.c:42.*$gdb_prompt $" + -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = $args_0.*New value = [expr $args_0+1].*in thread_function \\\(arg=0x0\\\) at .*watchthreads.c:$inc_line.*$gdb_prompt $" { set args_0 [expr $args_0+1]; set test_flag 1 } - -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = $args_1.*New value = [expr $args_1+1].*in thread_function \\\(arg=0x1\\\) at .*schedlock.c:42.*$gdb_prompt $" + -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = $args_1.*New value = [expr $args_1+1].*in thread_function \\\(arg=0x1\\\) at .*watchthreads.c:$inc_line.*$gdb_prompt $" { set args_1 [expr $args_1+1]; set test_flag 1 } } # If we fail above, don't bother continuing loop --------------050302020909050305020609--