JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* external.cc (fillout_pinfo): If start_time is 0, wait a while before

Browse Source 
returning the pinfo structure.
* fhandler.cc (fhandler_base::open_setup): Convert from inline.
* fhandler.h (fhandler_base::open_setup): Declare.
* fhandler_console.cc (fhandler_console::open_setup): Always call
fhandler_base::open_setup.
* fhandler_tty.cc (fhandler_pty_slave::open_setup): Ditto.
(fhandler_pty_master::open_setup): Ditto.
This commit is contained in:
Christopher Faylor 2013-10-24 15:26:21 +00:00
parent 84e7adad1d
commit 4ae84b2251
6 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,15 @@
2013-10-24 Christopher Faylor <me.cygwin2013@cgf.cx>
* external.cc (fillout_pinfo): If start_time is 0, wait a while before
returning the pinfo structure.
* fhandler.cc (fhandler_base::open_setup): Convert from inline.
* fhandler.h (fhandler_base::open_setup): Declare.
* fhandler_console.cc (fhandler_console::open_setup): Always call
fhandler_base::open_setup.
* fhandler_tty.cc (fhandler_pty_slave::open_setup): Ditto.
(fhandler_pty_master::open_setup): Ditto.
2013-10-24 Corinna Vinschen <corinna@vinschen.de> 2013-10-24 Corinna Vinschen <corinna@vinschen.de>
* devices.in (dev_storage): Map /dev/zero and /dev/full to \Device\Null. * devices.in (dev_storage): Map /dev/zero and /dev/full to \Device\Null.

7
winsup/cygwin/external.cc
View File

@ -76,6 +76,13 @@ fillout_pinfo (pid_t pid, int winpid)
} }
else if (nextpid || p->pid == pid || (winpid && thispid == (DWORD) pid)) else if (nextpid || p->pid == pid || (winpid && thispid == (DWORD) pid))
{ {
/* It is possible that this pinfo is not completely set up yet. Wait
a while if so. */
for (int i = 0; i < 2000; i++)
if (p->start_time)
break;
else
Sleep (1);
ep.ctty = (p->ctty < 0 || iscons_dev (p->ctty)) ? p->ctty : device::minor (p->ctty); ep.ctty = (p->ctty < 0 || iscons_dev (p->ctty)) ? p->ctty : device::minor (p->ctty);
ep.pid = p->pid; ep.pid = p->pid;
ep.ppid = p->ppid; ep.ppid = p->ppid;

5
winsup/cygwin/fhandler.cc
View File

@ -720,6 +720,11 @@ done:
return res; return res;
} }
void
fhandler_base::open_setup (int)
{
}
/* states: /* states:
open buffer in binary mode? Just do the read. open buffer in binary mode? Just do the read.

2
winsup/cygwin/fhandler.h
View File

@ -311,7 +311,7 @@ class fhandler_base
int open_with_arch (int, mode_t = 0); int open_with_arch (int, mode_t = 0);
virtual int open (int, mode_t); virtual int open (int, mode_t);
virtual void open_setup (int flags) { return; } virtual void open_setup (int flags);
void set_unique_id () { NtAllocateLocallyUniqueId ((PLUID) &unique_id); } void set_unique_id () { NtAllocateLocallyUniqueId ((PLUID) &unique_id); }
int close_with_arch (); int close_with_arch ();

1
winsup/cygwin/fhandler_console.cc
View File

@ -895,6 +895,7 @@ fhandler_console::open_setup (int flags)
set_flags ((flags & ~O_TEXT) | O_BINARY); set_flags ((flags & ~O_TEXT) | O_BINARY);
if (myself->set_ctty (this, flags) && !myself->cygstarted) if (myself->set_ctty (this, flags) && !myself->cygstarted)
init_console_handler (true); init_console_handler (true);
fhandler_base::open_setup (flags);
} }
int int

2
winsup/cygwin/fhandler_tty.cc
View File

@ -562,6 +562,7 @@ fhandler_pty_slave::open_setup (int flags)
set_flags ((flags & ~O_TEXT) | O_BINARY); set_flags ((flags & ~O_TEXT) | O_BINARY);
myself->set_ctty (this, flags); myself->set_ctty (this, flags);
report_tty_counts (this, "opened", ""); report_tty_counts (this, "opened", "");
fhandler_base::open_setup (flags);
} }
void void
@ -1247,6 +1248,7 @@ fhandler_pty_master::open_setup (int flags)
char buf[sizeof ("opened pty master for ptyNNNNNNNNNNN")]; char buf[sizeof ("opened pty master for ptyNNNNNNNNNNN")];
__small_sprintf (buf, "opened pty master for pty%d", get_minor ()); __small_sprintf (buf, "opened pty master for pty%d", get_minor ());
report_tty_counts (this, buf, ""); report_tty_counts (this, buf, "");
fhandler_base::open_setup (flags);
} }
off_t off_t