X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fevent-loop.c;h=affa00b4aa960ac50e168517e977e23ee4d807bd;hb=5db2718ce48c497e317787caebacd019da59c3b0;hp=f94a6fa135f579cf0cdaf2920d3f663ce1dfcf4b;hpb=3b12939dfc2399200f243851fd55d0e392b64165;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/event-loop.c b/gdb/event-loop.c index f94a6fa135..affa00b4aa 100644 --- a/gdb/event-loop.c +++ b/gdb/event-loop.c @@ -1,5 +1,5 @@ /* Event loop machinery for GDB, the GNU debugger. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2019 Free Software Foundation, Inc. Written by Elena Zannoni of Cygnus Solutions. This file is part of GDB. @@ -20,7 +20,6 @@ #include "defs.h" #include "event-loop.h" #include "event-top.h" -#include "queue.h" #include "ser-event.h" #ifdef HAVE_POLL @@ -32,9 +31,9 @@ #endif #include -#include "gdb_sys_time.h" +#include "gdbsupport/gdb_sys_time.h" #include "gdb_select.h" -#include "observer.h" +#include "observable.h" #include "top.h" /* Tell create_file_handler what events we are interested in. @@ -212,7 +211,7 @@ gdb_notifier; first occasion after WHEN. */ struct gdb_timer { - struct timeval when; + std::chrono::steady_clock::time_point when; int timer_id; struct gdb_timer *next; timer_handler_func *proc; /* Function to call to do the work. */ @@ -366,11 +365,11 @@ start_event_loop (void) { int result = 0; - TRY + try { result = gdb_do_one_event (); } - CATCH (ex, RETURN_MASK_ALL) + catch (const gdb_exception &ex) { exception_print (gdb_stderr, ex); @@ -382,7 +381,7 @@ start_event_loop (void) get around to resetting the prompt, which leaves readline in a messed-up state. Reset it here. */ current_ui->prompt_state = PROMPT_NEEDED; - observer_notify_command_error (); + gdb::observers::command_error.notify (); /* This call looks bizarre, but it is required. If the user entered a command that caused an error, after_char_processing_hook won't be called from @@ -394,7 +393,6 @@ start_event_loop (void) /* Maybe better to set a flag to be checked somewhere as to whether display the prompt or not. */ } - END_CATCH if (result < 0) break; @@ -1097,33 +1095,22 @@ delete_async_event_handler (async_event_handler **async_handler_ptr) *async_handler_ptr = NULL; } -/* Create a timer that will expire in MILLISECONDS from now. When the - timer is ready, PROC will be executed. At creation, the timer is - aded to the timers queue. This queue is kept sorted in order of - increasing timers. Return a handle to the timer struct. */ +/* Create a timer that will expire in MS milliseconds from now. When + the timer is ready, PROC will be executed. At creation, the timer + is added to the timers queue. This queue is kept sorted in order + of increasing timers. Return a handle to the timer struct. */ + int -create_timer (int milliseconds, timer_handler_func * proc, +create_timer (int ms, timer_handler_func *proc, gdb_client_data client_data) { + using namespace std::chrono; struct gdb_timer *timer_ptr, *timer_index, *prev_timer; - struct timeval time_now, delta; - - /* Compute seconds. */ - delta.tv_sec = milliseconds / 1000; - /* Compute microseconds. */ - delta.tv_usec = (milliseconds % 1000) * 1000; - gettimeofday (&time_now, NULL); + steady_clock::time_point time_now = steady_clock::now (); - timer_ptr = XNEW (struct gdb_timer); - timer_ptr->when.tv_sec = time_now.tv_sec + delta.tv_sec; - timer_ptr->when.tv_usec = time_now.tv_usec + delta.tv_usec; - /* Carry? */ - if (timer_ptr->when.tv_usec >= 1000000) - { - timer_ptr->when.tv_sec += 1; - timer_ptr->when.tv_usec -= 1000000; - } + timer_ptr = new gdb_timer (); + timer_ptr->when = time_now + milliseconds (ms); timer_ptr->proc = proc; timer_ptr->client_data = client_data; timer_list.num_timers++; @@ -1136,11 +1123,7 @@ create_timer (int milliseconds, timer_handler_func * proc, timer_index != NULL; timer_index = timer_index->next) { - /* If the seconds field is greater or if it is the same, but the - microsecond field is greater. */ - if ((timer_index->when.tv_sec > timer_ptr->when.tv_sec) - || ((timer_index->when.tv_sec == timer_ptr->when.tv_sec) - && (timer_index->when.tv_usec > timer_ptr->when.tv_usec))) + if (timer_index->when > timer_ptr->when) break; } @@ -1194,47 +1177,56 @@ delete_timer (int id) ; prev_timer->next = timer_ptr->next; } - xfree (timer_ptr); + delete timer_ptr; gdb_notifier.timeout_valid = 0; } +/* Convert a std::chrono duration to a struct timeval. */ + +template +static struct timeval +duration_cast_timeval (const Duration &d) +{ + using namespace std::chrono; + seconds sec = duration_cast (d); + microseconds msec = duration_cast (d - sec); + + struct timeval tv; + tv.tv_sec = sec.count (); + tv.tv_usec = msec.count (); + return tv; +} + /* Update the timeout for the select() or poll(). Returns true if the timer has already expired, false otherwise. */ static int update_wait_timeout (void) { - struct timeval time_now, delta; - if (timer_list.first_timer != NULL) { - gettimeofday (&time_now, NULL); - delta.tv_sec = timer_list.first_timer->when.tv_sec - time_now.tv_sec; - delta.tv_usec = timer_list.first_timer->when.tv_usec - time_now.tv_usec; - /* Borrow? */ - if (delta.tv_usec < 0) - { - delta.tv_sec -= 1; - delta.tv_usec += 1000000; - } + using namespace std::chrono; + steady_clock::time_point time_now = steady_clock::now (); + struct timeval timeout; - /* Cannot simply test if delta.tv_sec is negative because time_t - might be unsigned. */ - if (timer_list.first_timer->when.tv_sec < time_now.tv_sec - || (timer_list.first_timer->when.tv_sec == time_now.tv_sec - && timer_list.first_timer->when.tv_usec < time_now.tv_usec)) + if (timer_list.first_timer->when < time_now) { /* It expired already. */ - delta.tv_sec = 0; - delta.tv_usec = 0; + timeout.tv_sec = 0; + timeout.tv_usec = 0; + } + else + { + steady_clock::duration d = timer_list.first_timer->when - time_now; + timeout = duration_cast_timeval (d); } /* Update the timeout for select/ poll. */ if (use_poll) { #ifdef HAVE_POLL - gdb_notifier.poll_timeout = delta.tv_sec * 1000; + gdb_notifier.poll_timeout = timeout.tv_sec * 1000; #else internal_error (__FILE__, __LINE__, _("use_poll without HAVE_POLL")); @@ -1242,12 +1234,12 @@ update_wait_timeout (void) } else { - gdb_notifier.select_timeout.tv_sec = delta.tv_sec; - gdb_notifier.select_timeout.tv_usec = delta.tv_usec; + gdb_notifier.select_timeout.tv_sec = timeout.tv_sec; + gdb_notifier.select_timeout.tv_usec = timeout.tv_usec; } gdb_notifier.timeout_valid = 1; - if (delta.tv_sec == 0 && delta.tv_usec == 0) + if (timer_list.first_timer->when < time_now) return 1; } else @@ -1276,7 +1268,7 @@ poll_timers (void) /* Delete the timer before calling the callback, not after, in case the callback itself decides to try deleting the timer too. */ - xfree (timer_ptr); + delete timer_ptr; /* Call the procedure associated with that timer. */ (proc) (client_data);