diff options
author | Tom Tromey <tromey@adacore.com> | 2022-12-06 08:05:28 -0700 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2023-02-09 07:21:52 -0700 |
commit | 307733cc0fa864fcb92f4c308a0a27d17552df37 (patch) | |
tree | b32eac4482aed5cc43cef92f65509f7cabd258b6 /gdbsupport | |
parent | c920e5cc604c5b20f9af7c75402eea94aa1e11c6 (diff) | |
download | gdb-307733cc0fa864fcb92f4c308a0a27d17552df37.zip gdb-307733cc0fa864fcb92f4c308a0a27d17552df37.tar.gz gdb-307733cc0fa864fcb92f4c308a0a27d17552df37.tar.bz2 |
Let user C-c when waiting for DWARF index finalization
In PR gdb/29854, Simon pointed out that it would be good to be able to
use C-c when the DWARF cooked index is waiting for finalization. The
idea here is to be able to interrupt a command like "break" -- not to
stop the finalization process itself, which runs in a worker thread.
This patch implements this idea, by changing the index wait functions
to, by default, allow a quit. Polling is done, because there doesn't
seem to be a better way to interrupt a wait on a std::future.
For v2, I realized that the thread compatibility code in thread-pool.h
also needed an update.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29854
Diffstat (limited to 'gdbsupport')
-rw-r--r-- | gdbsupport/thread-pool.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/gdbsupport/thread-pool.h b/gdbsupport/thread-pool.h index 013c6ab..cb8696e 100644 --- a/gdbsupport/thread-pool.h +++ b/gdbsupport/thread-pool.h @@ -23,6 +23,7 @@ #include <queue> #include <vector> #include <functional> +#include <chrono> #if CXX_STD_THREAD #include <thread> #include <mutex> @@ -40,8 +41,19 @@ namespace gdb template<typename T> using future = std::future<T>; +/* ... and the standard future_status. */ +using future_status = std::future_status; + #else /* CXX_STD_THREAD */ +/* A compatibility enum for std::future_status. This is just the + subset needed by gdb. */ +enum class future_status +{ + ready, + timeout, +}; + /* A compatibility wrapper for std::future. Once <thread> and <future> are available in all GCC builds -- should that ever happen -- this can be removed. GCC does not implement threading for @@ -71,6 +83,13 @@ public: void wait () const { } + template<class Rep, class Period> + future_status wait_for (const std::chrono::duration<Rep,Period> &duration) + const + { + return future_status::ready; + } + T get () { return std::move (m_value); } private: @@ -85,6 +104,14 @@ class future<void> { public: void wait () const { } + + template<class Rep, class Period> + future_status wait_for (const std::chrono::duration<Rep,Period> &duration) + const + { + return future_status::ready; + } + void get () { } }; |