Changeset 1829

Timestamp:

Mar 13, 2005, 11:48:31 AM (20 years ago)

Author:

bird

Message:

Socket duplication.

File:

• trunk/src/emx/src/lib/sys/sharedpm.c (modified) (9 diffs, 1 prop)

trunk/src/emx/src/lib/sys/sharedpm.c

@@ -5 +5 @@
  *
  * Copyright (c) 2004 nickk
- * Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>
+ * Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
  *
  *
@@ -129 +129 @@
 static __LIBC_PSPMSIGNAL spmAllocSignal(void);
 static void spmFreeSignal(__LIBC_PSPMSIGNAL pSig);
+static int spmSocketAllocProcess(void);
 static void *spmAlloc(size_t cbSize);
 static void *spmAllocSub(size_t cbSize);
@@ -1135 +1136 @@
     if (iSocket >= 0 && iSocket < gpSPMHdr->pTcpip->cSockets)
     {
-        unsigned    uOldRefs;
-        uint16_t   *pu16 = &gpSPMHdr->pTcpip->acRefs[iSocket];
-        uOldRefs = __atomic_xchg_word(pu16, 1);
-        LIBC_ASSERTM(uOldRefs == 0, "Previous iSocket=%d had %#x refs left.\n", iSocket, uOldRefs);
-        rc = 0;
+        rc = 0; /* shut up! */
+        if (!gpSPMSelf->pacTcpipRefs)
+            rc = spmSocketAllocProcess();
+        if (gpSPMSelf->pacTcpipRefs)
+        {
+            unsigned    uOldRefs;
+            uint16_t   *pu16 = &gpSPMHdr->pTcpip->acRefs[iSocket];
+            uOldRefs = __atomic_xchg_word(pu16, 1);
+            LIBC_ASSERTM(uOldRefs == 0, "Previous iSocket=%d had %#x refs left.\n", iSocket, uOldRefs);
+            pu16 = &gpSPMSelf->pacTcpipRefs[iSocket];
+            uOldRefs = __atomic_xchg_word(pu16, 1);
+            LIBC_ASSERTM(uOldRefs == 0, "Previous iSocket=%d had %#x refs left in the current process.\n", iSocket, uOldRefs);
+            rc = 0;
+        }
     }
     else
@@ -1154 +1164 @@
  *
  * @returns The new reference count.
+ *          The low 16-bits are are the global count.
+ *          The high 15-bits are are the process count.
  * @returns Negative error code (errno.h) on failure.
  * @param   iSocket     socket to reference.
@@ -1163 +1175 @@
     if (iSocket >= 0 && iSocket < gpSPMHdr->pTcpip->cSockets)
     {
-        unsigned    uRefs;
-        uint16_t   *pu16 = &gpSPMHdr->pTcpip->acRefs[iSocket];
-        uRefs = __atomic_increment_word_max(pu16, 0xfff0);
-        if (!(uRefs & 0xffff0000))
-            rc = uRefs;
-        else
-        {
-            LIBC_ASSERTM_FAILED("iSocket=%d is referenced too many times! uRefs=%#x\n", iSocket, uRefs);
-            rc = -EBADF;
+        rc = 0; /* shut up! */
+        if (!gpSPMSelf->pacTcpipRefs)
+            rc = spmSocketAllocProcess();
+        if (gpSPMSelf->pacTcpipRefs)
+        {
+            uint16_t   *pu16 = &gpSPMHdr->pTcpip->acRefs[iSocket];
+            unsigned uRefs = __atomic_increment_word_max(pu16, 0x777f);
+            if (!(uRefs & 0xffff0000))
+            {
+                pu16 = &gpSPMSelf->pacTcpipRefs[iSocket];
+                unsigned uRefsProc = __atomic_increment_word_max(pu16, 0x777f);
+                if (!(uRefs & 0xffff0000))
+                    rc = (uRefsProc << 16) | uRefs;
+                else
+                {
+                    LIBC_ASSERTM_FAILED("iSocket=%d is referenced too many times! uRefs=%#x\n", iSocket, uRefs);
+                    *pu16 = 1;
+                    rc = (1 << 16) | uRefs;
+                }
+            }
+            else
+            {
+                LIBC_ASSERTM_FAILED("iSocket=%d is referenced too many times! uRefs=%#x\n", iSocket, uRefs);
+                rc = -EBADF;
+            }
         }
     }
@@ -1187 +1215 @@
  *
  * @returns The new reference count.
- *          The caller must close the socket if 0 is returned.
+ *          The low 16-bits are are the global count.
+ *          The high 15-bits are are the process count.
  * @returns Negative error code (errno.h) on failure.
  * @param   iSocket     Socket to dereference.
@@ -1197 +1226 @@
     if (iSocket >= 0 && iSocket < gpSPMHdr->pTcpip->cSockets)
     {
-        unsigned    uRefs;
-        uint16_t   *pu16 = &gpSPMHdr->pTcpip->acRefs[iSocket];
-        uRefs = __atomic_decrement_word_min(pu16, 0);
-        if (!(uRefs & 0xffff0000))
-            rc = uRefs;
-        else
-        {
-            LIBC_ASSERTM_FAILED("iSocket=%d already 0! (uRefs=%#x)\n", iSocket, uRefs);
-            rc = -EBADF;
+        rc = 0; /* shut up! */
+        if (!gpSPMSelf->pacTcpipRefs)
+            rc = spmSocketAllocProcess();
+        if (gpSPMSelf->pacTcpipRefs)
+        {
+            uint16_t   *pu16 = &gpSPMHdr->pTcpip->acRefs[iSocket];
+            unsigned uRefs = __atomic_decrement_word_min(pu16, 0);
+            if (!(uRefs & 0xffff0000))
+            {
+                pu16 = &gpSPMSelf->pacTcpipRefs[iSocket];
+                unsigned uRefsProc = __atomic_decrement_word_min(pu16, 0);
+                if (!(uRefs & 0xffff0000))
+                    rc = (uRefsProc << 16) | uRefs;
+                else
+                {
+                    LIBC_ASSERTM_FAILED("iSocket=%d already 0 for process! (uRefsProc=%#x)\n", iSocket, uRefsProc);
+                    *pu16 = 0;
+                    rc = (0 << 16) | uRefs;
+                }
+            }
+            else
+            {
+                LIBC_ASSERTM_FAILED("iSocket=%d already 0! (uRefs=%#x)\n", iSocket, uRefs);
+                rc = -EBADF;
+            }
         }
     }
@@ -1885 +1930 @@
     LIBC_ASSERT(offsetof(__LIBC_SPMPROCESS, cReferences) == 12);
     LIBC_ASSERT(offsetof(__LIBC_SPMPROCESS, pvForkHandle) == 140);
+    LIBC_ASSERT(offsetof(__LIBC_SPMPROCESS, pacTcpipRefs) == 180);
     LIBC_ASSERT(offsetof(__LIBC_SPMPROCESS, cPoolPointers) == 224);
     LIBC_ASSERT(offsetof(__LIBC_SPMPROCESS, pInheritLocked) == 232);
@@ -2906 +2952 @@
 
 /**
+ * Allocates the per process socket reference map.
+ *
+ * @returns 0 on success.
+ * @returns Negative errno on failure.
+ */
+static int spmSocketAllocProcess(void)
+{
+    /*
+     * Obtain the mutex.
+     */
+    __LIBC_SPMXCPTREGREC    RegRec;
+    int rc = spmRequestMutex(&RegRec);
+    if (!rc)
+    {
+        /*
+         * Before allocating the reference map, check if someone got here before us.
+         */
+        if (!gpSPMSelf->pacTcpipRefs)
+        {
+            FS_VAR_SAVE_LOAD();
+            PVOID pv = NULL;
+            rc = DosAllocMem(&pv, 0x10000 * sizeof(uint16_t), PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_ANY);
+            if (rc) /* and once again for the pre fp13 kernels. */
+                rc = DosAllocMem(&pv, 0x10000 * sizeof(uint16_t), PAG_READ | PAG_WRITE | PAG_COMMIT);
+            FS_RESTORE();
+            if (!rc)
+            {
+                /*
+                 * Update the self structure.
+                 */
+                gpSPMSelf->pacTcpipRefs = (uint16_t *)pv;
+            }
+            else
+                rc = -ENOMEM;
+        }
+        spmReleaseMutex(&RegRec);
+    }
+
+    return rc;
+}
+
+
+/**
  * Allocate memory in SPM pool of given size.
  *