drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate trailing whitespace in some files. 

* dll_init.cc (dll_list::alloc): Reset 'p' in forked process.
* select.cc (select_stuff::wait): Move cleanup() closer to WFMO to minimize
unavoidable (?) race.
This commit is contained in:
Christopher Faylor 2011-05-02 15:28:35 +00:00
parent 138f3e0cbd
commit 8978381c2a
8 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2011-05-02 Christopher Faylor <me.cygwin2011@cgf.cx>
* dll_init.cc (dll_list::alloc): Reset 'p' in forked process.
* select.cc (select_stuff::wait): Move cleanup() closer to WFMO to
minimize unavoidable (?) race.
2011-05-02 Corinna Vinschen <corinna@vinschen.de> 2011-05-02 Corinna Vinschen <corinna@vinschen.de>
* fhandler_serial.cc (fhandler_serial::raw_read): Add restartability * fhandler_serial.cc (fhandler_serial::raw_read): Add restartability

1
winsup/cygwin/dll_init.cc
View File

@ -126,6 +126,7 @@ dll_list::alloc (HINSTANCE h, per_process *p, dll_type type)
{ {
if (!in_forkee) if (!in_forkee)
d->count++; /* Yes. Bump the usage count. */ d->count++; /* Yes. Bump the usage count. */
d->p = p;
} }
else else
{ {

2
winsup/cygwin/pseudo-reloc.cc
View File

@ -1,4 +1,4 @@
/* pseudo-reloc.c /* pseudo-reloc.cc
Contributed by Egor Duda <deo@logos-m.ru> Contributed by Egor Duda <deo@logos-m.ru>
Modified by addition of runtime_pseudo_reloc version 2 Modified by addition of runtime_pseudo_reloc version 2

9
winsup/cygwin/select.cc
View File

@ -146,7 +146,6 @@ cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
else if ((timeout = sel.wait (r, w, e, ms) < 0)) else if ((timeout = sel.wait (r, w, e, ms) < 0))
return -1; /* some kind of error */ return -1; /* some kind of error */
sel.cleanup ();
copyfd_set (readfds, r, maxfds); copyfd_set (readfds, r, maxfds);
copyfd_set (writefds, w, maxfds); copyfd_set (writefds, w, maxfds);
copyfd_set (exceptfds, e, maxfds); copyfd_set (exceptfds, e, maxfds);
@ -301,15 +300,18 @@ select_stuff::wait (fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
switch (wait_ret) switch (wait_ret)
{ {
case WAIT_OBJECT_0: case WAIT_OBJECT_0:
cleanup ();
select_printf ("signal received"); select_printf ("signal received");
set_sig_errno (EINTR); set_sig_errno (EINTR);
return -1; return -1;
case WAIT_FAILED: case WAIT_FAILED:
cleanup ();
system_printf ("WaitForMultipleObjects failed"); system_printf ("WaitForMultipleObjects failed");
s = &start; s = &start;
s->set_select_errno (); s->set_select_errno ();
return -1; return -1;
case WAIT_TIMEOUT: case WAIT_TIMEOUT:
cleanup ();
select_printf ("timed out"); select_printf ("timed out");
res = 1; res = 1;
goto out; goto out;
@ -325,6 +327,7 @@ select_stuff::wait (fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
while ((s = s->next)) while ((s = s->next))
if (s->saw_error ()) if (s->saw_error ())
{ {
cleanup ();
set_errno (s->saw_error ()); set_errno (s->saw_error ());
return -1; /* Somebody detected an error */ return -1; /* Somebody detected an error */
} }
@ -334,7 +337,10 @@ select_stuff::wait (fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
select_printf ("gotone %d", gotone); select_printf ("gotone %d", gotone);
if (gotone) if (gotone)
{
cleanup ();
goto out; goto out;
}
if (ms == INFINITE) if (ms == INFINITE)
{ {
@ -346,6 +352,7 @@ select_stuff::wait (fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
LONGLONG now = gtod.msecs (); LONGLONG now = gtod.msecs ();
if (now > (start_time + ms)) if (now > (start_time + ms))
{ {
cleanup ();
select_printf ("timed out after verification"); select_printf ("timed out after verification");
goto out; goto out;
} }