Changeset 27772 in vbox for trunk/src

Timestamp:

Mar 29, 2010 9:42:20 AM (15 years ago)

Author:

vboxsync

Message:

Backed out 59389 (r3/socket.cpp) as it seems to cause some really weird regression for single threaded apps (latperf) besides not being complete and what I had in mind.

File:

• trunk/src/VBox/Runtime/r3/socket.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -121 +121 @@
     /** Magic number (RTTCPSOCKET_MAGIC). */
     uint32_t            u32Magic;
-    /** Usage bit.  This is used to prevent two threads from accessing the
+    /** Usage count.  This is used to prevent two threads from accessing the
      *  handle concurrently. */
     uint32_t volatile   cUsers;
-    /* Number of references to this object */
-    int32_t volatile    cRefs;
     /** The native socket handle. */
     RTSOCKETNATIVE      hNative;
@@ -214 +212 @@
 
 /**
- * Increase reference counter of socket. This is orthogonal to usage bit,
- * as some users of socket may not really modify its state (such as RTSocketSelectOne())
- * or be allowed to perform operation disregarding if socket is in use (such as RTSocketShutdown()).
- *
- * Call rtSocketRelease() when done with socket.
- *
- * @returns @c true if object valid, @c false otherwise.
- * @param   pThis               The socket structure.
- */
-DECLINLINE(bool) rtSocketAddRef(RTSOCKETINT *pThis)
-{
-    if (ASMAtomicReadS32(&pThis->cRefs) < 0)
-        return false;
-
-    ASMAtomicAddS32(&pThis->cRefs, 1);
-    return true;
-}
-
-/**
- * Decrease reference counter of socket.
- *
- * @returns @c true if object valid, @c false otherwise.
- * @param   pThis               The socket structure.
- */
-DECLINLINE(bool) rtSocketRelease(RTSOCKETINT *pThis)
-{
-    if (ASMAtomicReadS32(&pThis->cRefs) <= 0)
-        return false;
-
-    ASMAtomicSubS32(&pThis->cRefs, 1);
-    return true;
-}
-
-/**
- * Declare socket dead.
- *
- * @param   pThis               The socket structure.
- */
-DECLINLINE(void) rtSocketNoMore(RTSOCKETINT *pThis)
-{
-    ASMAtomicWriteS32(&pThis->cRefs, -1);
-}
-
-
-/**
  * Tries to lock the socket for exclusive usage by the calling thread.
  *
@@ -268 +221 @@
 DECLINLINE(bool) rtSocketTryLock(RTSOCKETINT *pThis)
 {
-    bool rv = ASMAtomicCmpXchgU32(&pThis->cUsers, 1, 0);
-    if (rv)
-    {
-        rv = rtSocketAddRef(pThis);
-        AssertReturn(rv, false);
-    }
-
-    return rv;
+    return ASMAtomicCmpXchgU32(&pThis->cUsers, 1, 0);
 }
 
@@ -286 +232 @@
 DECLINLINE(void) rtSocketUnlock(RTSOCKETINT *pThis)
 {
-    bool rv = ASMAtomicCmpXchgU32(&pThis->cUsers, 0, 1);
-    Assert(rv);
-
-    if (rv)
-    {
-        rv = rtSocketRelease(pThis);
-        Assert(rv);
-    }
-}
+    ASMAtomicCmpXchgU32(&pThis->cUsers, 0, 1);
+}
+
 
 /**
@@ -397 +337 @@
         pThis->hNative = NIL_RTSOCKETNATIVE;
     }
-
-    rtSocketNoMore(pThis);
 
     return rc;
@@ -574 +512 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
-    AssertReturn(rtSocketAddRef(pThis), VERR_INVALID_HANDLE);
+    AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
     /*
@@ -602 +540 @@
         rc = rtSocketError();
 
-    rtSocketRelease(pThis);
+    rtSocketUnlock(pThis);
     return rc;
 }
@@ -617 +555 @@
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
     AssertReturn(fRead || fWrite, VERR_INVALID_PARAMETER);
-    AssertReturn(rtSocketAddRef(pThis), VERR_INVALID_HANDLE);
 
     /*
@@ -633 +570 @@
         rc = rtSocketError();
 
-    rtSocketRelease(pThis);
     return rc;
 }