This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: gdbserver with -Werror, win64 socket type
On Friday 27 August 2010 16:09:37, Ozkan Sezer wrote:
> Hi Pedro, thanks for looking into this,
> > s/gdb/gdbserver, and there is actually no such assumption. The mingw
>
> Not exactly correct, see gdb/serial.h, struct serial where fd is int type
> and is used socket() for assigning its data.
Note the "s/gdb/gdbserver".
> ... I get these:
>
> ../../../gdb-cvs/gdb/gdbserver/event-loop.c: In function 'handle_file_event':
> ../../../gdb-cvs/gdb/gdbserver/event-loop.c:476: error: format '%d'
> expects type 'int', but argument 3 has type 'gdb_fildes_t'
> ../../../gdb-cvs/gdb/gdbserver/event-loop.c: In function 'create_file_event':
> ../../../gdb-cvs/gdb/gdbserver/event-loop.c:511: error: assignment
> from incompatible pointer type
Try this version. If this still fails, please use "make -k" so that we
see the most errors as possible in one run.
--
Pedro Alves
---
gdb/gdbserver/event-loop.c | 23 ++++++++++++-----------
gdb/gdbserver/remote-utils.c | 4 ++--
gdb/gdbserver/server.h | 11 +++++++++--
gdb/gdbserver/utils.c | 12 ++++++++++++
4 files changed, 35 insertions(+), 15 deletions(-)
Index: src/gdb/gdbserver/event-loop.c
===================================================================
--- src.orig/gdb/gdbserver/event-loop.c 2010-08-27 15:58:56.000000000 +0100
+++ src/gdb/gdbserver/event-loop.c 2010-08-27 16:28:18.000000000 +0100
@@ -39,7 +39,7 @@
#endif
typedef struct gdb_event gdb_event;
-typedef int (event_handler_func) (int);
+typedef int (event_handler_func) (gdb_fildes_t);
/* Tell create_file_handler what events we are interested in. */
@@ -64,7 +64,7 @@ struct gdb_event
event_handler_func *proc;
/* File descriptor that is ready. */
- int fd;
+ gdb_fildes_t fd;
/* Next in list of events or NULL. */
struct gdb_event *next_event;
@@ -76,7 +76,7 @@ struct gdb_event
typedef struct file_handler
{
/* File descriptor. */
- int fd;
+ gdb_fildes_t fd;
/* Events we want to monitor. */
int mask;
@@ -202,7 +202,7 @@ process_event (void)
{
gdb_event *event_ptr, *prev_ptr;
event_handler_func *proc;
- int fd;
+ gdb_fildes_t fd;
/* Look in the event queue to find an event that is ready
to be processed. */
@@ -332,7 +332,7 @@ process_callback (void)
occurs for FD. CLIENT_DATA is the argument to pass to PROC. */
static void
-create_file_handler (int fd, int mask, handler_func *proc,
+create_file_handler (gdb_fildes_t fd, int mask, handler_func *proc,
gdb_client_data client_data)
{
file_handler *file_ptr;
@@ -382,7 +382,8 @@ create_file_handler (int fd, int mask, h
/* Wrapper function for create_file_handler. */
void
-add_file_handler (int fd, handler_func *proc, gdb_client_data client_data)
+add_file_handler (gdb_fildes_t fd,
+ handler_func *proc, gdb_client_data client_data)
{
create_file_handler (fd, GDB_READABLE | GDB_EXCEPTION, proc, client_data);
}
@@ -391,7 +392,7 @@ add_file_handler (int fd, handler_func *
i.e. we don't care anymore about events on the FD. */
void
-delete_file_handler (int fd)
+delete_file_handler (gdb_fildes_t fd)
{
file_handler *file_ptr, *prev_ptr = NULL;
int i;
@@ -454,7 +455,7 @@ delete_file_handler (int fd)
event in the front of the event queue. */
static int
-handle_file_event (int event_file_desc)
+handle_file_event (gdb_fildes_t event_file_desc)
{
file_handler *file_ptr;
int mask;
@@ -471,8 +472,8 @@ handle_file_event (int event_file_desc)
if (file_ptr->ready_mask & GDB_EXCEPTION)
{
- fprintf (stderr, "Exception condition detected on fd %d\n",
- file_ptr->fd);
+ fprintf (stderr, "Exception condition detected on fd %s\n",
+ pfildes (file_ptr->fd));
file_ptr->error = 1;
}
else
@@ -502,7 +503,7 @@ handle_file_event (int event_file_desc)
associated to FD when it was registered with the event loop. */
static gdb_event *
-create_file_event (int fd)
+create_file_event (gdb_fildes_t fd)
{
gdb_event *file_event_ptr;
Index: src/gdb/gdbserver/remote-utils.c
===================================================================
--- src.orig/gdb/gdbserver/remote-utils.c 2010-08-27 15:58:56.000000000 +0100
+++ src/gdb/gdbserver/remote-utils.c 2010-08-27 16:21:22.000000000 +0100
@@ -107,8 +107,8 @@ struct sym_cache
int remote_debug = 0;
struct ui_file *gdb_stdlog;
-static int remote_desc = INVALID_DESCRIPTOR;
-static int listen_desc = INVALID_DESCRIPTOR;
+static gdb_fildes_t remote_desc = INVALID_DESCRIPTOR;
+static gdb_fildes_t listen_desc = INVALID_DESCRIPTOR;
/* FIXME headerize? */
extern int using_threads;
Index: src/gdb/gdbserver/server.h
===================================================================
--- src.orig/gdb/gdbserver/server.h 2010-08-27 15:58:56.000000000 +0100
+++ src/gdb/gdbserver/server.h 2010-08-27 16:27:02.000000000 +0100
@@ -334,13 +334,19 @@ extern int disable_packet_qfThreadInfo;
extern int multi_process;
extern int non_stop;
+#if USE_WIN32API
+typedef SOCKET gdb_fildes_t;
+#else
+typedef int gdb_fildes_t;
+#endif
+
/* Functions from event-loop.c. */
typedef void *gdb_client_data;
typedef int (handler_func) (int, gdb_client_data);
typedef int (callback_handler_func) (gdb_client_data);
-extern void delete_file_handler (int fd);
-extern void add_file_handler (int fd, handler_func *proc,
+extern void delete_file_handler (gdb_fildes_t fd);
+extern void add_file_handler (gdb_fildes_t fd, handler_func *proc,
gdb_client_data client_data);
extern int append_callback_event (callback_handler_func *proc,
gdb_client_data client_data);
@@ -473,6 +479,7 @@ char *paddress (CORE_ADDR addr);
char *pulongest (ULONGEST u);
char *plongest (LONGEST l);
char *phex_nz (ULONGEST l, int sizeof_l);
+char *pfildes (gdb_fildes_t fd);
#define gdb_assert(expr) \
((void) ((expr) ? 0 : \
Index: src/gdb/gdbserver/utils.c
===================================================================
--- src.orig/gdb/gdbserver/utils.c 2010-07-21 19:13:37.000000000 +0100
+++ src/gdb/gdbserver/utils.c 2010-08-27 16:30:51.000000000 +0100
@@ -370,3 +370,15 @@ paddress (CORE_ADDR addr)
{
return phex_nz (addr, sizeof (CORE_ADDR));
}
+
+/* Convert a file descriptor into a printable string. */
+
+char *
+pfildes (gdb_fildes_t fd)
+{
+#if USE_WIN32API
+ return phex_nz (fd, sizeof (gdb_fildes_t));
+#else
+ return plongest (fd);
+#endif
+}