From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2834 invoked by alias); 6 Apr 2007 06:07:51 -0000 Received: (qmail 2490 invoked by uid 22791); 6 Apr 2007 06:07:49 -0000 X-Spam-Check-By: sourceware.org Received: from main.gmane.org (HELO ciao.gmane.org) (80.91.229.2) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 06 Apr 2007 07:07:45 +0100 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1HZhbg-0005Rz-4P for gdb-patches@sources.redhat.com; Fri, 06 Apr 2007 08:07:32 +0200 Received: from wind.lvk.cs.msu.su ([158.250.17.9]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 06 Apr 2007 08:07:32 +0200 Received: from ghost by wind.lvk.cs.msu.su with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 06 Apr 2007 08:07:32 +0200 To: gdb-patches@sources.redhat.com From: Vladimir Prus Subject: Re: "target remote | " stderr -- try2 Date: Fri, 06 Apr 2007 06:07:00 -0000 Message-ID: References: <200703251735.13369.vladimir@codesourcery.com> <20070329180627.GD28418@caradoc.them.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart2186252.2G09WVgi9E" Content-Transfer-Encoding: 7Bit User-Agent: KNode/0.10.2 X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2007-04/txt/msg00024.txt.bz2 --nextPart2186252.2G09WVgi9E Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8Bit Content-length: 861 Daniel Jacobowitz wrote: > On Sun, Mar 25, 2007 at 04:35:13PM +0300, Vladimir Prus wrote: >> >> This is a revision of my earlier patch to make >> stderr output from program run with >> >> target remote | some_program >> >> to be routed through gdb_stderr, so that MI >> frontend sees that output. >> >> The original patch is at: >> >> http://thread.gmane.org/gmane.comp.gdb.patches/32540 >> >> and this version differs by not having any #ifdef WIN32 inside >> ser-base.c, but instead using new method in 'struct serial_ops', >> that is initialized in ser-mingw.c. >> >> OK? > > This version is OK. Thanks! Doh! It turns out I've attached a patch that won't even compile. Although the difference to the real patch is trivial, for avoidance of doubt I attach the "right" patch and the delta to the previous one. Is this version OK? Sorry, Volodya --nextPart2186252.2G09WVgi9E Content-Type: text/plain; name="ChangeLog" Content-Transfer-Encoding: 8Bit Content-Disposition: attachment; filename="ChangeLog" Content-length: 572 Pass stderr of program run with "target remote |" via gdb_stderr. * serial.c (serial_open): Set error_fd to -1. * serial.h (struct serial): New field error_fd. (struct serial_opts): New field avail. * ser-pipe.c (pipe_open): Create another pair of sockets. Pass stderr to gdb. * ser-mingw.c (pipe_windows_open): Pass PEX_STDERR_TO_PIPE to pex_run. Initialize sd->error_fd. (pipe_avail): New. (_initialize_ser_windows): Hook pipe_avail. * ser-base.c (generic_readchar): Check if there's anything in stderr channel and route that to gdb_stderr. --nextPart2186252.2G09WVgi9E Content-Type: text/x-diff; name="delta.diff" Content-Transfer-Encoding: 8Bit Content-Disposition: attachment; filename="delta.diff" Content-length: 1134 --- gdb/ser-base.c (revision 3592) +++ gdb/ser-base.c (local) @@ -361,6 +361,9 @@ generic_readchar (struct serial *scb, in if (num_bytes != -1) to_read = (num_bytes < to_read) ? num_bytes : to_read; + if (to_read == 0) + break; + s = read (scb->error_fd, &buf, to_read); if (s == -1) break; --- gdb/ser-mingw.c (revision 3592) +++ gdb/ser-mingw.c (local) @@ -875,7 +875,7 @@ pipe_done_wait_handle (struct serial *sc static int pipe_avail (struct serial *scb, int fd) { - HANDLE h = (HANDLE) _get_osfhandle (scb->error_fd); + HANDLE h = (HANDLE) _get_osfhandle (fd); DWORD numBytes; BOOL r = PeekNamedPipe (h, NULL, 0, NULL, &numBytes, NULL); if (r == FALSE) --- gdb/serial.h (revision 3592) +++ gdb/serial.h (local) @@ -255,7 +255,7 @@ struct serial_ops without blocking. Return value of -1 means that the the read will not block even if less that requested bytes are available. */ - int (*avail)(struct serial *scb); + int (*avail)(struct serial *scb, int fd); #ifdef USE_WIN32API /* Return a handle to wait on, indicating available data from SCB --nextPart2186252.2G09WVgi9E Content-Type: text/x-diff; name="remote_stderr_try2__gdb_mainline.diff" Content-Transfer-Encoding: 8Bit Content-Disposition: attachment; filename="remote_stderr_try2__gdb_mainline.diff" Content-length: 6487 --- gdb/serial.c (/mirrors/gdb_mainline) (revision 3593) +++ gdb/serial.c (/patches/gdb/remote_stderr_try2/gdb_mainline) (revision 3593) @@ -211,6 +211,7 @@ serial_open (const char *name) scb->bufcnt = 0; scb->bufp = scb->buf; + scb->error_fd = -1; if (scb->ops->open (scb, open_name)) { --- gdb/serial.h (/mirrors/gdb_mainline) (revision 3593) +++ gdb/serial.h (/patches/gdb/remote_stderr_try2/gdb_mainline) (revision 3593) @@ -191,6 +191,11 @@ extern int serial_debug_p (struct serial struct serial { int fd; /* File descriptor */ + /* File descriptor for a separate error stream that should be + immediately forwarded to gdb_stderr. This may be -1. + If != -1, this descriptor should be non-blocking or + ops->avail should be non-NULL. */ + int error_fd; struct serial_ops *ops; /* Function vector */ void *state; /* Local context info for open FD */ serial_ttystate ttystate; /* Not used (yet) */ @@ -246,6 +251,11 @@ struct serial_ops /* Perform a low-level write operation, writing (at most) COUNT bytes from BUF. */ int (*write_prim)(struct serial *scb, const void *buf, size_t count); + /* Return that number of bytes that can be read from FD + without blocking. Return value of -1 means that the + the read will not block even if less that requested bytes + are available. */ + int (*avail)(struct serial *scb, int fd); #ifdef USE_WIN32API /* Return a handle to wait on, indicating available data from SCB --- gdb/ser-pipe.c (/mirrors/gdb_mainline) (revision 3593) +++ gdb/ser-pipe.c (/patches/gdb/remote_stderr_try2/gdb_mainline) (revision 3593) @@ -62,9 +62,12 @@ pipe_open (struct serial *scb, const cha * published in UNIX Review, Vol. 6, No. 8. */ int pdes[2]; + int err_pdes[2]; int pid; if (socketpair (AF_UNIX, SOCK_STREAM, 0, pdes) < 0) return -1; + if (socketpair (AF_UNIX, SOCK_STREAM, 0, err_pdes) < 0) + return -1; /* Create the child process to run the command in. Note that the apparent call to vfork() below *might* actually be a call to @@ -77,9 +80,18 @@ pipe_open (struct serial *scb, const cha { close (pdes[0]); close (pdes[1]); + close (err_pdes[0]); + close (err_pdes[1]); return -1; } + if (fcntl (err_pdes[0], F_SETFL, O_NONBLOCK) == -1) + { + close (err_pdes[0]); + close (err_pdes[1]); + err_pdes[0] = err_pdes[1] = -1; + } + /* Child. */ if (pid == 0) { @@ -91,6 +103,13 @@ pipe_open (struct serial *scb, const cha close (pdes[1]); } dup2 (STDOUT_FILENO, STDIN_FILENO); + + if (err_pdes[0] != -1) + { + close (err_pdes[0]); + dup2 (err_pdes[1], STDERR_FILENO); + close (err_pdes[1]); + } #if 0 /* close any stray FD's - FIXME - how? */ /* POSIX.2 B.3.2.2 "popen() shall ensure that any streams @@ -109,6 +128,7 @@ pipe_open (struct serial *scb, const cha state = XMALLOC (struct pipe_state); state->pid = pid; scb->fd = pdes[0]; + scb->error_fd = err_pdes[0]; scb->state = state; /* If we don't do this, GDB simply exits when the remote side dies. */ --- gdb/ser-base.c (/mirrors/gdb_mainline) (revision 3593) +++ gdb/ser-base.c (/patches/gdb/remote_stderr_try2/gdb_mainline) (revision 3593) @@ -343,6 +343,48 @@ generic_readchar (struct serial *scb, in } } } + /* Read any error output we might have. */ + if (scb->error_fd != -1) + { + ssize_t s; + char buf[81]; + + for (;;) + { + char *current; + char *newline; + int to_read = 80; + + int num_bytes = -1; + if (scb->ops->avail) + num_bytes = (scb->ops->avail)(scb, scb->error_fd); + if (num_bytes != -1) + to_read = (num_bytes < to_read) ? num_bytes : to_read; + + if (to_read == 0) + break; + + s = read (scb->error_fd, &buf, to_read); + if (s == -1) + break; + + /* In theory, embedded newlines are not a problem. + But for MI, we want each output line to have just + one newline for legibility. So output things + in newline chunks. */ + buf[s] = '\0'; + current = buf; + while ((newline = strstr (current, "\n")) != NULL) + { + *newline = '\0'; + fputs_unfiltered (current, gdb_stderr); + fputs_unfiltered ("\n", gdb_stderr); + current = newline + 1; + } + fputs_unfiltered (current, gdb_stderr); + } + } + reschedule (scb); return ch; } --- gdb/ser-mingw.c (/mirrors/gdb_mainline) (revision 3593) +++ gdb/ser-mingw.c (/patches/gdb/remote_stderr_try2/gdb_mainline) (revision 3593) @@ -697,6 +697,7 @@ static int pipe_windows_open (struct serial *scb, const char *name) { struct pipe_state *ps; + FILE *pex_stderr; char **argv = buildargv (name); struct cleanup *back_to = make_cleanup_freeargv (argv); @@ -717,7 +718,8 @@ pipe_windows_open (struct serial *scb, c { int err; const char *err_msg - = pex_run (ps->pex, PEX_SEARCH | PEX_BINARY_INPUT | PEX_BINARY_OUTPUT, + = pex_run (ps->pex, PEX_SEARCH | PEX_BINARY_INPUT | PEX_BINARY_OUTPUT + | PEX_STDERR_TO_PIPE, argv[0], argv, NULL, NULL, &err); @@ -739,8 +741,13 @@ pipe_windows_open (struct serial *scb, c ps->output = pex_read_output (ps->pex, 1); if (! ps->output) goto fail; - scb->fd = fileno (ps->output); + + pex_stderr = pex_read_err (ps->pex, 1); + if (! pex_stderr) + goto fail; + scb->error_fd = fileno (pex_stderr); + scb->state = (void *) ps; discard_cleanups (back_to); @@ -865,6 +872,17 @@ pipe_done_wait_handle (struct serial *sc WaitForSingleObject (ps->wait.have_stopped, INFINITE); } +static int +pipe_avail (struct serial *scb, int fd) +{ + HANDLE h = (HANDLE) _get_osfhandle (fd); + DWORD numBytes; + BOOL r = PeekNamedPipe (h, NULL, 0, NULL, &numBytes, NULL); + if (r == FALSE) + numBytes = 0; + return numBytes; +} + struct net_windows_state { HANDLE read_event; @@ -1164,6 +1182,7 @@ _initialize_ser_windows (void) ops->write_prim = pipe_windows_write; ops->wait_handle = pipe_wait_handle; ops->done_wait_handle = pipe_done_wait_handle; + ops->avail = pipe_avail; serial_add_interface (ops); Property changes on: ___________________________________________________________________ Name: csl:base +/all/mirrors/gdb_mainline Name: svk:merge +e7755896-6108-0410-9592-8049d3e74e28:/mirrors/gdb/trunk:166548 --nextPart2186252.2G09WVgi9E--