Changeset 16445 in vbox for trunk

Timestamp:

Feb 1, 2009 8:42:38 AM (16 years ago)

Author:

vboxsync

Message:

NAT:MT

1. foreach/label sequences enhanced
2. debug printing for sockets corretctly resolves NULL and SS_NOFDREF sockets.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• debug.c (modified) (1 diff)
• slirp.c (modified) (1 diff)
• slirp_state.h (modified) (3 diffs)
• socket.c (modified) (3 diffs)
• socket.h (modified) (1 diff)
• tcp_input.c (modified) (2 diffs)

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

@@ -250 +250 @@
 
     AssertReturn(strcmp(pszType, "natsock") == 0, 0);
+    if (so == NULL) 
+        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "socket is null");
     if (so->so_state == SS_NOFDREF || so->s == -1) 
         return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "socket SS_NODREF");

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

@@ -692 +692 @@
                 if (so->so_expire <= curtime)
                 {
+                    QSOCKET_LOCK(udb);
+#ifdef VBOX_WITH_SLIRP_MT
+                    /*we can determinate the next item after udb_detach*/
+                    if (so->so_next != &tcb) 
+                    {
+                        SOCKET_LOCK(so->so_next);
+                        so_next = so->so_next;
+                    }
+#endif
+                    QSOCKET_UNLOCK(udb);
                     udp_detach(pData, so);
                     CONTINUE_NO_UNLOCK(udp);

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -287 +287 @@
 do {                                                                            \
     int rc;                                                                     \
-    rc = RTCritSectEnter(&_X(queue) ## _mutex);            \
+    /* Assert(strcmp(RTThreadSelfName(), "EMT") != 0); */                       \
+    rc = RTCritSectEnter(&_X(queue) ## _mutex);                                 \
     AssertReleaseRC(rc);                                                        \
 } while (0)
@@ -311 +312 @@
         QSOCKET_LOCK(__X(queue_## label ## _label));                \
         (so) = (_X(queue_ ## label ## _label)).so_next;             \
+        QSOCKET_UNLOCK(__X(queue_## label ##_label));               \
         if ((so) != &(_X(queue_## label ## _label))) SOCKET_LOCK((so));  \
         for(;;)                                                     \
@@ -316 +318 @@
             if ((so) == &(_X(queue_## label ## _label)))            \
             {                                                       \
-                QSOCKET_UNLOCK(__X(queue_## label ##_label));       \
                 break;                                              \
             }                                                       \
-            Log2(("%s:%d Processing so:%R[natsock]\n", __FUNCTION__, __LINE__, (so)));  \
-            if ((so)->so_next != &(_X(queue_## label ## _label)))   \
-            {                                                       \
-                SOCKET_LOCK((so)->so_next);                         \
-            }                                                       \
-            (sonext) = (so)->so_next;                               \
-            QSOCKET_UNLOCK(__X(queue_## label ##_label)); 
+            Log2(("%s:%d Processing so:%R[natsock]\n", __FUNCTION__, __LINE__, (so)));
 
 # define CONTINUE_NO_UNLOCK(label) goto loop_end_ ## label ## _mt_nounlock
 # define CONTINUE(label) goto loop_end_ ## label ## _mt
 /* @todo replace queue parameter with macrodinition */
+/* _mt_nounlock - user should lock so_next before calling CONTINUE_NO_UNLOCK */
 # define LOOP_LABEL(label, so, sonext) loop_end_ ## label ## _mt:       \
+    (sonext) = (so)->so_next;                                           \
     SOCKET_UNLOCK(so);                                                  \
+    QSOCKET_LOCK(_X(queue_ ## label ## _label));                        \
+    if ((sonext) != &(_X(queue_## label ## _label)))                    \
+    {                                                                   \
+        SOCKET_LOCK((sonext));                                          \
+        QSOCKET_UNLOCK(_X(queue_ ## label ## _label));                  \
+    }                                                                   \
+    else                                                                \
+    {                                                                   \
+        so = &_X(queue_ ## label ## _label);                            \
+        QSOCKET_UNLOCK(_X(queue_ ## label ## _label));                  \
+        break;                                                          \
+    }                                                                   \
+    (so) = (sonext);                                                    \
+    continue;                                                           \
     loop_end_ ## label ## _mt_nounlock:                                 \
-    QSOCKET_LOCK(_X(queue_ ## label ## _label));                        \
     (so) = (sonext)
-
+    
 #define DO_TCP_OUTPUT(data, sotcb)                                      \
 do {                                                                    \

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

@@ -78 +78 @@
 sofree(PNATState pData, struct socket *so)
 {
+    struct socket *so_prev = NULL;
     if (so == tcp_last_so)
         tcp_last_so = &tcb;
@@ -86 +87 @@
     if (so->so_m != NULL)
         m_free(pData, so->so_m);
-
     if(so->so_next && so->so_prev)
+    {
+        if (   so->so_prev != NULL 
+            && so->so_prev != &udb
+            && so->so_prev != &tcb) 
+            {
+                SOCKET_LOCK(so->so_prev);
+                so_prev = so->so_prev;
+            }
         remque(pData, so);  /* crashes if so is not in a queue */
+        if (so_prev != NULL) 
+            SOCKET_UNLOCK(so_prev);
+    }
     so->so_state = SS_NOFDREF; /* for debugging purposes */
     SOCKET_UNLOCK(so);
@@ -744 +755 @@
 
     so->s = s;
+    SOCKET_UNLOCK(so);
     return so;
 }

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

@@ -76 +76 @@
     do {                                                                \
         int rc;                                                         \
+        /* Assert(strcmp(RTThreadSelfName(), "EMT") != 0); */           \
         Log2(("lock:%s:%d L on %R[natsock]\n", __FUNCTION__, __LINE__, (so)));       \
+        Assert(!RTCritSectIsOwner(&(so)->so_mutex));                     \
         rc = RTCritSectEnter(&(so)->so_mutex);                           \
         AssertReleaseRC(rc);                                            \

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

@@ -425 +425 @@
                 && so->so_fport        == ti->ti_dport) 
             {
-                if (sonxt != &tcb)
-                    SOCKET_UNLOCK(sonxt);
                 Log2(("lock: %s:%d We found socket %R[natsock]\n", __FUNCTION__, __LINE__, so));
                 break; /* so is locked here */
@@ -462 +460 @@
      * as if it was LISTENING, and continue...
      */
-    Log2(("so = %p\n", so));
+    Log2(("so = %R[natsock]\n", so));
     if (so == 0)
     {