Changeset 16741 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin

Timestamp:

Feb 13, 2009 3:08:22 PM (16 years ago)

Author:

vboxsync

Message:

#2957: Cleanup of minor glitches.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetAdapter-darwin.cpp (modified) (6 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetAdapter-darwin.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxTAP - Network TAP Driver (Host), Darwin Specific Code.
+ * VBoxNetAdapter - Virtual Network Adapter Driver (Host), Darwin Specific Code.
  */
 
@@ -174 +174 @@
     PVBOXNETADA pAda = VBOXNETADA_FROM_IFACE(pIface);
     Assert(pAda);
-    Log(("vboxNetAdaDetach: Signaling detach to vboxNetAdaUnregisterDevice.\n"));
+    Log2(("vboxNetAdaDetach: Signaling detach to vboxNetAdaUnregisterDevice.\n"));
     /* Let vboxNetAdaUnregisterDevice know that the interface has been detached. */
     RTSemEventSignal(pAda->hEvtDetached);
@@ -245 +245 @@
         if (pAda->aAttachedFamilies[i])
             ifnet_detach_protocol(pAda->pIface, pAda->aAttachedFamilies[i]);
-    /*
-     * We acquire the lock twice: before and after ifnet_detach.
-     * The second attempt to get the lock will block until the lock
-     * is released in detach callback.
-     */
     err = ifnet_detach(pAda->pIface);
     if (err)
         Log(("vboxNetAdaUnregisterDevice: Failed to detach interface "
              "(err=%d).\n", err));
-    Log2(("vboxNetAdaUnregisterDevice: Trying to acquire lock second time.\n"));
+    Log2(("vboxNetAdaUnregisterDevice: Waiting for 'detached' event...\n"));
+    /* Wait until we get a signal from detach callback. */
     rc = RTSemEventWait(pAda->hEvtDetached, VBOXNETADA_DETACH_TIMEOUT);
     if (rc == VERR_TIMEOUT)
@@ -297 +293 @@
     }
 
-    /* All slots in NETADA array are busy. */
+    /* All slots in adapter array are busy. */
     return VERR_OUT_OF_RESOURCES;
 }
@@ -336 +332 @@
         if (RT_FAILURE(rc))
         {
-            Log(("VBoxNetAdapter: Failed to create fast mutex (rc=%Rrc).\n", rc));
+            Log(("vboxNetAdaModuleStart: Failed to create fast mutex (rc=%Rrc).\n", rc));
             return rc;
         }
@@ -354 +350 @@
         rc = RTSemFastMutexDestroy(g_aAdapters[i].hStateMtx);
         if (RT_FAILURE(rc))
-            Log(("VBoxNetAdapter: Failed to destroy fast mutex (rc=%Rrc).\n", rc));
+            Log(("vboxNetAdaModuleStop: Failed to destroy fast mutex (rc=%Rrc).\n", rc));
     }