public inbox for archer@sourceware.org
 help / color / mirror / Atom feed
From: Phil Muldoon <pmuldoon@redhat.com>
To: archer@sourceware.org
Cc: tromey@redhat.com, jan.kratochvil@redhat.com
Subject: tromey/python non-trivial merge notification
Date: Mon, 14 Oct 2013 09:38:00 -0000	[thread overview]
Message-ID: <525BBB9C.2030006@redhat.com> (raw)


Jan asked me to investigate a non-trivial merge issue today with the
tromey/python branch.

I merged tromey/python and fixed the trivial merge conflicts first.
The commit reference for that is:

aed684a9a6f3dab80262ca21d6c728e99526b37f

The non trivial issue was as follows:

Upstream GDB added a patch that caused some conflict in the gdb.cli()
Python command.  The commit was:

d03f62382e0502a42020e6379dbe3c9252813c65

2013-09-06  Andrew Burgess  <aburgess@broadcom.com>

       * cli/cli-interp.c (_initialize_cli_interp): Add a
       command_loop_proc to interp_procs.
       * event-top.c (cli_command_loop): Change signature to match
       interp_command_loop_ftype.
       * event-top.h (cli_command_loop): Same.
       * interps.c (interp_new): Require every interpreter to have a
       command_loop_proc.
       (current_interp_command_loop): Just call the command_loop_proc on
       the current interpreter.
       * tui/tui-interp.c (_initialize_tui_interp): Add a
       command_loop_proc to interp_procs.

The first fix I thought of was just to pass cli_command_loop a NULL
(as cli_command_loop does not actually do anything with the data).
Jan rightly pointed out that in the future this may cause issues as,
really, this code requires a command_loop_proc.

Then we thought about using current_interp_command_loop instead.  This
would work fine, but it would be MI incompatible.  I could not think
of a reason why gdb.cli() would be invoked from MI. (It does not make
a whole lot of sense to do so, but someone might prove me wrong ;) )

I decided to bar invocation of this command in MI, and just use
current_interp_command_loop instead.  The commit for this fix is:

269d883cd0c2fd8a51163e4472963b1b5a9a576e

 2013-10-14  Phil Muldoon  <pmuldoon@redhat.com>
    
        * python/python.c (gdbpy_cli): Use current_interp_command_loop and
        bar invocation from MI.

As this is a non-trivial change I decide to notify archer list about
the changes.

Cheers,

Phil

             reply	other threads:[~2013-10-14  9:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-14  9:38 Phil Muldoon [this message]
2013-10-14 14:30 ` Tom Tromey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=525BBB9C.2030006@redhat.com \
    --to=pmuldoon@redhat.com \
    --cc=archer@sourceware.org \
    --cc=jan.kratochvil@redhat.com \
    --cc=tromey@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).