gdb: pass info_threads_opts to print_thread_info_1

The "info threads" command tracks its options in a struct named
'info_threads_opts', which currently has only one option.  Pass the
whole options object to helper functions, instead of passing
the option value individually.  This is a refactoring to make adding
more options easier.

Reviewed-By: Guinevere Larsen <guinevere@redhat.com>
Approved-by: Pedro Alves <pedro@palves.net

diff --git a/gdb/thread.c b/gdb/thread.c
index b659463ef0246992a5290c1eb3b1175094a2e826..3375cfcee244449cf1f907d0e17b05d819cc7556 100644 (file)
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -1038,6 +1038,24 @@ pc_in_thread_step_range (CORE_ADDR pc, struct thread_info *thread)
          && pc < thread->control.step_range_end);
 }
 
+/* The options for the "info threads" command.  */
+
+struct info_threads_opts
+{
+  /* For "-gid".  */
+  bool show_global_ids = false;
+};
+
+static const gdb::option::option_def info_threads_option_defs[] = {
+
+  gdb::option::flag_option_def<info_threads_opts> {
+    "gid",
+    [] (info_threads_opts *opts) { return &opts->show_global_ids; },
+    N_("Show global thread IDs."),
+  },
+
+};
+
 /* Helper for print_thread_info.  Returns true if THR should be
    printed.  If REQUESTED_THREADS, a list of GDB ids/ranges, is not
    NULL, only print THR if its ID is included in the list.  GLOBAL_IDS
@@ -1046,11 +1064,13 @@ pc_in_thread_step_range (CORE_ADDR pc, struct thread_info *thread)
    is a thread from the process PID.  Otherwise, threads from all
    attached PIDs are printed.  If both REQUESTED_THREADS is not NULL
    and PID is not -1, then the thread is printed if it belongs to the
-   specified process.  Otherwise, an error is raised.  */
+   specified process.  Otherwise, an error is raised.  OPTS is the
+   options of the "info threads" command.  */
 
 static bool
-should_print_thread (const char *requested_threads, int default_inf_num,
-                    int global_ids, int pid, struct thread_info *thr)
+should_print_thread (const char *requested_threads,
+                    const info_threads_opts &opts, int default_inf_num,
+                    int global_ids, int pid, thread_info *thr)
 {
   if (requested_threads != NULL && *requested_threads != '\0')
     {
@@ -1104,8 +1124,8 @@ thread_target_id_str (thread_info *tp)
 
 static void
 do_print_thread (ui_out *uiout, const char *requested_threads,
-                int global_ids, int pid, int show_global_ids,
-                int default_inf_num, thread_info *tp,
+                const info_threads_opts &opts, int global_ids,
+                int pid, int default_inf_num, thread_info *tp,
                 thread_info *current_thread)
 {
   int core;
@@ -1114,7 +1134,7 @@ do_print_thread (ui_out *uiout, const char *requested_threads,
   if (current_thread != nullptr)
     switch_to_thread (current_thread);
 
-  if (!should_print_thread (requested_threads, default_inf_num,
+  if (!should_print_thread (requested_threads, opts, default_inf_num,
                            global_ids, pid, tp))
     return;
 
@@ -1130,7 +1150,7 @@ do_print_thread (ui_out *uiout, const char *requested_threads,
       uiout->field_string ("id-in-tg", print_thread_id (tp));
     }
 
-  if (show_global_ids || uiout->is_mi_like_p ())
+  if (opts.show_global_ids || uiout->is_mi_like_p ())
     uiout->field_signed ("id", tp->global_num);
 
   /* Switch to the thread (and inferior / target).  */
@@ -1191,23 +1211,22 @@ do_print_thread (ui_out *uiout, const char *requested_threads,
 
 static void
 print_thread (ui_out *uiout, const char *requested_threads,
-             int global_ids, int pid, int show_global_ids,
+             const info_threads_opts &opts, int global_ids, int pid,
              int default_inf_num, thread_info *tp, thread_info *current_thread)
 
 {
   do_with_buffered_output (do_print_thread, uiout, requested_threads,
-                          global_ids, pid, show_global_ids,
-                          default_inf_num, tp, current_thread);
+                          opts, global_ids, pid, default_inf_num, tp,
+                          current_thread);
 }
 
 /* Like print_thread_info, but in addition, GLOBAL_IDS indicates
    whether REQUESTED_THREADS is a list of global or per-inferior
-   thread ids.  */
+   thread ids.  OPTS is the options of the "info threads" command.  */
 
 static void
 print_thread_info_1 (struct ui_out *uiout, const char *requested_threads,
-                    int global_ids, int pid,
-                    int show_global_ids)
+                    const info_threads_opts &opts, int global_ids, int pid)
 {
   int default_inf_num = current_inferior ()->num;
 
@@ -1246,8 +1265,8 @@ print_thread_info_1 (struct ui_out *uiout, const char *requested_threads,
            if (current_thread != nullptr)
              switch_to_thread (current_thread);
 
-           if (!should_print_thread (requested_threads, default_inf_num,
-                                     global_ids, pid, tp))
+           if (!should_print_thread (requested_threads, opts,
+                                     default_inf_num, global_ids, pid, tp))
              continue;
 
            /* Switch inferiors so we're looking at the right
@@ -1271,12 +1290,12 @@ print_thread_info_1 (struct ui_out *uiout, const char *requested_threads,
            return;
          }
 
-       table_emitter.emplace (uiout, show_global_ids ? 5 : 4,
+       table_emitter.emplace (uiout, opts.show_global_ids ? 5 : 4,
                               n_threads, "threads");
 
        uiout->table_header (1, ui_left, "current", "");
        uiout->table_header (4, ui_left, "id-in-tg", "Id");
-       if (show_global_ids)
+       if (opts.show_global_ids)
          uiout->table_header (4, ui_left, "id", "GId");
        uiout->table_header (target_id_col_width, ui_left,
                             "target-id", "Target Id");
@@ -1292,8 +1311,8 @@ print_thread_info_1 (struct ui_out *uiout, const char *requested_threads,
          if (tp == current_thread && tp->state == THREAD_EXITED)
            current_exited = true;
 
-         print_thread (uiout, requested_threads, global_ids, pid,
-                       show_global_ids, default_inf_num, tp, current_thread);
+         print_thread (uiout, requested_threads, opts, global_ids, pid,
+                       default_inf_num, tp, current_thread);
        }
 
     /* This end scope restores the current thread and the frame
@@ -1322,27 +1341,10 @@ void
 print_thread_info (struct ui_out *uiout, const char *requested_threads,
                   int pid)
 {
-  print_thread_info_1 (uiout, requested_threads, 1, pid, 0);
+  info_threads_opts opts;
+  print_thread_info_1 (uiout, requested_threads, opts, 1, pid);
 }
 
-/* The options for the "info threads" command.  */
-
-struct info_threads_opts
-{
-  /* For "-gid".  */
-  bool show_global_ids = false;
-};
-
-static const gdb::option::option_def info_threads_option_defs[] = {
-
-  gdb::option::flag_option_def<info_threads_opts> {
-    "gid",
-    [] (info_threads_opts *opts) { return &opts->show_global_ids; },
-    N_("Show global thread IDs."),
-  },
-
-};
-
 /* Create an option_def_group for the "info threads" options, with
    IT_OPTS as context.  */
 
@@ -1367,7 +1369,7 @@ info_threads_command (const char *arg, int from_tty)
   gdb::option::process_options
     (&arg, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_ERROR, grp);
 
-  print_thread_info_1 (current_uiout, arg, 0, -1, it_opts.show_global_ids);
+  print_thread_info_1 (current_uiout, arg, it_opts, 0, -1);
 }
 
 /* Completer for the "info threads" command.  */