* [RFA]: Fix to watchthreads test case
@ 2004-09-28 21:43 Jeff Johnston
2004-10-04 20:39 ` Jeff Johnston
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Johnston @ 2004-09-28 21:43 UTC (permalink / raw)
To: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
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 <jjohnstn@redhat.com>
* 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.
[-- Attachment #2: watchthreadsfix.patch --]
[-- Type: text/plain, Size: 3669 bytes --]
Index: gdb.threads/schedlock.c
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/schedlock.c,v
retrieving revision 1.5
diff -u -p -r1.5 schedlock.c
--- gdb.threads/schedlock.c 27 Aug 2004 11:13:28 -0000 1.5
+++ gdb.threads/schedlock.c 28 Sep 2004 21:37:43 -0000
@@ -36,7 +36,7 @@ int main() {
for (i = 0; i < NUM; i++)
{
- args[i] = 1;
+ args[i] = 1; /* Init value. */
res = pthread_create(&threads[i],
NULL,
thread_function,
@@ -58,7 +58,7 @@ void *thread_function(void *arg) {
while (*myp > 0)
{
/* schedlock.exp: main loop. */
- (*myp) ++;
+ (*myp) ++; /* Loop increment. */
}
pthread_exit(NULL);
Index: gdb.threads/schedlock.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/schedlock.exp,v
retrieving revision 1.4
diff -u -p -r1.4 schedlock.exp
--- gdb.threads/schedlock.exp 8 May 2003 19:23:29 -0000 1.4
+++ gdb.threads/schedlock.exp 28 Sep 2004 21:37:43 -0000
@@ -125,7 +125,7 @@ proc step_ten_loops { msg } {
send_gdb "step\n"
set other_step 0
gdb_expect {
- -re ".*myp\\) \\+\\+;\[\r\n\]+$gdb_prompt $" {
+ -re ".*myp\\) \\+\\+;.*Loop increment.*\[\r\n\]+$gdb_prompt $" {
pass "step to increment ($msg $i)"
}
-re "$gdb_prompt $" {
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 28 Sep 2004 21:37:43 -0000
@@ -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 .*schedlock.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 .*schedlock.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 .*schedlock.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 .*schedlock.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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [RFA]: Fix to watchthreads test case
2004-09-28 21:43 [RFA]: Fix to watchthreads test case Jeff Johnston
@ 2004-10-04 20:39 ` Jeff Johnston
2004-10-12 14:56 ` Michael Chastain
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Johnston @ 2004-10-04 20:39 UTC (permalink / raw)
To: Jeff Johnston; +Cc: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 1163 bytes --]
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 <jjohnstn@redhat.com>
* 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 <jjohnstn@redhat.com>
>
> * 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.
>
>
[-- Attachment #2: newwatchthreads.patch --]
[-- Type: text/plain, Size: 4691 bytes --]
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 <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <pthread.h>
+
+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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [RFA]: Fix to watchthreads test case
2004-10-04 20:39 ` Jeff Johnston
@ 2004-10-12 14:56 ` Michael Chastain
2004-10-12 22:50 ` Jeff Johnston
0 siblings, 1 reply; 4+ messages in thread
From: Michael Chastain @ 2004-10-12 14:56 UTC (permalink / raw)
To: msnyder, jjohnstn; +Cc: gdb-patches
Jeff Johnston writes:
> After discussing with Andrew, it was suggested that watchthreads.exp be
> given its own C file which is a copy of schedlock.c.
Sounds good to me, I like it that way too.
It looks like I broke this. :( When I added a copyright notice to
schedlock.c, I tested schedlock.exp, but I did not look for any other
*.exp files that shared schedlock.c. So I just plain broke it.
> This new patch replaces the old one below.
> Hopefully, someone will get a chance to look at it.
I'm still catching up on my e-mail so maybe Michael Snyder already
reviewed this patch. But if not -- I approve this, if you say how
you tested it.
Michael
===
2004-10-04 Jeff Johnston <jjohnstn@redhat.com>
* 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RFA]: Fix to watchthreads test case
2004-10-12 14:56 ` Michael Chastain
@ 2004-10-12 22:50 ` Jeff Johnston
0 siblings, 0 replies; 4+ messages in thread
From: Jeff Johnston @ 2004-10-12 22:50 UTC (permalink / raw)
To: Michael Chastain; +Cc: msnyder, gdb-patches
Thanks Michael. Patch checked in and tested on x86-linux and ia64-linux.
-- Jeff J.
Michael Chastain wrote:
> Jeff Johnston writes:
>
>>After discussing with Andrew, it was suggested that watchthreads.exp be
>>given its own C file which is a copy of schedlock.c.
>
>
> Sounds good to me, I like it that way too.
>
> It looks like I broke this. :( When I added a copyright notice to
> schedlock.c, I tested schedlock.exp, but I did not look for any other
> *.exp files that shared schedlock.c. So I just plain broke it.
>
>
>>This new patch replaces the old one below.
>>Hopefully, someone will get a chance to look at it.
>
>
> I'm still catching up on my e-mail so maybe Michael Snyder already
> reviewed this patch. But if not -- I approve this, if you say how
> you tested it.
>
> Michael
>
> ===
>
> 2004-10-04 Jeff Johnston <jjohnstn@redhat.com>
>
> * 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.
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-10-12 22:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-09-28 21:43 [RFA]: Fix to watchthreads test case Jeff Johnston
2004-10-04 20:39 ` Jeff Johnston
2004-10-12 14:56 ` Michael Chastain
2004-10-12 22:50 ` Jeff Johnston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox