Re: [PATCH] Add a timeout parameter to gdb_do_one_event

[Pedro Alves <pedro@palves.net>]

On 2022-03-14 14:49, Patrick Monnerat via Gdb-patches wrote:
> +      try
> +	{
> +	  if (mstimeout > 0)
> +	    timer_id = create_timer (mstimeout,
> +				     [] (gdb_client_data arg)
> +				     {
> +				       ((gdb::optional<int> *) arg)->reset ();
> +				     },
> +				     &timer_id);
> +	  res = gdb_wait_for_event (1);
> +	  if (timer_id.has_value ())
> +	    delete_timer (*timer_id);
> +	}
> +      catch (...)
> +	{
> +	  if (timer_id.has_value ())
> +	    delete_timer (*timer_id);
> +	  throw;
> +	}


Instead of duplicated code on normal and exception exits, you can use
a SCOPE_EXIT:

          gdb::optional<int> timer_id;

          SCOPE_EXIT 
            {
              if (timer_id.has_value ())
                delete_timer (*timer_id);
            };

	  if (mstimeout > 0)
	    timer_id = create_timer (mstimeout,
				     [] (gdb_client_data arg)
				     {
				       ((gdb::optional<int> *) arg)->reset ();
				     },
				     &timer_id);
	  return gdb_wait_for_event (1);


I think you don't even need the "res" variable this way.