From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23645 invoked by alias); 16 Jul 2012 21:04:33 -0000 Received: (qmail 23629 invoked by uid 22791); 16 Jul 2012 21:04:32 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from server-nat-6.cs.umd.edu (HELO bacon.cs.umd.edu) (128.8.127.149) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 16 Jul 2012 21:04:19 +0000 Received: from wireless-206-196-164-152.umd.edu (wireless-206-196-164-152.umd.edu [206.196.164.152]) (Authenticated sender: khooyp) by bacon.cs.umd.edu (Postfix) with ESMTPSA id E8607B4098C; Mon, 16 Jul 2012 17:04:16 -0400 (EDT) From: Khoo Yit Phang Content-Type: multipart/mixed; boundary=Apple-Mail-18--906763319 Subject: [PATCH 4/4]: Enable readline under "python" Date: Mon, 16 Jul 2012 21:04:00 -0000 Message-Id: Cc: Khoo Yit Phang To: gdb-patches@sourceware.org Mime-Version: 1.0 (Apple Message framework v1084) X-CSD-MailScanner-ID: E8607B4098C.A8385 X-CSD-MailScanner: Found to be clean X-CSD-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-50, required 5, autolearn=not spam, ALL_TRUSTED -50.00) X-CSD-MailScanner-From: khooyp@cs.umd.edu X-CSD-MailScanner-Watermark: 1343077457.40551@aN1EBmHkU4W2jjS3/4BF/Q 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: 2012-07/txt/msg00225.txt.bz2 --Apple-Mail-18--906763319 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Content-length: 826 Hi, Here's the last Python patch: this enables readline support under "python" = using a GDB-specific mechanism, and disables the standard Python readline m= odule. This is somewhat of a workaround: unfortunately, there is no easy way to ma= ke GDB and Python use libreadline without conflicting with each other, sinc= e libreadline is configured essentially using global variables. Using the s= tandard Python readline module will lead to strange conflicts, e.g., changi= ng key bindings or tab-completion. I've thought of two possible solutions w= hich are both rather complicated: 1) either reimplement the readline module= that carefully swaps configurations between GDB and Python; 2) or run Pyth= on's readline in a separate controlling terminal with a proxy readline modu= le in GDB. Thank you, Yit July 16, 2012 --Apple-Mail-18--906763319 Content-Disposition: attachment; filename=python-enable-readline Content-Type: application/octet-stream; x-unix-mode=0600; name="python-enable-readline" Content-Transfer-Encoding: 7bit Content-length: 6127 # HG changeset patch # Parent a7e89526afbe05cf717e55ca3a4bf3492efa3001 Provide a GDB-specific readline in Python, blocking the standard Python readline module using a sys.meta_path loader to prevent conflicts with GDB. gdb/ChangeLog: 2012-07-16 Khoo Yit Phang Enable readline in Python in a GDB-specific way and block the standard Python readline module to prevent conflicts with GDB. * Makefile.in (SUBDIR_PYTHON_OBS): Add py-gdb-readline.o. (SUBDIR_PYTHON_SRCS): Add python/py-gdb-readline.c. (py-gdb-readline.o): Add rule to compile python/py-gdb-readline.c. * python/py-gdb-readline.c: New file. * python/python-internal.h (gdbpy_initialize_gdb_readline): New prototype. * python/python.c (_initialize_python): Call gdbpy_initialize_gdb_readline. diff --git a/gdb/Makefile.in b/gdb/Makefile.in --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -280,6 +280,7 @@ py-finishbreakpoint.o \ py-frame.o \ py-function.o \ + py-gdb-readline.o \ py-inferior.o \ py-infthread.o \ py-lazy-string.o \ @@ -312,6 +313,7 @@ python/py-finishbreakpoint.c \ python/py-frame.c \ python/py-function.c \ + python/py-gdb-readline.c \ python/py-inferior.c \ python/py-infthread.c \ python/py-lazy-string.c \ @@ -2082,6 +2084,10 @@ $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-function.c $(POSTCOMPILE) +py-gdb-readline.o: $(srcdir)/python/py-gdb-readline.c + $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-gdb-readline.c + $(POSTCOMPILE) + py-inferior.o: $(srcdir)/python/py-inferior.c $(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/py-inferior.c $(POSTCOMPILE) diff --git a/gdb/python/py-gdb-readline.c b/gdb/python/py-gdb-readline.c new file mode 100644 --- /dev/null +++ b/gdb/python/py-gdb-readline.c @@ -0,0 +1,118 @@ +/* Readline support for Python. + + Copyright (C) 2012 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 3 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, see . */ + +#include "defs.h" +#include "python-internal.h" +#include "exceptions.h" +#include "top.h" +#include "cli/cli-utils.h" +#include "gdb_string.h" + +#include + +/* Readline function suitable for PyOS_ReadlineFunctionPointer, which + is used for Python's interactive parser and raw_input. In both + cases, sys_stdin and sys_stdout are always stdin and stdout + respectively, as far as I can tell; they are ignored and + command_line_input is used instead. */ + +static char * +gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout, + char *prompt) +{ + int n; + char *p = NULL, *p_start, *p_end, *q; + volatile struct gdb_exception except; + + TRY_CATCH (except, RETURN_MASK_ALL) + { + struct cleanup *cleanup = gdbpy_suspend_sigint_handler (); + + p = command_line_input (prompt, 0, "python"); + do_cleanups (cleanup); + } + + /* Detect user interrupt (Ctrl-C). */ + if (except.reason == RETURN_QUIT) + return NULL; + + /* Handle errors by raising Python exceptions. */ + if (except.reason < 0) + { + /* The thread state is nulled during gdbpy_readline_wrapper, + with the original value saved in the following undocumented + variable (see Python's Parser/myreadline.c and + Modules/readline.c). */ + PyEval_RestoreThread (_PyOS_ReadlineTState); + gdbpy_convert_exception (except); + PyEval_SaveThread (); + return NULL; + } + + /* Detect EOF (Ctrl-D). */ + if (p == NULL) + { + q = PyMem_Malloc (1); + if (q != NULL) + q[0] = '\0'; + return q; + } + + n = strlen (p); + + /* Copy the line to Python and return. */ + q = PyMem_Malloc (n + 2); + if (q != NULL) + { + strncpy (q, p, n); + q[n] = '\n'; + q[n + 1] = '\0'; + } + return q; +} + +/* Initialize Python readline support. */ + +void +gdbpy_initialize_gdb_readline (void) +{ + /* Python's readline module conflicts with GDB's use of readline + since readline is not reentrant. Ideally, a reentrant wrapper to + GDB's readline should be implemented to replace Python's readline + and prevent conflicts. For now, this file implements a + sys.meta_path finder that simply fails to import the readline + module. */ + PyRun_SimpleString ("\ +import sys\n\ +\n\ +class GdbRemoveReadlineFinder:\n\ + def find_module(self, fullname, path=None):\n\ + if fullname == 'readline' and path is None:\n\ + return self\n\ + return None\n\ +\n\ + def load_module(self, fullname):\n\ + raise ImportError('readline module disabled under GDB')\n\ +\n\ +sys.meta_path.append(GdbRemoveReadlineFinder())\n\ +"); + + PyOS_ReadlineFunctionPointer = gdbpy_readline_wrapper; +} + diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -235,6 +235,7 @@ struct symtab_and_line *sal_object_to_symtab_and_line (PyObject *obj); struct frame_info *frame_object_to_frame_info (PyObject *frame_obj); +void gdbpy_initialize_gdb_readline (void); void gdbpy_initialize_auto_load (void); void gdbpy_initialize_values (void); void gdbpy_initialize_frames (void); diff --git a/gdb/python/python.c b/gdb/python/python.c --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1403,6 +1403,7 @@ gdbpy_gdberror_exc = PyErr_NewException ("gdb.GdbError", NULL, NULL); PyModule_AddObject (gdb_module, "GdbError", gdbpy_gdberror_exc); + gdbpy_initialize_gdb_readline (); gdbpy_initialize_auto_load (); gdbpy_initialize_values (); gdbpy_initialize_frames (); --Apple-Mail-18--906763319--