Changeset 4624 in vbox

Timestamp:

Sep 8, 2007 6:32:00 AM (17 years ago)

Author:

vboxsync

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

24270

Message:

The USE_PDMTHREAD stuff seems to work fine, dropped the old code.

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -46 +46 @@
  */
 
-/** To enable the PDMThread based send thread code.
- * This is just a emergency switch in case changes doesn't quite work and
- * we want to get 1.5 out.
- * @todo cleanup after 1.5.  */
-#define USE_PDMTHREAD 1
-
 /*******************************************************************************
 *   Header Files                                                               *
@@ -223 +217 @@
     /** Async send thread */
     RTSEMEVENT                          hSendEventSem;
-#ifdef USE_PDMTHREAD
     /** The Async send thread. */
     PPDMTHREAD                          pSendThread;
-#else
-    RTTHREAD                            hSendThread;
-#endif
 
     /** Access critical section. */
@@ -2057 +2047 @@
                     {
                         int rc = pcnetXmitCompleteFrame(pData);
-#ifdef USE_PDMTHREAD
                         AssertRCReturn(rc, rc);
-#else
-                        if (VBOX_FAILURE(rc))
-                            return rc; /* can happen during termination */
-#endif
                     }
                 }
@@ -2168 +2153 @@
                     {
                         int rc = pcnetXmitCompleteFrame(pData);
-#ifdef USE_PDMTHREAD
                         AssertRCReturn(rc, rc);
-#else
-                        if (VBOX_FAILURE(rc))
-                            return rc; /* can happen during termination */
-#endif
                     }
                     else if (CSR_LOOP(pData) && !fDropFrame)
@@ -2236 +2216 @@
 
 
-#ifdef USE_PDMTHREAD
 /**
  * Async I/O thread for delayed sending of packets.
@@ -2309 +2288 @@
     return RTSemEventSignal(pThis->hSendEventSem);
 }
-
-
-#else /* USE_PDMTHREAD */
-/**
- * Async I/O thread for delayed sending of packets.
- */
-static DECLCALLBACK(int) pcnetAsyncSend(RTTHREAD ThreadSelf, void *pvUser)
-{
-    PCNetState *pData = (PCNetState *)pvUser;
-    RTSEMEVENT hEvent = pData->hSendEventSem;
-    int        rc     = VINF_SUCCESS;
-
-    while(rc == VINF_SUCCESS)
-    {
-        rc = RTSemEventWait(hEvent, RT_INDEFINITE_WAIT);
-        if (VBOX_FAILURE(rc))
-            break;
-
-        rc = PDMCritSectEnter(&pData->CritSect, VERR_PERMISSION_DENIED);
-        AssertReleaseRC(rc);
-
-        if (!pData->fSaving)
-            rc = pcnetAsyncTransmit(pData);
-
-        PDMCritSectLeave(&pData->CritSect);
-    }
-    return VINF_SUCCESS;
-}
-#endif /* USE_PDMTHREAD */
 
 #endif /* IN_RING3 */
@@ -4166 +4116 @@
     if (PDMCritSectIsInitialized(&pData->CritSect))
     {
-#ifdef USE_PDMTHREAD
         /*
          * At this point the send thread is suspended and will not enter
@@ -4175 +4124 @@
         pData->hSendEventSem = NIL_RTSEMEVENT;
         PDMR3CritSectDelete(&pData->CritSect);
-#else
-        PDMCritSectEnter(&pData->CritSect, VERR_ACCESS_DENIED);
-
-        RTSemEventDestroy(pData->hSendEventSem);
-        pData->hSendEventSem = 0;
-
-        PDMCritSectLeave(&pData->CritSect);
-        PDMR3CritSectDelete(&pData->CritSect);
-#endif
     }
     return VINF_SUCCESS;
@@ -4454 +4394 @@
 
     /* Create asynchronous thread */
-#ifdef USE_PDMTHREAD
     rc = PDMDevHlpPDMThreadCreate(pDevIns, &pData->pSendThread, pData, pcnetAsyncSendThread, pcnetAsyncSendThreadWakeUp, 0, RTTHREADTYPE_IO, "PCNET_SEND");
     AssertRCReturn(rc, rc);
-#else
-    rc = RTThreadCreate(&pData->hSendThread, pcnetAsyncSend, (void *)pData, 128*1024, RTTHREADTYPE_IO, 0, "PCNET_SEND");
-    AssertRC(rc);
-#endif
 
 #ifdef VBOX_WITH_STATISTICS