Changeset 58290 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Oct 17, 2015 9:52:28 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103485

Message:

RTLocalIpc fixes.

File:

• trunk/src/VBox/Runtime/r3/posix/localipc-posix.cpp (modified) (20 diffs)

trunk/src/VBox/Runtime/r3/posix/localipc-posix.cpp

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#define LOG_GROUP RTLOGGROUP_LOCALIPC
 #include "internal/iprt.h"
 #include <iprt/localipc.h>
@@ -37 +38 @@
 #include <iprt/critsect.h>
 #include <iprt/mem.h>
+#include <iprt/log.h>
 #include <iprt/poll.h>
 #include <iprt/socket.h>
@@ -44 +46 @@
 #include <sys/socket.h>
 #include <sys/un.h>
+#ifndef RT_OS_OS2
+# include <sys/poll.h>
+# include <errno.h>
+#endif
 #include <fcntl.h>
 #include <unistd.h>
@@ -226 +232 @@
                         if (RT_SUCCESS(rc))
                         {
+                            LogFlow(("RTLocalIpcServerCreate: Created %p (%s)\n", pThis, pThis->Name.sun_path));
                             *phServer = pThis;
                             return VINF_SUCCESS;
@@ -239 +246 @@
             rc = VERR_NO_MEMORY;
     }
+    Log(("RTLocalIpcServerCreate: failed, rc=%Rrc\n", rc));
     return rc;
 }
@@ -258 +266 @@
 /**
  * Server instance destructor.
+ *
+ * @returns VINF_OBJECT_DESTROYED
  * @param   pThis               The server instance.
  */
-static void rtLocalIpcServerDtor(PRTLOCALIPCSERVERINT pThis)
+static int rtLocalIpcServerDtor(PRTLOCALIPCSERVERINT pThis)
 {
     pThis->u32Magic = ~RTLOCALIPCSERVER_MAGIC;
-    RTSocketRelease(pThis->hSocket);
+    if (RTSocketRelease(pThis->hSocket) == 0)
+        Log(("rtLocalIpcServerDtor: Released socket\n"));
+    else
+        Log(("rtLocalIpcServerDtor: Socket still has references (impossible?)\n"));
     RTCritSectDelete(&pThis->CritSect);
     unlink(pThis->Name.sun_path);
     RTMemFree(pThis);
+    return VINF_OBJECT_DESTROYED;
 }
 
@@ -273 +287 @@
  * Releases a reference to the server instance.
  *
+ * @returns VINF_SUCCESS if only release, VINF_OBJECT_DESTROYED if destroyed.
  * @param   pThis               The server instance.
  */
-DECLINLINE(void) rtLocalIpcServerRelease(PRTLOCALIPCSERVERINT pThis)
+DECLINLINE(int) rtLocalIpcServerRelease(PRTLOCALIPCSERVERINT pThis)
 {
     uint32_t cRefs = ASMAtomicDecU32(&pThis->cRefs);
     Assert(cRefs < UINT32_MAX / 2);
     if (!cRefs)
-        rtLocalIpcServerDtor(pThis);
+        return rtLocalIpcServerDtor(pThis);
+    return VINF_SUCCESS;
 }
 
@@ -294 +310 @@
     RTCritSectEnter(&pThis->CritSect);
     pThis->fCancelled = true;
+    Log(("rtLocalIpcServerCancel:\n"));
     if (pThis->hListenThread != NIL_RTTHREAD)
         RTThreadPoke(pThis->hListenThread);
@@ -320 +337 @@
 
     rtLocalIpcServerCancel(pThis);
-    rtLocalIpcServerRelease(pThis);
-
-    return VINF_SUCCESS;
+    return rtLocalIpcServerRelease(pThis);
 }
 
@@ -385 +400 @@
                     size_t              cbAddr = sizeof(Addr);
                     RTSOCKET            hClient;
+                    Log(("RTLocalIpcServerListen: Calling rtSocketAccept...\n"));
                     rc = rtSocketAccept(pThis->hSocket, &hClient, (struct sockaddr *)&Addr, &cbAddr);
+                    Log(("RTLocalIpcServerListen: rtSocketAccept returns %Rrc.\n", rc));
 
                     int rc2 = RTCritSectEnter(&pThis->CritSect);
@@ -407 +424 @@
                             rc = RTCritSectInit(&pSession->CritSect);
                             if (RT_SUCCESS(rc))
+                            {
+                                Log(("RTLocalIpcServerListen: Returning new client session: %p\n", pSession));
                                 *phClientSession = pSession;
-                            else
-                                RTMemFree(pSession);
+                                break;
+                            }
+
+                            RTMemFree(pSession);
                         }
                         else
@@ -440 +461 @@
     rtLocalIpcServerRelease(pThis);
 
+    Log(("RTLocalIpcServerListen: returns %Rrc\n", rc));
     return rc;
 }
@@ -491 +513 @@
                         {
                             *phSession = pThis;
+                            Log(("RTLocalIpcSessionConnect: Returns new session %p\n", pThis));
                             return VINF_SUCCESS;
                         }
@@ -502 +525 @@
             rc = VERR_NO_MEMORY;
     }
+    Log(("RTLocalIpcSessionConnect: returns %Rrc\n", rc));
     return rc;
 }
@@ -520 +544 @@
 /**
  * Session instance destructor.
+ *
+ * @returns VINF_OBJECT_DESTROYED
  * @param   pThis               The server instance.
  */
-static void rtLocalIpcSessionDtor(PRTLOCALIPCSESSIONINT pThis)
+static int rtLocalIpcSessionDtor(PRTLOCALIPCSESSIONINT pThis)
 {
     pThis->u32Magic = ~RTLOCALIPCSESSION_MAGIC;
     if (RTSocketRelease(pThis->hSocket) == 0)
-        pThis->hSocket = NIL_RTSOCKET;
+        Log(("rtLocalIpcSessionDtor: Released socket\n"));
+    else
+        Log(("rtLocalIpcSessionDtor: Socket still has references (impossible?)\n"));
     RTCritSectDelete(&pThis->CritSect);
     RTMemFree(pThis);
+    return VINF_OBJECT_DESTROYED;
 }
 
@@ -535 +564 @@
  * Releases a reference to the session instance.
  *
+ * @returns VINF_SUCCESS or VINF_OBJECT_DESTROYED as appropriate.
  * @param   pThis               The session instance.
  */
-DECLINLINE(void) rtLocalIpcSessionRelease(PRTLOCALIPCSESSIONINT pThis)
+DECLINLINE(int) rtLocalIpcSessionRelease(PRTLOCALIPCSESSIONINT pThis)
 {
     uint32_t cRefs = ASMAtomicDecU32(&pThis->cRefs);
     Assert(cRefs < UINT32_MAX / 2);
     if (!cRefs)
-        rtLocalIpcSessionDtor(pThis);
+        return rtLocalIpcSessionDtor(pThis);
+    Log(("rtLocalIpcSessionRelease: %u refs left\n", cRefs));
+    return VINF_SUCCESS;
 }
 
@@ -556 +588 @@
     RTCritSectEnter(&pThis->CritSect);
     pThis->fCancelled = true;
+    Log(("rtLocalIpcSessionCancel:\n"));
     if (pThis->hReadThread != NIL_RTTHREAD)
         RTThreadPoke(pThis->hReadThread);
@@ -581 +614 @@
      */
     AssertReturn(ASMAtomicCmpXchgU32(&pThis->u32Magic, ~RTLOCALIPCSESSION_MAGIC, RTLOCALIPCSESSION_MAGIC), VERR_WRONG_ORDER);
+    Log(("RTLocalIpcSessionClose:\n"));
 
     rtLocalIpcSessionCancel(pThis);
-    rtLocalIpcSessionRelease(pThis);
-
-    return VINF_SUCCESS;
+    return rtLocalIpcSessionRelease(pThis);
 }
 
@@ -606 +638 @@
     return VINF_SUCCESS;
 }
+
+
+#if 0 /* maybe later */
+/**
+ * Checks if the socket has has a HUP condition.
+ *
+ * @returns true if HUP, false if no.
+ * @param   pThis       The IPC session handle.
+ */
+static bool rtLocalIpcPosixHasHup(PRTLOCALIPCSESSIONINT pThis)
+{
+# ifndef RT_OS_OS2
+    struct pollfd PollFd;
+    RT_ZERO(PollFd);
+    PollFd.fd      = RTSocketToNative(pThis->hSocket);
+    PollFd.events  = POLLHUP;
+    return poll(&PollFd, 1, 0) >= 1
+       && (PollFd.revents & POLLHUP);
+
+# else /* RT_OS_OS2: */
+    return false;
+# endif
+}
+#endif
 
 
@@ -779 +835 @@
 
                     uint32_t fEvents = 0;
+#ifdef RT_OS_OS2
+                    /* This doesn't give us any error condition on hangup. */
+                    Log(("RTLocalIpcSessionWaitForData: Calling RTSocketSelectOneEx...\n"));
                     rc = RTSocketSelectOneEx(pThis->hSocket, RTPOLL_EVT_READ | RTPOLL_EVT_ERROR, &fEvents, cMillies);
+                    Log(("RTLocalIpcSessionWaitForData: RTSocketSelectOneEx returns %Rrc, fEvents=%#x\n", rc, fEvents));
+#else
+/** @todo RTSocketPoll */
+                    /* POLLHUP will be set on hangup. */
+                    struct pollfd PollFd;
+                    RT_ZERO(PollFd);
+                    PollFd.fd      = RTSocketToNative(pThis->hSocket);
+                    PollFd.events  = POLLHUP | POLLERR | POLLIN;
+                    Log(("RTLocalIpcSessionWaitForData: Calling poll...\n"));
+                    int cFds = poll(&PollFd, 1, cMillies == RT_INDEFINITE_WAIT ? -1 : cMillies);
+                    if (cFds >= 1)
+                    {
+                        fEvents = PollFd.revents & (POLLHUP | POLLERR) ? RTPOLL_EVT_ERROR : RTPOLL_EVT_READ;
+                        rc = VINF_SUCCESS;
+                    }
+                    else if (rc == 0)
+                        rc = VERR_TIMEOUT;
+                    else
+                        rc = RTErrConvertFromErrno(errno);
+                    Log(("RTLocalIpcSessionWaitForData: poll returns %u (rc=%%d), revents=%#x\n", cFds, rc, PollFd.revents));
+#endif
 
                     int rc2 = RTCritSectEnter(&pThis->CritSect);