diff options
author | Simon Marchi <simon.marchi@ericsson.com> | 2016-12-08 13:06:14 -0500 |
---|---|---|
committer | Simon Marchi <simon.marchi@ericsson.com> | 2017-02-23 17:25:30 -0500 |
commit | 44c04ee9bf959b40819de6327500557fbb5d8c4a (patch) | |
tree | f2fae0b73585f6b67cfbb0f7c29d65f9d70ebc77 /gdb/gdbthread.h | |
parent | a567769b813b2538bebc97d689fc0739f172028e (diff) | |
download | binutils-users/simark/user-selection-rfc.zip binutils-users/simark/user-selection-rfc.tar.gz binutils-users/simark/user-selection-rfc.tar.bz2 |
Decouple user selection from internal selectionusers/simark/user-selection-rfc
I am sending this as an RFC because it's far from complete and
definitive, but I'd like to gather some comments and opinions before
going further in this direction.
The goal of this patch is to decouple the notion of the user-selected
inferior/thread/frame from GDB's internally selected
inferior/thread/frame.
Currently, for example, the inferior_ptid variable has two jobs:
- it's the user-selected thread: it's changed by the "thread" command.
Other commands (continue, backtrace, etc) apply to this thread.
- it's the internally-selected thread: it defines the thread GDB is
currently "working" on. For example, implementations of
to_xfer_partial will refer to it to know from which thread to
read/write memory.
Because of this dual usage, if we want to do some operations on a thread
other than the currently selected one, we have to save the current
inferior/thread/frame and restore them when we're done. Failing to do
so would result in an unexpected selection switch for the user.
To improve this, Pedro suggested in [1] to decouple the two concepts. This
is essentially what this patch is trying to do.
A new "user_selection" object is introduced, which contains the selected
inferior/thread/frame from the point of view of the user. Before every
command, we "apply" this selection to the core of GDB to make sure the
internal selection matches the user selection.
There is a single user selection for the whole GDB (named "global
user-selection"), but as was mentioned in the linked thread, it opens
the door to having different selections for different UIs. This means
that each UI would have its own user-selection object, which would be
applied to the core prior to executing commands from this UI.
The global user-selection object only gets modified when we really
intend to change it. It can be because of the thread / -thread-select /
up / down / frame / inferior commands, a breakpoint hit in all-stop, an
inferior exit, etc.
The problem that initially prompted this effort is that the "--thread"
flag of MI commands changes the user-selected thread under the user's
feet. My initial attempt to fix it was to restore the selection after
the MI command execution. However, some cases are hard to get right.
For example:
(thread 1 is currently selected)
-interpreter-exec --thread 2 console "thread 3"
Restoring the selected thread to thread 1 after the MI command execution
wrongfully cancels the switch to thread 3. So it's hard to determine
when we should or shouldn't restore. With the current patch, it works
naturally: the --thread flag doesn't touch the user-selected thread,
only the internal one. The "thread 3" command updates the user
selection.
Another difficulty is to send the right notifications to MI when the
user selection changes. That means to not miss any, but not send too
many either. Getting it somewhat right lead to ugly hacks (see the
command_notifies_uscc_observer function) and even then it's not perfect
(see the kfails in user-selected-context-sync.exp test). With the
proposed method, it's easy to know when the user-selection changes and
send notifications.
With this patch, there are probably a few usage of
make_cleanup_restore_current_thread that are not needed anymore, if they
are only used to restore the user selection. I kept removing them for a
later time though.
In the current state, there are a few minor regressions in the testsuite
(especially some follow-fork stuff I'm not sure how to handle), but the
vast majority of the previously passing tests still pass.
Comments are welcome!
Thanks,
Simon
[1] https://sourceware.org/ml/gdb-patches/2016-08/msg00031.html
Diffstat (limited to 'gdb/gdbthread.h')
-rw-r--r-- | gdb/gdbthread.h | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 06ed78f..47cf125 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -22,6 +22,7 @@ #define GDBTHREAD_H struct symtab; +class user_selection; #include "breakpoint.h" #include "frame.h" @@ -253,7 +254,13 @@ struct thread_info /* If this is > 0, then it means there's code out there that relies on this thread being listed. Don't delete it from the lists even if we detect it exiting. */ - int refcount; + int refcount_; + + void get () + { refcount_++; } + + void put () + { refcount_--; } /* State of GDB control of inferior thread execution. See `struct thread_control_state'. */ @@ -440,8 +447,9 @@ void thread_change_ptid (ptid_t old_ptid, ptid_t new_ptid); /* Iterator function to call a user-provided callback function once for each known thread. */ -typedef int (*thread_callback_func) (struct thread_info *, void *); -extern struct thread_info *iterate_over_threads (thread_callback_func, void *); +typedef std::function<int(struct thread_info *, void*)> thread_callback_func; +extern struct thread_info *iterate_over_threads (thread_callback_func callback, + void *data = nullptr); /* Traverse all threads. */ #define ALL_THREADS(T) \ @@ -469,6 +477,9 @@ extern struct thread_info *iterate_over_threads (thread_callback_func, void *); extern int thread_count (void); +/* Change the user-selected thread. */ +extern bool thread_select (const char *tidstr, bool tid_is_qualified); + /* Switch from one thread to another. Also sets the STOP_PC global. */ extern void switch_to_thread (ptid_t ptid); @@ -508,15 +519,17 @@ extern void set_stop_requested (ptid_t ptid, int stop); The latter also returns true on exited threads, most likelly not what you want. */ -/* Reports if in the frontend's perpective, thread PTID is running. */ +/* Reports if in the frontend's perspective, thread PTID is running. */ extern int is_running (ptid_t ptid); /* Is this thread listed, but known to have exited? We keep it listed (but not visible) until it's safe to delete. */ extern int is_exited (ptid_t ptid); +extern bool is_exited (struct thread_info *thread); -/* In the frontend's perpective, is this thread stopped? */ +/* In the frontend's perspective, is this thread stopped? */ extern int is_stopped (ptid_t ptid); +extern bool is_stopped (struct thread_info *thread); /* Marks thread PTID as executing, or not. If PTID is minus_one_ptid, marks all threads. @@ -636,7 +649,8 @@ extern int show_thread_that_caused_stop (void); /* Print the message for a thread or/and frame selected. */ extern void print_selected_thread_frame (struct ui_out *uiout, - user_selected_what selection); + user_selection *us, + user_selected_what selection); extern struct thread_info *thread_list; |