From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8796 invoked by alias); 9 Aug 2010 19:24:56 -0000 Received: (qmail 8775 invoked by uid 22791); 9 Aug 2010 19:24:54 -0000 X-SWARE-Spam-Status: No, hits=-6.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 09 Aug 2010 19:24:49 +0000 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o79JOVrt029512 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 9 Aug 2010 15:24:32 -0400 Received: from host1.dyn.jankratochvil.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o79JOSt4002893 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 9 Aug 2010 15:24:30 -0400 Received: from host1.dyn.jankratochvil.net (localhost [127.0.0.1]) by host1.dyn.jankratochvil.net (8.14.4/8.14.4) with ESMTP id o79JOSmX017659; Mon, 9 Aug 2010 21:24:28 +0200 Received: (from jkratoch@localhost) by host1.dyn.jankratochvil.net (8.14.4/8.14.4/Submit) id o79JORP2017658; Mon, 9 Aug 2010 21:24:27 +0200 Date: Mon, 09 Aug 2010 19:24:00 -0000 From: Jan Kratochvil To: Tom Tromey Cc: Doug Evans , Eli Zaretskii , gdb-patches@sourceware.org, David Malcolm , Joel Brobecker Subject: Re: [patch] Fix python gdb.execute to not paginate Message-ID: <20100809192427.GA17492@host1.dyn.jankratochvil.net> References: <83k4o4w34e.fsf@gnu.org> <20100806102912.GA20604@host1.dyn.jankratochvil.net> <20100807150149.GA20523@host1.dyn.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-12-10) X-IsSubscribed: yes 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 X-SW-Source: 2010-08/txt/msg00109.txt.bz2 On Mon, 09 Aug 2010 19:30:32 +0200, Tom Tromey wrote: > I think this should go on the 7.2 branch as well. > It fixes a pretty serious bug in a feature that is new to 7.2. Checked-in gdb_7_2-branch. Minor rediff had to be done. Thanks, Jan http://sourceware.org/ml/gdb-cvs/2010-08/msg00037.html --- src/gdb/ChangeLog 2010/08/06 19:51:48 1.11973.2.27 +++ src/gdb/ChangeLog 2010/08/09 19:22:57 1.11973.2.28 @@ -1,3 +1,22 @@ +2010-08-09 Jan Kratochvil + + * defs.h (make_cleanup_restore_uinteger, make_cleanup_restore_ui_file) + (make_cleanup_restore_page_info) + (set_batch_flag_and_make_cleanup_restore_page_info): New declarations. + * gdbcmd.h (execute_command_to_string): New declaration. + * python/python.c (struct restore_ui_file_closure, restore_ui_file) + (make_cleanup_restore_ui_file): Move to utils.c + (execute_gdb_command) : Move ... + * top.c (execute_command_to_string): ... here. Call + set_batch_flag_and_make_cleanup_restore_page_info. + * utils.c (make_cleanup_restore_integer): New source file blank line. + (make_cleanup_restore_uinteger): New. + (struct restore_ui_file_closure, do_restore_ui_file) + (make_cleanup_restore_ui_file): Move here from python/python.c. + (init_page_info) + (do_restore_page_info_cleanup, make_cleanup_restore_page_info) + (set_batch_flag_and_make_cleanup_restore_page_info): New. + 2010-08-06 Maciej W. Rozycki * thread.c (add_thread_silent): Use null_ptid instead of --- src/gdb/defs.h 2010/06/26 06:44:47 1.275 +++ src/gdb/defs.h 2010/08/09 19:22:58 1.275.2.1 @@ -351,6 +351,10 @@ extern struct cleanup *make_cleanup_obstack_free (struct obstack *obstack); extern struct cleanup *make_cleanup_restore_integer (int *variable); +extern struct cleanup *make_cleanup_restore_uinteger (unsigned int *variable); + +extern struct cleanup * + make_cleanup_restore_ui_file (struct ui_file **variable); extern struct cleanup *make_final_cleanup (make_cleanup_ftype *, void *); @@ -383,6 +387,10 @@ extern void init_page_info (void); +extern struct cleanup *make_cleanup_restore_page_info (void); +extern struct cleanup * + set_batch_flag_and_make_cleanup_restore_page_info (void); + extern char *gdb_realpath (const char *); extern char *xfullpath (const char *); --- src/gdb/gdbcmd.h 2010/01/01 07:31:32 1.20 +++ src/gdb/gdbcmd.h 2010/08/09 19:22:58 1.20.4.1 @@ -125,6 +125,7 @@ extern struct cmd_list_element *showchecklist; extern void execute_command (char *, int); +extern char *execute_command_to_string (char *p, int from_tty); enum command_control_type execute_control_command (struct command_line *); --- src/gdb/top.c 2010/07/27 19:13:11 1.181.2.1 +++ src/gdb/top.c 2010/08/09 19:22:58 1.181.2.2 @@ -458,6 +458,39 @@ } } +/* Run execute_command for P and FROM_TTY. Capture its output into the + returned string, do not display it to the screen. BATCH_FLAG will be + temporarily set to true. */ + +char * +execute_command_to_string (char *p, int from_tty) +{ + struct ui_file *str_file; + struct cleanup *cleanup; + char *retval; + + /* GDB_STDOUT should be better already restored during these + restoration callbacks. */ + cleanup = set_batch_flag_and_make_cleanup_restore_page_info (); + + str_file = mem_fileopen (); + + make_cleanup_restore_ui_file (&gdb_stdout); + make_cleanup_restore_ui_file (&gdb_stderr); + make_cleanup_ui_file_delete (str_file); + + gdb_stdout = str_file; + gdb_stderr = str_file; + + execute_command (p, from_tty); + + retval = ui_file_xstrdup (str_file, NULL); + + do_cleanups (cleanup); + + return retval; +} + /* Read commands from `instream' and execute them until end of file or error reading instream. */ --- src/gdb/utils.c 2010/07/27 19:13:11 1.236.2.1 +++ src/gdb/utils.c 2010/08/09 19:22:58 1.236.2.2 @@ -339,6 +339,7 @@ /* Remember the current value of *VARIABLE and make it restored when the cleanup is run. */ + struct cleanup * make_cleanup_restore_integer (int *variable) { @@ -352,6 +353,43 @@ xfree); } +/* Remember the current value of *VARIABLE and make it restored when the cleanup + is run. */ + +struct cleanup * +make_cleanup_restore_uinteger (unsigned int *variable) +{ + return make_cleanup_restore_integer ((int *) variable); +} + +struct restore_ui_file_closure +{ + struct ui_file **variable; + struct ui_file *value; +}; + +static void +do_restore_ui_file (void *p) +{ + struct restore_ui_file_closure *closure = p; + + *(closure->variable) = closure->value; +} + +/* Remember the current value of *VARIABLE and make it restored when + the cleanup is run. */ + +struct cleanup * +make_cleanup_restore_ui_file (struct ui_file **variable) +{ + struct restore_ui_file_closure *c = XNEW (struct restore_ui_file_closure); + + c->variable = variable; + c->value = *variable; + + return make_cleanup_dtor (do_restore_ui_file, (void *) c, xfree); +} + struct cleanup * make_my_cleanup2 (struct cleanup **pmy_chain, make_cleanup_ftype *function, void *arg, void (*free_arg) (void *)) @@ -2034,6 +2072,12 @@ void init_page_info (void) { + if (batch_flag) + { + lines_per_page = UINT_MAX; + chars_per_line = UINT_MAX; + } + else #if defined(TUI) if (!tui_get_command_dimension (&chars_per_line, &lines_per_page)) #endif @@ -2078,6 +2122,44 @@ set_width (); } +/* Helper for make_cleanup_restore_page_info. */ + +static void +do_restore_page_info_cleanup (void *arg) +{ + set_screen_size (); + set_width (); +} + +/* Provide cleanup for restoring the terminal size. */ + +struct cleanup * +make_cleanup_restore_page_info (void) +{ + struct cleanup *back_to; + + back_to = make_cleanup (do_restore_page_info_cleanup, NULL); + make_cleanup_restore_uinteger (&lines_per_page); + make_cleanup_restore_uinteger (&chars_per_line); + + return back_to; +} + +/* Temporarily set BATCH_FLAG and the associated unlimited terminal size. + Provide cleanup for restoring the original state. */ + +struct cleanup * +set_batch_flag_and_make_cleanup_restore_page_info (void) +{ + struct cleanup *back_to = make_cleanup_restore_page_info (); + + make_cleanup_restore_integer (&batch_flag); + batch_flag = 1; + init_page_info (); + + return back_to; +} + /* Set the screen size based on LINES_PER_PAGE and CHARS_PER_LINE. */ static void --- src/gdb/doc/ChangeLog 2010/07/30 14:40:59 1.1083.2.3 +++ src/gdb/doc/ChangeLog 2010/08/09 19:22:58 1.1083.2.4 @@ -1,3 +1,9 @@ +2010-08-09 Jan Kratochvil + Eli Zaretskii + + * gdb.texinfo (Mode Options) <-batch> + (Basic Python) : Describe setting width and height. + 2010-07-30 Hui Zhu * gdb.texinfo (Inferiors and Programs): Update the introduce of --- src/gdb/doc/gdb.texinfo 2010/07/30 14:40:59 1.737.2.3 +++ src/gdb/doc/gdb.texinfo 2010/08/09 19:22:59 1.737.2.4 @@ -1031,9 +1031,9 @@ command files specified with @samp{-x} (and all commands from initialization files, if not inhibited with @samp{-n}). Exit with nonzero status if an error occurs in executing the @value{GDBN} commands -in the command files. Batch mode also disables pagination; -@pxref{Screen Size} and acts as if @kbd{set confirm off} were in -effect (@pxref{Messages/Warnings}). +in the command files. Batch mode also disables pagination, sets unlimited +terminal width and height @pxref{Screen Size}, and acts as if @kbd{set confirm +off} were in effect (@pxref{Messages/Warnings}). Batch mode may be useful for running @value{GDBN} as a filter, for example to download and run a program on another computer; in order to @@ -20432,7 +20432,9 @@ @value{GDBN}'s standard output. If the @var{to_string} parameter is @code{True}, then output will be collected by @code{gdb.execute} and returned as a string. The default is @code{False}, in which case the -return value is @code{None}. +return value is @code{None}. If @var{to_string} is @code{True}, the +@value{GDBN} virtual terminal will be temporarily set to unlimited width +and height, and its pagination will be disabled; @pxref{Screen Size}. @end defun @findex gdb.breakpoints --- src/gdb/python/python.c 2010/06/28 21:16:03 1.44 +++ src/gdb/python/python.c 2010/08/09 19:22:59 1.44.2.1 @@ -309,33 +309,6 @@ return PyUnicode_Decode (cset, strlen (cset), host_charset (), NULL); } -struct restore_ui_file_closure -{ - struct ui_file **variable; - struct ui_file *value; -}; - -static void -restore_ui_file (void *p) -{ - struct restore_ui_file_closure *closure = p; - - *(closure->variable) = closure->value; -} - -/* Remember the current value of *VARIABLE and make it restored when - the cleanup is run. */ -struct cleanup * -make_cleanup_restore_ui_file (struct ui_file **variable) -{ - struct restore_ui_file_closure *c = XNEW (struct restore_ui_file_closure); - - c->variable = variable; - c->value = *variable; - - return make_cleanup_dtor (restore_ui_file, (void *) c, xfree); -} - /* A Python function which evaluates a string using the gdb CLI. */ static PyObject * @@ -376,27 +349,15 @@ /* Copy the argument text in case the command modifies it. */ char *copy = xstrdup (arg); struct cleanup *cleanup = make_cleanup (xfree, copy); - struct ui_file *str_file = NULL; if (to_string) + result = execute_command_to_string (copy, from_tty); + else { - str_file = mem_fileopen (); - - make_cleanup_restore_ui_file (&gdb_stdout); - make_cleanup_restore_ui_file (&gdb_stderr); - make_cleanup_ui_file_delete (str_file); - - gdb_stdout = str_file; - gdb_stderr = str_file; + result = NULL; + execute_command (copy, from_tty); } - execute_command (copy, from_tty); - - if (str_file) - result = ui_file_xstrdup (str_file, NULL); - else - result = NULL; - do_cleanups (cleanup); } GDB_PY_HANDLE_EXCEPTION (except); --- src/gdb/testsuite/ChangeLog 2010/07/27 23:21:07 1.2376.2.8 +++ src/gdb/testsuite/ChangeLog 2010/08/09 19:22:59 1.2376.2.9 @@ -1,3 +1,10 @@ +2010-08-09 Jan Kratochvil + + * gdb.python/python.exp (show height, set height 10) + (verify pagination beforehand, verify pagination beforehand: q) + (gdb.execute does not page, verify pagination afterwards) + (verify pagination afterwards: q): New. + 2010-07-27 Jan Kratochvil * gdb.base/help.exp (help disassemble): Update the content. --- src/gdb/testsuite/gdb.python/python.exp 2010/06/25 18:15:18 1.9 +++ src/gdb/testsuite/gdb.python/python.exp 2010/08/09 19:23:00 1.9.2.1 @@ -87,3 +87,26 @@ gdb_test_no_output \ "python x = gdb.execute('printf \"%d\", 23', to_string = True)" gdb_test "python print x" "23" + +# Test (no) pagination of the executed command. +gdb_test "show height" {Number of lines gdb thinks are in a page is unlimited\.} +set lines 10 +gdb_test_no_output "set height $lines" + +set test "verify pagination beforehand" +gdb_test_multiple "python print \"\\n\" * $lines" $test { + -re "---Type to continue, or q to quit---$" { + pass $test + } +} +gdb_test "q" "Quit" "verify pagination beforehand: q" + +gdb_test "python if gdb.execute('python print \"\\\\n\" * $lines', to_string=True) == \"\\n\" * [expr $lines + 1]: print \"yes\"" "yes" "gdb.execute does not page" + +set test "verify pagination afterwards" +gdb_test_multiple "python print \"\\n\" * $lines" $test { + -re "---Type to continue, or q to quit---$" { + pass $test + } +} +gdb_test "q" "Quit" "verify pagination afterwards: q"