Changeset 16443 in vbox for trunk/src/VBox/Devices/Network/slirp/socket.c

Timestamp:

Jan 31, 2009 7:16:03 AM (16 years ago)

Author:

vboxsync

Message:

NAT:MT

1. slirp queue inroduced
2. main points of thread interactions are saved with critical sections
3. slirp polling routine and timers communicates with NAT guest IO thread via queue

TODO: not works well, not compilable on Unixes.

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (15 diffs)

trunk/src/VBox/Devices/Network/slirp/socket.c

@@ -60 +60 @@
     struct socket *so;
 
-    so = (struct socket *)RTMemAlloc(sizeof(struct socket));
+    so = (struct socket *)RTMemAllocZ(sizeof(struct socket));
     if(so)
     {
@@ -89 +89 @@
     if(so->so_next && so->so_prev)
         remque(pData, so);  /* crashes if so is not in a queue */
-
+    so->so_state = SS_NOFDREF; /* for debugging purposes */
     SOCKET_UNLOCK(so);
     SOCKET_LOCK_DESTROY(so);
 
     RTMemFree(so);
-}
+    so = NULL;
+}
+
+#ifdef VBOX_WITH_SLIRP_MT
+void
+soread_queue(PNATState pData, struct socket *so, int fCloseIfNothingRead, int *ret)
+{
+    *ret = soread(pData, so, fCloseIfNothingRead);
+}
+#endif
 
 /*
@@ -109 +118 @@
     struct iovec iov[2];
     int mss = so->so_tcpcb->t_maxseg;
+    Log2(("%s:%d soread before lock\n", __FUNCTION__, __LINE__));
+    QSOCKET_LOCK(tcb);
+    SOCKET_LOCK(so);
+    QSOCKET_UNLOCK(tcb);
+    Log2(("%s:%d soread before lock\n",__FUNCTION__, __LINE__));
 
     DEBUG_CALL("soread");
@@ -190 +204 @@
          */
         if (nn == 0 && !fCloseIfNothingRead)
+        {
+            SOCKET_UNLOCK(so);
             return 0;
+        }
 #endif
         if (nn < 0 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
+        {
+            SOCKET_UNLOCK(so);
             return 0;
+        }
         else
         {
@@ -201 +221 @@
             sofcantrcvmore(so);
             tcp_sockclosed(pData, sototcpcb(so));
+            SOCKET_UNLOCK(so);
             return -1;
         }
@@ -231 +252 @@
     if (sb->sb_wptr >= (sb->sb_data + sb->sb_datalen))
         sb->sb_wptr -= sb->sb_datalen;
+    SOCKET_UNLOCK(so);
     return nn;
 }
@@ -344 +366 @@
     DEBUG_CALL("sowrite");
     DEBUG_ARG("so = %lx", (long)so);
-
+    QSOCKET_LOCK(tcb);
+    SOCKET_LOCK(so);
+    QSOCKET_UNLOCK(tcb);
     if (so->so_urgc)
     {
         sosendoob(so);
         if (sb->sb_cc == 0)
+        {
+            SOCKET_UNLOCK(so);    
             return 0;
+        }
     }
 
@@ -396 +423 @@
     /* This should never happen, but people tell me it does *shrug* */
     if (nn < 0 && (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK))
+    {
+        SOCKET_UNLOCK(so);    
         return 0;
+    }
 
     if (nn < 0 || (nn == 0 && iov[0].iov_len > 0))
@@ -404 +434 @@
         sofcantsendmore(so);
         tcp_sockclosed(pData, sototcpcb(so));
+        SOCKET_UNLOCK(so);    
         return -1;
     }
@@ -431 +462 @@
         sofcantsendmore(so);
 
+    SOCKET_UNLOCK(so);    
     return nn;
 }
@@ -463 +495 @@
         u_long n;
 
-        if (!(m = m_get(pData)))
+        QSOCKET_LOCK(udb);
+        SOCKET_LOCK(so);
+        QSOCKET_UNLOCK(udb);
+
+        if (!(m = m_get(pData))) 
+        {
+            SOCKET_UNLOCK(so);
             return;
+        }
         m->m_data += if_maxlinkhdr;
 #ifdef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC
@@ -490 +529 @@
         m->m_len = recvfrom(so->s, m->m_data, len, 0,
                             (struct sockaddr *)&addr, &addrlen);
-        DEBUG_MISC((dfd, " did recvfrom %d, errno = %d-%s\n",
+        Log2((" did recvfrom %d, errno = %d-%s\n",
                     m->m_len, errno,strerror(errno)));
         if(m->m_len < 0)
@@ -501 +540 @@
                 code = ICMP_UNREACH_NET;
 
-            DEBUG_MISC((dfd," rx error, tx icmp ICMP_UNREACH:%i\n", code));
+            Log2((dfd," rx error, tx icmp ICMP_UNREACH:%i\n", code));
             icmp_error(pData, so->so_m, ICMP_UNREACH,code, 0,strerror(errno));
             m_free(pData, m);
@@ -534 +573 @@
              */
             udp_output(pData, so, m, &addr);
+            SOCKET_UNLOCK(so);
         } /* rx error */
     } /* if ping packet */
@@ -678 +718 @@
         int tmperrno = WSAGetLastError(); /* Don't clobber the real reason we failed */
         closesocket(s);
+        QSOCKET_LOCK(tcb);
         sofree(pData, so);
+        QSOCKET_UNLOCK(tcb);
         /* Restore the real errno */
         WSASetLastError(tmperrno);