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.
77 lines
2.3 KiB
C
77 lines
2.3 KiB
C
/* MI Command Set - MI Command Parser.
|
|
Copyright (C) 2000-2015 Free Software Foundation, Inc.
|
|
Contributed by Cygnus Solutions (a Red Hat company).
|
|
|
|
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/>. */
|
|
|
|
#ifndef MI_PARSE_H
|
|
#define MI_PARSE_H
|
|
|
|
#include "gdb_sys_time.h"
|
|
|
|
/* MI parser */
|
|
|
|
/* Timestamps for current command and last asynchronous command. */
|
|
struct mi_timestamp {
|
|
struct timeval wallclock;
|
|
struct timeval utime;
|
|
struct timeval stime;
|
|
};
|
|
|
|
enum mi_command_type
|
|
{
|
|
MI_COMMAND, CLI_COMMAND
|
|
};
|
|
|
|
struct mi_parse
|
|
{
|
|
enum mi_command_type op;
|
|
char *command;
|
|
char *token;
|
|
const struct mi_cmd *cmd;
|
|
struct mi_timestamp *cmd_start;
|
|
char *args;
|
|
char **argv;
|
|
int argc;
|
|
int all;
|
|
int thread_group; /* At present, the same as inferior number. */
|
|
int thread;
|
|
int frame;
|
|
|
|
/* The language that should be used to evaluate the MI command.
|
|
Ignored if set to language_unknown. */
|
|
enum language language;
|
|
};
|
|
|
|
/* Attempts to parse CMD returning a ``struct mi_parse''. If CMD is
|
|
invalid, an exception is thrown. For an MI_COMMAND COMMAND, ARGS
|
|
and OP are initialized. Un-initialized fields are zero. *TOKEN is
|
|
set to the token, even if an exception is thrown. It is allocated
|
|
with xmalloc; it must either be freed with xfree, or assigned to
|
|
the TOKEN field of the resultant mi_parse object, to be freed by
|
|
mi_parse_free. */
|
|
|
|
extern struct mi_parse *mi_parse (const char *cmd, char **token);
|
|
|
|
/* Free a command returned by mi_parse_command. */
|
|
|
|
extern void mi_parse_free (struct mi_parse *cmd);
|
|
|
|
/* Parse a string argument into a print_values value. */
|
|
|
|
enum print_values mi_parse_print_values (const char *name);
|
|
|
|
#endif
|