Attachment 166630 Details for Bug 205922 – 2/3

[patch] 2/3

patch-sal_osl_unx_socket.cxx (text/plain), 2.50 KB, created by Matthias Apitz on 2016-02-05 21:03:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Apitz

Created: 2016-02-05 21:03:39 UTC

Size: 2.50 KB

patch

obsolete

>--- sal/osl/unx/socket.cxx.orig	2015-12-11 03:29:35.000000000 +0100
>+++ sal/osl/unx/socket.cxx	2016-02-05 10:42:32.407313000 +0100
>@@ -447,7 +447,7 @@
>     pSocket->m_nLastError = 0;
>     pSocket->m_nRefCount = 1;
> 
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     pSocket->m_bIsAccepting = false;
> #endif
> 
>@@ -1364,13 +1364,13 @@
> {
>     if( pSocket && 0 == osl_atomic_decrement( &(pSocket->m_nRefCount) ) )
>     {
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     if ( pSocket->m_bIsAccepting )
>     {
>         SAL_WARN( "sal.osl", "attempt to destroy socket while accepting" );
>         return;
>     }
>-#endif /* LINUX */
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
>         osl_closeSocket( pSocket );
>         __osl_destroySocketImpl( pSocket );
>     }
>@@ -1393,7 +1393,7 @@
> 
>     pSocket->m_Socket = OSL_INVALID_SOCKET;
> 
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     pSocket->m_bIsInShutdown = true;
> 
>     if ( pSocket->m_bIsAccepting )
>@@ -1437,7 +1437,7 @@
>         }
>         pSocket->m_bIsAccepting = false;
>     }
>-#endif /* LINUX */
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
> 
>     nRet=close(nFD);
>     if ( nRet != 0 )
>@@ -1695,9 +1695,9 @@
>     }
> 
>     pSocket->m_nLastError=0;
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     pSocket->m_bIsAccepting = true;
>-#endif /* LINUX */
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
> 
>     if( ppAddr && *ppAddr )
>     {
>@@ -1718,22 +1718,22 @@
>         int nErrno = errno;
>         SAL_WARN( "sal.osl", "accept connection failed: (" << nErrno << ") " << strerror(nErrno) );
> 
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>         pSocket->m_bIsAccepting = false;
>-#endif /* LINUX */
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
>         return 0;
>     }
> 
>     assert(AddrLen == sizeof(struct sockaddr));
> 
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     if ( pSocket->m_bIsInShutdown )
>     {
>         close(Connection);
>         SAL_WARN( "sal.osl", "close while accept" );
>         return 0;
>     }
>-#endif /* LINUX */
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
> 
>     if(ppAddr)
>     {
>@@ -1758,11 +1758,11 @@
> 
>     pConnectionSockImpl->m_Socket           = Connection;
>     pConnectionSockImpl->m_nLastError       = 0;
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     pConnectionSockImpl->m_bIsAccepting     = false;
> 
>     pSocket->m_bIsAccepting = false;
>-#endif /* LINUX */
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
>     return pConnectionSockImpl;
> }
>

Actions: View | Diff

Attachments on bug 205922: 166629 | 166630 | 166631