* cygwin.sc: New file -- linker script for building cygwin DLL.

* Makefile.in: Use linker script to control location of cygheap.
* cygheap.cc (buckets): Make static.
(init_cheap): Remove special iswinnt handling.  Allocate cygheap at a fixed
location.  Display more info when allocation fails.
(cygheap_fixup_in_child): Try harder to move cygheap to correct location.
Display more info when allocation fails.
* fhandler.h (fhandler_socket): Add macros for tracking socket shutdown state.
* net.cc (cygwin_shutdown): Set appropriate shutdown value for future use.
* select.cc (select_stuff::cleanup): New method.
(cygwin_select): Call cleanup explicitly to avoid a race.
(select_stuff:~select_stuff): Call cleanup chain via cleanup method.
(fhandler_socket::select_read): Set *_ready when shutdown has been called on
the socket.
(fhandler_socket::select_write): Ditto.
(fhandler_socket::select_except): Ditto.
* winsup.h: Move NO_COPY to "COMMON" section.
* autoload.cc (wsock_started): Avoid initializing NO_COPY value.
* sigproc.cc: Remove initialization from NO_COPY variables.
(sigproc_init): Initialize sig_loop_wait here, rather than via initialization.
(subproc_init): Initialize proc_loop_wait here, rather than via initialization.
This commit is contained in:
Christopher Faylor
2001-08-31 05:06:14 +00:00
parent 33bc82476e
commit 5835f2cf8d
10 changed files with 236 additions and 46 deletions

View File

@@ -181,22 +181,34 @@ cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
else if ((timeout = sel.wait (r, w, e, ms) < 0))
return -1; /* some kind of error */
sel.cleanup ();
copyfd_set (readfds, r, maxfds);
copyfd_set (writefds, w, maxfds);
copyfd_set (exceptfds, e, maxfds);
return timeout ? 0 : sel.poll (readfds, writefds, exceptfds);
}
/* Cleanup */
select_stuff::~select_stuff ()
/* Call cleanup functions for all inspected fds. Gets rid of any
executing threads. */
void
select_stuff::cleanup ()
{
select_record *s = &start;
select_printf ("calling cleanup routines");
while ((s = s->next))
if (s->cleanup)
s->cleanup (s, this);
{
s->cleanup (s, this);
s->cleanup = NULL;
}
}
/* Destroy all storage associated with select stuff. */
select_stuff::~select_stuff ()
{
cleanup ();
select_record *s = &start;
select_record *snext = start.next;
select_printf ("deleting select records");
@@ -1375,6 +1387,7 @@ fhandler_socket::select_read (select_record *s)
s->verify = verify_true;
s->cleanup = socket_cleanup;
}
s->read_ready = saw_shutdown_read ();
s->read_selected = TRUE;
return s;
}
@@ -1390,6 +1403,7 @@ fhandler_socket::select_write (select_record *s)
s->verify = verify_true;
s->cleanup = socket_cleanup;
}
s->write_ready = saw_shutdown_write ();
s->write_selected = TRUE;
return s;
}
@@ -1405,6 +1419,8 @@ fhandler_socket::select_except (select_record *s)
s->verify = verify_true;
s->cleanup = socket_cleanup;
}
/* FIXME: Is this right? Should these be used as criteria for except? */
s->except_ready = saw_shutdown_write () || saw_shutdown_read ();
s->except_selected = TRUE;
return s;
}