Re: PING: [PATCH] Remove deprecated_command_loop_hook

[Pedro Alves <palves at redhat dot com>]

On 08/29/2013 11:47 AM, Andrew Burgess wrote:
> Ping!
> 
> I know the gdbtk patch has not yet been merged, but the patch I posted
> for them is not huge, nor should it prove controversial, it's in the
> same style as this patch for core gdb.

I guess people were just waiting to hear if/when the gdbtk patch
had been merged.  But really we don't need to wait for that.  Split
out the MI part from the part that actually gets rid of
deprecated_command_loop_hook, and resend the MI bits.  Once both MI
and the gdbtk patches are in, resend the deprecated_command_loop_hook
bit saying
"hey, there are no users left, let's just garbage collect this.".

>
> +  /* The version of the mi we're running.  */
> +  int version;
> +

I may be missing something, as I don't see a need for this ...

>  static void mi_insert_notify_hooks (void);
>  static void mi_remove_notify_hooks (void);
>  static void mi_on_normal_stop (struct bpstats *bs, int print_frame);
> @@ -89,7 +85,6 @@ mi_interpreter_init (struct interp *interp, int top_level)
>  {
>    struct mi_interp *mi = XMALLOC (struct mi_interp);
>    const char *name;
> -  int mi_version;
>
>    /* Assign the output channel created at startup to its own global,
>       so that we can create a console channel that encapsulates and
> @@ -110,17 +105,17 @@ mi_interpreter_init (struct interp *interp, int top_level)
>    /* INTERP_MI selects the most recent released version.  "mi2" was
>       released as part of GDB 6.0.  */
>    if (strcmp (name, INTERP_MI) == 0)
> -    mi_version = 2;
> +    mi->version = 2;
>    else if (strcmp (name, INTERP_MI1) == 0)
> -    mi_version = 1;
> +    mi->version = 1;
>    else if (strcmp (name, INTERP_MI2) == 0)
> -    mi_version = 2;
> +    mi->version = 2;
>    else if (strcmp (name, INTERP_MI3) == 0)
> -    mi_version = 3;
> +    mi->version = 3;
>    else
>      gdb_assert_not_reached ("unhandled MI version");
>
> -  mi->uiout = mi_out_new (mi_version);
> +  mi->uiout = mi_out_new (mi->version);
>
>    if (top_level)
>      {
> @@ -193,16 +188,6 @@ mi_interpreter_resume (void *data)
>
>    deprecated_show_load_progress = mi_load_progress;
>
> -  /* If we're _the_ interpreter, take control.  */
> -  if (current_interp_named_p (INTERP_MI1))
> -    deprecated_command_loop_hook = mi1_command_loop;
> -  else if (current_interp_named_p (INTERP_MI2))
> -    deprecated_command_loop_hook = mi2_command_loop;
> -  else if (current_interp_named_p (INTERP_MI3))
> -    deprecated_command_loop_hook = mi3_command_loop;
> -  else
> -    deprecated_command_loop_hook = mi2_command_loop;
> -
>    return 1;
>  }
>
> @@ -322,26 +307,11 @@ mi_execute_command_input_handler (char *cmd)
>  }
>

>  static void
> -mi1_command_loop (void)
> -{
> -  mi_command_loop (1);
> -}
> -
> -static void
> -mi2_command_loop (void)
> +mi_command_loop (void *data)
>  {
> -  mi_command_loop (2);
> -}
> -
> -static void
> -mi3_command_loop (void)
> -{
> -  mi_command_loop (3);
> -}
> +  struct mi_interp *mi = data;
> +  int mi_version = mi->version;
>

... given mi_command_loop actually does nothing
with mi_version...  If we actually need it for something, we
can extract it from the interpreter's uiout, with mi_version(uiout).

-- 
Pedro Alves