summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/net.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2000-05-17 05:49:51 +0000
committerChristopher Faylor <me@cgf.cx>2000-05-17 05:49:51 +0000
commit6201d15e3c588fe8b8db8381c329d09745dba908 (patch)
tree526a1cbdaf73b73f123a175292d99d32a11effc3 /winsup/cygwin/net.cc
parent8c1c1f1a431d5af6b3b4d851dc9e9e5d375e9b23 (diff)
downloadcygnal-6201d15e3c588fe8b8db8381c329d09745dba908.tar.gz
cygnal-6201d15e3c588fe8b8db8381c329d09745dba908.tar.bz2
cygnal-6201d15e3c588fe8b8db8381c329d09745dba908.zip
* path.cc (mount_info::cygdrive_posix_path): Don't add trailing slash if
referring to something like c:\. * dcrt0.cc (dll_crt0_1): Move uinfo initialization prior to sig_send initialization to give signal thread a chance to finish. * debug.cc (WFSO): Move to sigproc.cc (WFMO): Ditto. * exceptions.cc (interruptible): Allocate slightly more space for directory just for paranoia's sake. (call_handler): Eliminate nonmain argument. Determine if main thread has set a frame pointer and use it if so. (sig_handle): Eliminate nonmain argument. * net.cc: Record frame information in appropriate routines throughout. * select.cc (select): Ditto. * sigproc.cc: Use sigthread structure to record mainthread id throughout. (sig_send): Record frame information for signal handler. (wait_sig): Reflect argument change in sig_handle. (WFSO): Move here and record frame information for signal handler. (WFMO): Ditto. * sigproc.h: Implement new "sigthread" class. Implement "sigframe" class for manipulating signal frame info. * thread.cc (__pthread_kill): Use standard _kill() function rather than calling sig_send directly. * winsup.h: Eliminate ebp element from signal_dispatch class.
Diffstat (limited to 'winsup/cygwin/net.cc')
-rw-r--r--winsup/cygwin/net.cc15
1 files changed, 14 insertions, 1 deletions
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index bfe4b6554..8e3f9f4de 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -421,6 +421,7 @@ cygwin_sendto (int fd,
{
fhandler_socket *h = (fhandler_socket *) dtable[fd];
sockaddr_in sin;
+ sigframe thisframe (mainthread, 0);
if (get_inet_addr (to, tolen, &sin, &tolen) == 0)
return -1;
@@ -446,6 +447,7 @@ cygwin_recvfrom (int fd,
int *fromlen)
{
fhandler_socket *h = (fhandler_socket *) dtable[fd];
+ sigframe thisframe (mainthread, 0);
debug_printf ("recvfrom %d", h->get_socket ());
@@ -602,6 +604,7 @@ cygwin_connect (int fd,
int res;
fhandler_socket *sock = get (fd);
sockaddr_in sin;
+ sigframe thisframe (mainthread, 0);
if (get_inet_addr (name, namelen, &sin, &namelen) == 0)
return -1;
@@ -714,6 +717,7 @@ int
cygwin_accept (int fd, struct sockaddr *peer, int *len)
{
int res = -1;
+ sigframe thisframe (mainthread, 0);
fhandler_socket *sock = get (fd);
if (sock)
@@ -899,7 +903,7 @@ int
cygwin_shutdown (int fd, int how)
{
int res = -1;
-
+ sigframe thisframe (mainthread, 0);
fhandler_socket *sock = get (fd);
if (sock)
@@ -942,6 +946,7 @@ int
cygwin_recv (int fd, void *buf, int len, unsigned int flags)
{
fhandler_socket *h = (fhandler_socket *) dtable[fd];
+ sigframe thisframe (mainthread, 0);
int res = recv (h->get_socket (), (char *) buf, len, flags);
if (res == SOCKET_ERROR)
@@ -967,6 +972,7 @@ int
cygwin_send (int fd, const void *buf, int len, unsigned int flags)
{
fhandler_socket *h = (fhandler_socket *) dtable[fd];
+ sigframe thisframe (mainthread, 0);
int res = send (h->get_socket (), (const char *) buf, len, flags);
if (res == SOCKET_ERROR)
@@ -1353,6 +1359,7 @@ cygwin_rcmd (char **ahost, unsigned short inport, char *locuser,
{
int res = -1;
SOCKET fd2s;
+ sigframe thisframe (mainthread, 0);
int res_fd = dtable.find_unused_handle ();
if (res_fd == -1)
@@ -1392,6 +1399,7 @@ int
cygwin_rresvport (int *port)
{
int res = -1;
+ sigframe thisframe (mainthread, 0);
int res_fd = dtable.find_unused_handle ();
if (res_fd == -1)
@@ -1420,6 +1428,7 @@ cygwin_rexec (char **ahost, unsigned short inport, char *locuser,
{
int res = -1;
SOCKET fd2s;
+ sigframe thisframe (mainthread, 0);
int res_fd = dtable.find_unused_handle ();
if (res_fd == -1)
@@ -1597,6 +1606,7 @@ fhandler_socket::~fhandler_socket ()
int
fhandler_socket::read (void *ptr, size_t len)
{
+ sigframe thisframe (mainthread);
int res = recv (get_socket (), (char *) ptr, len, 0);
if (res == SOCKET_ERROR)
{
@@ -1608,6 +1618,7 @@ fhandler_socket::read (void *ptr, size_t len)
int
fhandler_socket::write (const void *ptr, size_t len)
{
+ sigframe thisframe (mainthread);
int res = send (get_socket (), (const char *) ptr, len, 0);
if (res == SOCKET_ERROR)
{
@@ -1623,6 +1634,7 @@ int
fhandler_socket::close ()
{
int res = 0;
+ sigframe thisframe (mainthread);
if (closesocket (get_socket ()))
{
@@ -1661,6 +1673,7 @@ fhandler_socket::ioctl (unsigned int cmd, void *p)
int res;
struct ifconf *ifc;
struct ifreq *ifr;
+ sigframe thisframe (mainthread);
switch (cmd)
{