dcb07cfa15
This patch fixes a few problems with GDB's time handling. #1 - It avoids problems with gnulib's C++ namespace support On MinGW, the struct timeval that should be passed to gnulib's gettimeofday replacement is incompatible with libiberty's timeval_sub/timeval_add. That's because gnulib also replaces "struct timeval" with its own definition, while libiberty expects the system's. E.g., in code like this: gettimeofday (&prompt_ended, NULL); timeval_sub (&prompt_delta, &prompt_ended, &prompt_started); timeval_add (&prompt_for_continue_wait_time, &prompt_for_continue_wait_time, &prompt_delta); That's currently handled in gdb by not using gnulib's gettimeofday at all (see common/gdb_sys_time.h), but that #undef hack won't work with if/when we enable gnulib's C++ namespace support, because that mode adds compile time warnings for uses of ::gettimeofday, which are hard errors with -Werror. #2 - But there's an elephant in the room: gettimeofday is not monotonic... We're using it to: a) check how long functions take, for performance analysis b) compute when in the future to fire events in the event-loop c) print debug timestamps But that's exactly what gettimeofday is NOT meant for. Straight from the man page: ~~~ The time returned by gettimeofday() is affected by discontinuous jumps in the system time (e.g., if the system administrator manually changes the system time). If you need a monotonically increasing clock, see clock_gettime(2). ~~~ std::chrono (part of the C++11 standard library) has a monotonic clock exactly for such purposes (std::chrono::steady_clock). This commit switches to use that instead of gettimeofday, fixing all the issues mentioned above. gdb/ChangeLog: 2016-11-23 Pedro Alves <palves@redhat.com> * Makefile.in (SFILES): Add common/run-time-clock.c. (HFILES_NO_SRCDIR): Add common/run-time-clock.h. (COMMON_OBS): Add run-time-clock.o. * common/run-time-clock.c, common/run-time-clock.h: New files. * defs.h (struct timeval, print_transfer_performance): Delete declarations. * event-loop.c (struct gdb_timer) <when>: Now a std::chrono::steady_clock::time_point. (create_timer): use std::chrono::steady_clock instead of gettimeofday. Use new instead of malloc. (delete_timer): Use delete instead of xfree. (duration_cast_timeval): New. (update_wait_timeout): Use std::chrono::steady_clock instead of gettimeofday. * maint.c: Include <chrono> instead of "gdb_sys_time.h", <time.h> and "timeval-utils.h". (scoped_command_stats::~scoped_command_stats) (scoped_command_stats::scoped_command_stats): Use std::chrono::steady_clock instead of gettimeofday. Use user_cpu_time_clock instead of get_run_time. * maint.h: Include "run-time-clock.h" and <chrono>. (scoped_command_stats): <m_start_cpu_time>: Now a user_cpu_time_clock::time_point. <m_start_wall_time>: Now a std::chrono::steady_clock::time_point. * mi/mi-main.c: Include "run-time-clock.h" and <chrono> instead of "gdb_sys_time.h" and <sys/resource.h>. (rusage): Delete. (mi_execute_command): Use new instead of XNEW. (mi_load_progress): Use std::chrono::steady_clock instead of gettimeofday. (timestamp): Rewrite in terms of std::chrono::steady_clock, user_cpu_time_clock and system_cpu_time_clock. (timeval_diff): Delete. (print_diff): Adjust to use std::chrono::steady_clock, user_cpu_time_clock and system_cpu_time_clock. * mi/mi-parse.h: Include "run-time-clock.h" and <chrono> instead of "gdb_sys_time.h". (struct mi_timestamp): Change fields types to std::chrono::steady_clock::time_point, user_cpu_time_clock::time and system_cpu_time_clock::time_point, instead of struct timeval. * symfile.c: Include <chrono> instead of <time.h> and "gdb_sys_time.h". (struct time_range): New. (generic_load): Use std::chrono::steady_clock instead of gettimeofday. (print_transfer_performance): Replace timeval parameters with a std::chrono::steady_clock::duration parameter. Adjust. * utils.c: Include <chrono> instead of "timeval-utils.h", "gdb_sys_time.h", and <time.h>. (prompt_for_continue_wait_time): Now a std::chrono::steady_clock::duration. (defaulted_query, prompt_for_continue): Use std::chrono::steady_clock instead of gettimeofday/timeval_sub/timeval_add. (reset_prompt_for_continue_wait_time): Use std::chrono::steady_clock::duration instead of struct timeval. (get_prompt_for_continue_wait_time): Return a std::chrono::steady_clock::duration instead of struct timeval. (vfprintf_unfiltered): Use std::chrono::steady_clock instead of gettimeofday. Use std::string. Use '.' instead of ':'. * utils.h: Include <chrono>. (get_prompt_for_continue_wait_time): Return a std::chrono::steady_clock::duration instead of struct timeval. gdb/gdbserver/ChangeLog: 2016-11-23 Pedro Alves <palves@redhat.com> * debug.c: Include <chrono> instead of "gdb_sys_time.h". (debug_vprintf): Use std::chrono::steady_clock instead of gettimeofday. Use '.' instead of ':'. * tracepoint.c: Include <chrono> instead of "gdb_sys_time.h". (get_timestamp): Use std::chrono::steady_clock instead of gettimeofday.
93 lines
2.8 KiB
C
93 lines
2.8 KiB
C
/* Debugging routines for the remote server for GDB.
|
|
Copyright (C) 2014-2016 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "server.h"
|
|
#include <chrono>
|
|
|
|
/* Enable miscellaneous debugging output. The name is historical - it
|
|
was originally used to debug LinuxThreads support. */
|
|
int debug_threads;
|
|
|
|
/* Include timestamps in debugging output. */
|
|
int debug_timestamp;
|
|
|
|
/* Print a debugging message.
|
|
If the text begins a new line it is preceded by a timestamp.
|
|
We don't get fancy with newline checking, we just check whether the
|
|
previous call ended with "\n". */
|
|
|
|
void
|
|
debug_vprintf (const char *format, va_list ap)
|
|
{
|
|
#if !defined (IN_PROCESS_AGENT)
|
|
/* N.B. Not thread safe, and can't be used, as is, with IPA. */
|
|
static int new_line = 1;
|
|
|
|
if (debug_timestamp && new_line)
|
|
{
|
|
using namespace std::chrono;
|
|
|
|
steady_clock::time_point now = steady_clock::now ();
|
|
seconds s = duration_cast<seconds> (now.time_since_epoch ());
|
|
microseconds us = duration_cast<microseconds> (now.time_since_epoch ()) - s;
|
|
|
|
fprintf (stderr, "%ld.%06ld ", (long) s.count (), (long) us.count ());
|
|
}
|
|
#endif
|
|
|
|
vfprintf (stderr, format, ap);
|
|
|
|
#if !defined (IN_PROCESS_AGENT)
|
|
if (*format)
|
|
new_line = format[strlen (format) - 1] == '\n';
|
|
#endif
|
|
}
|
|
|
|
/* Flush debugging output.
|
|
This is called, for example, when starting an inferior to ensure all debug
|
|
output thus far appears before any inferior output. */
|
|
|
|
void
|
|
debug_flush (void)
|
|
{
|
|
fflush (stderr);
|
|
}
|
|
|
|
/* Notify the user that the code is entering FUNCTION_NAME.
|
|
FUNCTION_NAME is the name of the calling function, or NULL if unknown.
|
|
|
|
This is intended to be called via the debug_enter macro. */
|
|
|
|
void
|
|
do_debug_enter (const char *function_name)
|
|
{
|
|
if (function_name != NULL)
|
|
debug_printf (">>>> entering %s\n", function_name);
|
|
}
|
|
|
|
/* Notify the user that the code is exiting FUNCTION_NAME.
|
|
FUNCTION_NAME is the name of the calling function, or NULL if unknown.
|
|
|
|
This is intended to be called via the debug_exit macro. */
|
|
|
|
void
|
|
do_debug_exit (const char *function_name)
|
|
{
|
|
if (function_name != NULL)
|
|
debug_printf ("<<<< exiting %s\n", function_name);
|
|
}
|