[RFC,v3] Consolidate gdbserver global variables

  (Addressed formatting and ChangeLog issues)

> As mentioned, I'm skeptical of all client_state references
> in the backends.
> 
> How will this work with multiple clients?   What if one client
> wants exec events, and the other one doesn't?  This seems to
> suggest that the backends need to enable exec events if _any_
> client wants them (or unconditionally), and then filter out exec
> events at a higher level, before reporting the event to
> each client?

Perhaps filtering that is roughly analogous to the way
gdb_catch_this_syscall_p filters for particular syscalls.

> This "= 0" is a spurious change.  Remove it.

Removed (it eliminated a compiler warning with gcc 7.3.1)

> Give the global different name to avoid conflict with
> the type name.  Maybe "g_client_state" or "the_client_state".

Used g_client_state and also made it static instead of allocating it
with new.

> What's the plan for last_status/last_ptid?
> Shouldn't those be per-client too?

Added those.

> Should these two be per client?  I'd think so off hand,
> since they correspond to the Hc/Hg threads?

Added cont_thread and general_thread

> I suspect that it'd be better to make the server_waiting
> global be per-process instead

Returned to server_waiting being a global for now.


Thanks Pedro!


Tested on linux with native-gdbserver.

Add client_state struct.

Collect per client specific global data items into struct client_state,
which is similar in purpose to remote.c::remote_state.

     * server.h (struct client_state): New.
     * server.c (cont_thread, general_thread, multi_process)
     (report_fork_events, report_vfork_events, report_exec_events)
     (report_thread_events, swbreak_feature, hwbreak_feature)
     (vCont_supported, disable_randomization, pass_signals)
     (program_signals, program_signals_p, last_status, last_ptid, own_buf):
     Moved to client_state.
     * remote-utils.c (remote_debug, noack_mode)
     (transport_is_reliable): Moved to client_state.
     * tracepoint.c (current_traceframe): Moved to client_state.

     Update all callers.
     * server.c, remote-utils.c, tracepoint.c, fork-child.c,
     gdbthread.h, hostio.c, linux-arm-low.c, linux-low.c, notif.c,
     remote-utils.h, spu-low.c, target.c, win32-low.c: Use
     client_state.


  gdb/gdbserver/fork-child.c   |   8 +-
  gdb/gdbserver/hostio.c       |   2 -
  gdb/gdbserver/linux-low.c    |  31 +++---
  gdb/gdbserver/notif.c        |   6 +-
  gdb/gdbserver/remote-utils.c | 146 ++++++++++++++-------------
  gdb/gdbserver/remote-utils.h |   4 -
  gdb/gdbserver/server.c       | 523 
+++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
  gdb/gdbserver/server.h       | 104 +++++++++++++------
  gdb/gdbserver/target.c       |  15 ++-
  gdb/gdbserver/tracepoint.c   |  25 ++---
  10 files changed, 461 insertions(+), 403 deletions(-)


    if (!tframe)
@@ -2343,6 +2340,7 @@ find_next_traceframe_by_tracepoint (int num, int 
*tfnump)
  static void
  cmd_qtinit (char *packet)
  {
+  client_state &cs = get_client_state ();
    struct trace_state_variable *tsv, *prev, *next;

    /* Can't do this command without a pid attached.  */
@@ -2353,7 +2351,7 @@ cmd_qtinit (char *packet)
      }

    /* Make sure we don't try to read from a trace frame.  */
-  current_traceframe = -1;
+  cs.current_traceframe = -1;

    stop_tracing ();

@@ -2813,6 +2811,7 @@ cmd_qtenable_disable (char *own_buf, int enable)
  static void
  cmd_qtv (char *own_buf)
  {
+  client_state &cs = get_client_state ();
    ULONGEST num;
    LONGEST val = 0;
    int err;
@@ -2821,7 +2820,7 @@ cmd_qtv (char *own_buf)
    packet += strlen ("qTV:");
    unpack_varlen_hex (packet, &num);

-  if (current_traceframe >= 0)
+  if (cs.current_traceframe >= 0)
      {
        err = traceframe_read_tsv ((int) num, &val);
        if (err)
@@ -3552,6 +3551,7 @@ cmd_qtdisconnected (char *own_buf)
  static void
  cmd_qtframe (char *own_buf)
  {
+  client_state &cs = get_client_state ();
    ULONGEST frame, pc, lo, hi, num;
    int tfnum, tpnum;
    struct traceframe *tframe;
@@ -3602,7 +3602,7 @@ cmd_qtframe (char *own_buf)
        if (tfnum == -1)
  	{
  	  trace_debug ("Want to stop looking at traceframes");
-	  current_traceframe = -1;
+	  cs.current_traceframe = -1;
  	  write_ok (own_buf);
  	  return;
  	}
@@ -3612,7 +3612,7 @@ cmd_qtframe (char *own_buf)

    if (tframe)
      {
-      current_traceframe = tfnum;
+      cs.current_traceframe = tfnum;
        sprintf (own_buf, "F%xT%x", tfnum, tframe->tpnum);
      }
    else
@@ -5297,6 +5297,7 @@ traceframe_read_mem (int tfnum, CORE_ADDR addr,
  static int
  traceframe_read_tsv (int tsvnum, LONGEST *val)
  {
+  client_state &cs = get_client_state ();
    int tfnum;
    struct traceframe *tframe;
    unsigned char *database, *dataptr;
@@ -5306,7 +5307,7 @@ traceframe_read_tsv (int tsvnum, LONGEST *val)

    trace_debug ("traceframe_read_tsv");

-  tfnum = current_traceframe;
+  tfnum = cs.current_traceframe;

    if (tfnum < 0)
      {
  

[RFC,v3] Consolidate gdbserver global variables

Commit Message

Comments

Patch