From b60cea74de13b944ad7d40c315f61f5e6bc2a932 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 18 Sep 2020 14:20:44 -0600 Subject: Make target_wait options use enum flags This changes TARGET_WNOHANG to be a member of an enum, rather than a define, and also adds a DEF_ENUM_FLAGS_TYPE for this type. Then, it changes target_wait and the various target wait methods to use this type rather than "int". This didn't catch any bugs, but it seems like a decent cleanup nevertheless. I did not change deprecated_target_wait_hook, since that's only used out-of-tree (by Insight), and there didn't seem to be a need. I can't build some of these targets, so I modified them on a best-effort basis. I don't think this patch should go in before the release branch is made. gdb/ChangeLog 2020-09-18 Tom Tromey * windows-nat.c (struct windows_nat_target) : Update. (windows_nat_target::wait): Update. * target/wait.h (enum target_wait_flag): New. Use DEF_ENUM_FLAGS_TYPE. * target/target.h (target_wait): Change type of options. * target.h (target_options_to_string, default_target_wait): Update. (struct target_ops) : Change type of options. * target.c (target_wait, default_target_wait, do_option): Change type of "options". (target_options_to_string): Likewise. * target-delegates.c: Rebuild. * target-debug.h (target_debug_print_target_wait_flags): Rename from target_debug_print_options. * sol-thread.c (class sol_thread_target) : Update. (sol_thread_target::wait): Update. * rs6000-nat.c (class rs6000_nat_target) : Update. (rs6000_nat_target::wait): Update. * remote.c (class remote_target) : Update. (remote_target::wait_ns, remote_target::wait_as): Change type of "options". (remote_target::wait): Update. * remote-sim.c (struct gdbsim_target) : Update. (gdbsim_target::wait): Update. * record-full.c (class record_full_base_target) : Update. (record_full_wait_1): Change type of "options". (record_full_base_target::wait): Update. * record-btrace.c (class record_btrace_target) : Update. (record_btrace_target::wait): Update. * ravenscar-thread.c (struct ravenscar_thread_target) : Update. (ravenscar_thread_target::wait): Update. * procfs.c (class procfs_target) : Update. (procfs_target::wait): Update. * obsd-nat.h (class obsd_nat_target) : Update. * obsd-nat.c (obsd_nat_target::wait): Update. * nto-procfs.c (struct nto_procfs_target) : Update. (nto_procfs_target::wait): Update. * nbsd-nat.h (struct nbsd_nat_target) : Update. * nbsd-nat.c (nbsd_wait): Change type of "options". (nbsd_nat_target::wait): Update. * linux-thread-db.c (class thread_db_target) : Update. (thread_db_target::wait): Update. * linux-nat.h (class linux_nat_target) : Update. * linux-nat.c (linux_nat_target::wait): Update. (linux_nat_wait_1): Update. * infrun.c (do_target_wait_1, do_target_wait): Change type of "options". * inf-ptrace.h (struct inf_ptrace_target) : Update. * inf-ptrace.c (inf_ptrace_target::wait): Update. * go32-nat.c (struct go32_nat_target) : Update. (go32_nat_target::wait): Update. * gnu-nat.h (struct gnu_nat_target) : Update. * gnu-nat.c (gnu_nat_target::wait): Update. * fbsd-nat.h (class fbsd_nat_target) : Update. * fbsd-nat.c (fbsd_nat_target::wait): Update. * darwin-nat.h (class darwin_nat_target) : Update. * darwin-nat.c (darwin_nat_target::wait): Update. * bsd-uthread.c (struct bsd_uthread_target) : Update. (bsd_uthread_target::wait): Update. * aix-thread.c (class aix_thread_target) : Update. (aix_thread_target::wait): Update. gdbserver/ChangeLog 2020-09-18 Tom Tromey * netbsd-low.h (class netbsd_process_target) : Update. * netbsd-low.cc (netbsd_waitpid, netbsd_wait) (netbsd_process_target::wait): Change type of target_options. * win32-low.h (class win32_process_target) : Update. * win32-low.cc (win32_process_target::wait): Update. * target.h (class process_stratum_target) : Update. (mywait): Update. * target.cc (mywait, target_wait): Change type of "options". * linux-low.h (class linux_process_target) : Update. * linux-low.cc (linux_process_target::wait) (linux_process_target::wait_1): Update. --- gdb/target/target.h | 4 +++- gdb/target/wait.h | 15 +++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'gdb/target') diff --git a/gdb/target/target.h b/gdb/target/target.h index a66459c..393272b 100644 --- a/gdb/target/target.h +++ b/gdb/target/target.h @@ -21,6 +21,8 @@ #define TARGET_TARGET_H #include "target/waitstatus.h" +#include "target/wait.h" + /* This header is a stopgap until more code is shared. */ /* Read LEN bytes of target memory at address MEMADDR, placing the @@ -84,7 +86,7 @@ extern void target_continue (ptid_t ptid, enum gdb_signal signal); options. */ extern ptid_t target_wait (ptid_t ptid, struct target_waitstatus *status, - int options); + target_wait_flags options); /* The inferior process has died. Do what is right. */ diff --git a/gdb/target/wait.h b/gdb/target/wait.h index d23b892..ee623bb 100644 --- a/gdb/target/wait.h +++ b/gdb/target/wait.h @@ -20,11 +20,18 @@ #ifndef TARGET_WAIT_H #define TARGET_WAIT_H +#include "gdbsupport/enum-flags.h" + /* Options that can be passed to target_wait. */ -/* Return immediately if there's no event already queued. If this - options is not requested, target_wait blocks waiting for an - event. */ -#define TARGET_WNOHANG 1 +enum target_wait_flag : unsigned +{ + /* Return immediately if there's no event already queued. If this + options is not requested, target_wait blocks waiting for an + event. */ + TARGET_WNOHANG = 1, +}; + +DEF_ENUM_FLAGS_TYPE (enum target_wait_flag, target_wait_flags); #endif /* TARGET_WAIT_H */ -- cgit v1.1