438e1e427e
After the last gnulib import (Dec 2012), gnulib upstream started
replacing mingw's 'struct timeval' with a version with 64-bit time_t,
for POSIX compliance:
commit f8e84098084b3b53bc6943a5542af1f607ffd477
Author: Bruno Haible <bruno@clisp.org>
Date: Sat Jan 28 18:12:10 2012 +0100
sys_time: Override 'struct timeval' on some native Windows platforms.
See:
https://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00372.html
However, that results in conflicts with native Winsock2's 'select':
select()'s argument
http://sourceforge.net/p/mingw-w64/mailman/message/29610438/
... and libiberty's timeval-utils.h timeval_add/timeval_sub, at the
least.
We don't really need the POSIX compliance, so this patch prepares us
to simply not use gnulib's 'struct timeval' replacement once a more
recent gnulib is imported, thus preserving the current behavior, by
adding a sys/time.h wrapper header that undefs gnulib's replacements,
and including that everywhere instead.
The SIZE -> OSIZE change is necessary because newer gnulib's
sys/time.h also includes windows.h/winsock2.h, which defines a
conflicting SIZE symbol.
Cross build-tested mingw-w64 32-bit and 64-bit.
Regtested on x86_64 Fedora 20.
gdb/ChangeLog:
2015-08-24 Pedro Alves <palves@redhat.com>
* Makefile.in (HFILES_NO_SRCDIR): Add common/gdb_sys_time.h.
* common/gdb_sys_time.h: New file.
* event-loop.c: Include gdb_sys_time.h instead of sys/time.h.
* gdb_select.h: Likewise.
* gdb_usleep.c: Likewise.
* maint.c: Likewise.
* mi/mi-main.c: Likewise.
* mi/mi-parse.h: Likewise.
* remote-fileio.c: Likewise.
* remote-m32r-sdi.c: Likewise.
* remote.c: Likewise.
* ser-base.c: Likewise.
* ser-pipe.c: Likewise.
* ser-tcp.c: Likewise.
* ser-unix.c: Likewise.
* symfile.c: Likewise.
* symfile.c: Likewise. Rename OSIZE to SIZE throughout.
* target-memory.c: Include gdb_sys_time.h instead of sys/time.h.
* utils.c: Likewise.
gdb/gdbserver/ChangeLog:
2015-08-24 Pedro Alves <palves@redhat.com>
* debug.c: Include gdb_sys_time.h instead of sys/time.h.
* event-loop.c: Likewise.
* remote-utils.c: Likewise.
* tracepoint.c: Likewise.
95 lines
2.8 KiB
C
95 lines
2.8 KiB
C
/* Debugging routines for the remote server for GDB.
|
|
Copyright (C) 2014-2015 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 "gdb_sys_time.h"
|
|
|
|
/* 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, if the
|
|
system has gettimeofday.
|
|
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)
|
|
{
|
|
struct timeval tm;
|
|
|
|
gettimeofday (&tm, NULL);
|
|
|
|
/* If gettimeofday doesn't exist, and as a portability solution it has
|
|
been replaced with, e.g., time, then it doesn't make sense to print
|
|
the microseconds field. Is there a way to check for that? */
|
|
fprintf (stderr, "%ld:%06ld ", (long) tm.tv_sec, (long) tm.tv_usec);
|
|
}
|
|
#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);
|
|
}
|