* fhandler_socket.cc (fhandler_socket::check_peer_secret_event):

	Fix strace message.
	(fhandler_socket::connect): Remove sigframe.
	(fhandler_socket::accept): Ditto.
	(fhandler_socket::getsockname): Ditto.
	(fhandler_socket::getpeername): Ditto.
	(fhandler_socket::recvfrom): Ditto.
	(fhandler_socket::recvmsg): Ditto.
	(fhandler_socket::sendto): Ditto.
	(fhandler_socket::sendmsg): Ditto.
	(fhandler_socket::close): Ditto.
	(fhandler_socket::ioctl): Ditto.
	* ioctl.cc (ioctl): Add sigframe.
	*net.cc (cygwin_sendto): Ditto.
	(cygwin_recvfrom): Ditto.
	(cygwin_recvfrom): Ditto.
	(cygwin_connect): Ditto.
	(cygwin_shutdown): Ditto.
	(cygwin_getpeername): Ditto.
	(cygwin_accept): Ditto.  Improve strace message.
	(cygwin_getsockname): Ditto.  Ditto.
	(cygwin_recvmsg): Ditto.  Ditto.
	(cygwin_sendmsg): Fix strace message.

1 files changed, 1 insertions, 21 deletions

diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index ded5935a1..2057a9eec 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -203,7 +203,7 @@ fhandler_socket::check_peer_secret_event (struct sockaddr_in* peer, int* secret)
   ev = CreateEvent (&sec_all_nih, FALSE, FALSE, buf);
   if (!ev && GetLastError () == ERROR_ALREADY_EXISTS)
     {
-      debug_printf ("%s event already exist");
+      debug_printf ("event \"%s\" already exists", buf);
       ev = OpenEvent (EVENT_ALL_ACCESS, FALSE, buf);
     }
 
@@ -406,8 +406,6 @@ fhandler_socket::connect (const struct sockaddr *name, int namelen)
   sockaddr_in sin;
   int secret [4];
 
-  sigframe thisframe (mainthread);
-
   if (!get_inet_addr (name, namelen, &sin, &namelen, secret))
     return -1;
 
@@ -486,8 +484,6 @@ fhandler_socket::accept (struct sockaddr *peer, int *len)
   BOOL secret_check_failed = FALSE;
   BOOL in_progress = FALSE;
 
-  sigframe thisframe (mainthread);
-
   /* Allows NULL peer and len parameters. */
   struct sockaddr_in peer_dummy;
   int len_dummy;
@@ -624,8 +620,6 @@ fhandler_socket::getsockname (struct sockaddr *name, int *namelen)
 {
   int res = -1;
 
-  sigframe thisframe (mainthread);
-
   if (get_addr_family () == AF_LOCAL)
     {
       struct sockaddr_un *sun = (struct sockaddr_un *) name;
@@ -659,8 +653,6 @@ fhandler_socket::getsockname (struct sockaddr *name, int *namelen)
 int
 fhandler_socket::getpeername (struct sockaddr *name, int *namelen)
 {
-  sigframe thisframe (mainthread);
-
   int res = ::getpeername (get_socket (), name, namelen);
   if (res)
     set_winsock_errno ();
@@ -682,8 +674,6 @@ fhandler_socket::recvfrom (void *ptr, size_t len, int flags,
   wsock_event wsock_evt;
   LPWSAOVERLAPPED ovr;
 
-  sigframe thisframe (mainthread);
-
   if (is_nonblocking () || !(ovr = wsock_evt.prepare ()))
     {
       debug_printf ("Fallback to winsock 1 recvfrom call");
@@ -723,8 +713,6 @@ fhandler_socket::recvmsg (struct msghdr *msg, int flags)
   char *buf, *p;
   struct iovec *iov = msg->msg_iov;
 
-  sigframe thisframe (mainthread);
-
   if (get_addr_family () == AF_LOCAL)
     {
       /* On AF_LOCAL sockets the (fixed-size) name of the shared memory
@@ -771,8 +759,6 @@ fhandler_socket::sendto (const void *ptr, size_t len, int flags,
   LPWSAOVERLAPPED ovr;
   sockaddr_in sin;
 
-  sigframe thisframe (mainthread);
-
   if (to && !get_inet_addr (to, tolen, &sin, &tolen))
     return -1;
 
@@ -844,8 +830,6 @@ fhandler_socket::sendmsg (const struct msghdr *msg, int flags)
 int
 fhandler_socket::shutdown (int how)
 {
-  sigframe thisframe (mainthread);
-
   int res = ::shutdown (get_socket (), how);
 
   if (res)
@@ -872,8 +856,6 @@ fhandler_socket::close ()
 {
   int res = 0;
 
-  sigframe thisframe (mainthread);
-
   /* HACK to allow a graceful shutdown even if shutdown() hasn't been
      called by the application. Note that this isn't the ultimate
      solution but it helps in many cases. */
@@ -916,8 +898,6 @@ fhandler_socket::ioctl (unsigned int cmd, void *p)
   struct ifconf ifc, *ifcp;
   struct ifreq *ifr, *ifrp;
 
-  sigframe thisframe (mainthread);
-
   switch (cmd)
     {
     case SIOCGIFCONF: