Attachment 167143 Details for Bug 207301 – patch-main_sal_osl_unx_pipe.c

patch-main_sal_osl_unx_pipe.c

patch-main_sal_osl_unx_pipe.c (text/x-csrc), 1.65 KB, created by Matthias Apitz on 2016-02-18 10:11:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Apitz

Created: 2016-02-18 10:11:15 UTC

Size: 1.65 KB

patch

obsolete

>--- sal/osl/unx/pipe.c.orig	2014-09-19 19:58:51.000000000 +0200
>+++ sal/osl/unx/pipe.c	2016-02-10 08:39:24.253595000 +0100
>@@ -115,7 +115,7 @@
> 	pPipeImpl = (oslPipe)calloc(1, sizeof(struct oslPipeImpl));
> 	pPipeImpl->m_nRefCount =1;
> 	pPipeImpl->m_bClosed = sal_False;
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
> 	pPipeImpl->m_bIsInShutdown = sal_False;
> 	pPipeImpl->m_bIsAccepting = sal_False;
> #endif
>@@ -321,7 +321,7 @@
> void SAL_CALL osl_closePipe( oslPipe pPipe )
> {
>     int nRet;
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     size_t	   len;
> 	struct sockaddr_un addr;
>     int fd;
>@@ -344,7 +344,7 @@
> 	  Thread does not return from accept on linux, so
> 	  connect to the accepting pipe
> 	 */
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     if ( pPipe->m_bIsAccepting )
>     {
>         pPipe->m_bIsInShutdown = sal_True;
>@@ -367,7 +367,7 @@
> #endif /* OSL_DEBUG_LEVEL */
>         close(fd);
>     }
>-#endif /* LINUX */
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
> 
> 
> 	nRet = shutdown(ConnFD, 2);
>@@ -408,13 +408,13 @@
> 
> 	OSL_ASSERT(strlen(pPipe->m_Name) > 0);
> 
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     pPipe->m_bIsAccepting = sal_True;
> #endif
> 
>     s = accept(pPipe->m_Socket, NULL, NULL);
> 
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     pPipe->m_bIsAccepting = sal_False;
> #endif
> 
>@@ -424,13 +424,13 @@
> 		return NULL;
> 	}
> 
>-#if defined(LINUX)
>+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
>     if ( pPipe->m_bIsInShutdown  )
>     {
>         close(s);
>         return NULL;
>     }
>-#endif /* LINUX */
>+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
>     else
> 	{
> 		/* alloc memory */

Actions: View

Attachments on bug 207301: 167143 | 167144