Changeset 48823 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 2, 2013 3:27:22 PM (11 years ago)

Author:

vboxsync

Message:

OS X host: leds sync: hopefully fixed all IOKit related memory leaks, also RTMemAlloc/Free() -> malloc/free(). Enabled for testing.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp (modified) (20 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp

@@ -22 +22 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_GUI
-//#define VBOX_WITH_KBD_LEDS_SYNC
+#define VBOX_WITH_KBD_LEDS_SYNC
 
 #include "DarwinKeyboard.h"
@@ -1270 +1270 @@
                 rc = kIOReturnError;
         }
+
+        CFRelease(valueRef);
     }
 
@@ -1313 +1315 @@
                 rc2 = kIOReturnError;
             }
-
-        }
+        }
+
+        CFRelease(matchingElementsArrayRef);
     }
 
@@ -1359 +1362 @@
             }
         }
+
+        CFRelease(matchingElementsArrayRef);
     }
 
@@ -1372 +1377 @@
     IOHIDElementRef pElementRef = IOHIDValueGetElement(valueRef);
 
-    if (IOHIDElementGetUsagePage(pElementRef) == kHIDPage_KeyboardOrKeypad)        /* Keyboard or keypad event */
-        if (IOHIDValueGetIntegerValue(valueRef) == 1)                              /* key has been pressed down */
-            if (IOHIDElementGetUsage(pElementRef) == kHIDUsage_KeyboardCapsLock || /* CapsLock key has been pressed */
-                IOHIDElementGetUsage(pElementRef) == kHIDUsage_KeypadNumLock)      /* ... or NumLock key has been pressed */
-            {
-                Log2(("A modifier key has been pressed\n"));
-                g_LastTouchedState = (VBoxHidLeds_t *)pData;
-            }
+    if (pElementRef)
+    {
+        if (IOHIDElementGetUsagePage(pElementRef) == kHIDPage_KeyboardOrKeypad)        /* Keyboard or keypad event */
+            if (IOHIDValueGetIntegerValue(valueRef) == 1)                              /* key has been pressed down */
+                if (IOHIDElementGetUsage(pElementRef) == kHIDUsage_KeyboardCapsLock || /* CapsLock key has been pressed */
+                    IOHIDElementGetUsage(pElementRef) == kHIDUsage_KeypadNumLock)      /* ... or NumLock key has been pressed */
+                {
+                    Log2(("A modifier key has been pressed\n"));
+                    g_LastTouchedState = (VBoxHidLeds_t *)pData;
+                }
+
+    }
 }
 
@@ -1462 +1471 @@
     CFRunLoopRemoveSource(CFRunLoopGetCurrent(), pState->pLoopSourceRef, kCFRunLoopDefaultMode);
     CFRelease(pState->pLoopSourceRef);
+    CFRelease(pState->pTapRef);
 }
 
@@ -1508 +1518 @@
     VBoxHidsState_t *hidsState;
 
-    hidsState = (VBoxHidsState_t *)RTMemAllocZ(sizeof(VBoxHidsState_t));
+    hidsState = (VBoxHidsState_t *)malloc(sizeof(VBoxHidsState_t));
     if (hidsState)
     {
@@ -1514 +1524 @@
         if (hidsState->hidManagerRef)
         {
-
             CFDictionaryRef deviceMatchingDictRef = darwinGetLedDeviceMatchingDictionary();
             if (deviceMatchingDictRef)
             {
+                IOHIDManagerScheduleWithRunLoop(hidsState->hidManagerRef, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
                 IOHIDManagerSetDeviceMatching(hidsState->hidManagerRef, deviceMatchingDictRef);
 
@@ -1530 +1540 @@
                         /* Get all the available devices and cycle through them. */
                         hidsState->cDevices = CFSetGetCount(hidDevicesSetRef);
-                        hidsState->hidDevicesCollection = (IOHIDDeviceRef *)RTMemAllocZ((size_t)hidsState->cDevices * sizeof(IOHIDDeviceRef));
+                        hidsState->hidDevicesCollection = (IOHIDDeviceRef *)malloc((size_t)hidsState->cDevices * sizeof(IOHIDDeviceRef));
                         if (hidsState->hidDevicesCollection)
                         {
-                            hidsState->hidLedsCollection = (VBoxHidLeds_t *)RTMemAllocZ((size_t)hidsState->cDevices * sizeof(VBoxHidLeds_t));
+                            hidsState->hidLedsCollection = (VBoxHidLeds_t *)malloc((size_t)hidsState->cDevices * sizeof(VBoxHidLeds_t));
                             if (hidsState->hidLedsCollection)
                             {
@@ -1571 +1581 @@
                                     if (darwinAddCarbonGlobalKeyPressHandler(hidsState) == 0)
                                     {
+                                        CFRelease(hidDevicesSetRef);
                                         CFRelease(deviceMatchingDictRef);
                                         return hidsState;
@@ -1576 +1587 @@
                                 }
 
-                                RTMemFree(hidsState->hidLedsCollection);
+                                free(hidsState->hidLedsCollection);
                             }
 
-                            RTMemFree(hidsState->hidDevicesCollection);
+                            free(hidsState->hidDevicesCollection);
                         }
+
+                        CFRelease(hidDevicesSetRef);
                     }
 
@@ -1594 +1607 @@
         }
 
-        RTMemFree(hidsState);
+        free(hidsState);
     }
 
@@ -1630 +1643 @@
             {
                 /* Cycle through supported devices only. */
-                if (darwinHidDeviceSupported(hidsState->hidDevicesCollection[i]))
+                if (IOHIDDeviceConformsTo(hidsState->hidDevicesCollection[i], kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)
+                 && darwinHidDeviceSupported(hidsState->hidDevicesCollection[i]))
                 {
                     rc = darwinSetDeviceLedsState(hidsState->hidDevicesCollection[i],
@@ -1643 +1657 @@
                     }
 
+                    IOHIDDeviceUnscheduleFromRunLoop(hidsState->hidDevicesCollection[i], CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
                     IOHIDDeviceRegisterInputValueCallback(hidsState->hidDevicesCollection[i], NULL, NULL);
-                    IOHIDDeviceUnscheduleFromRunLoop(hidsState->hidDevicesCollection[i], CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
                 }
             }
+
+            CFRelease(elementMatchingDict);
         }
 
         /* Free resources */
 
-        RTMemFree(hidsState->hidLedsCollection);
-        RTMemFree(hidsState->hidDevicesCollection);
+        free(hidsState->hidLedsCollection);
+        free(hidsState->hidDevicesCollection);
 
         rc = IOHIDManagerClose(hidsState->hidManagerRef, 0);
@@ -1658 +1674 @@
             Log2(("Warning! Something went wrong in attempt to close HID device manager!\n"));
 
+        IOHIDManagerUnscheduleFromRunLoop(hidsState->hidManagerRef, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+
         CFRelease(hidsState->hidManagerRef);
 
-        RTMemFree(hidsState);
+        free(hidsState);
     }
 
     return rc2;
-#else // !VBOX_WITH_KBD_LEDS_SYNC
+#else /* !VBOX_WITH_KBD_LEDS_SYNC */
     (void)pState;
     return 0;
@@ -1693 +1711 @@
         if (deviceMatchingDictRef)
         {
+            IOHIDManagerScheduleWithRunLoop(hidManagerRef, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
             IOHIDManagerSetDeviceMatching(hidManagerRef, deviceMatchingDictRef);
 
@@ -1705 +1724 @@
                     /* Get all the available devices and cycle through them. */
                     CFIndex cDevices = CFSetGetCount(hidDevicesSetRef);
-                    IOHIDDeviceRef *hidDevicesCollection = (IOHIDDeviceRef *)RTMemAllocZ((size_t)cDevices * sizeof(IOHIDDeviceRef));
+                    IOHIDDeviceRef *hidDevicesCollection = (IOHIDDeviceRef *)malloc((size_t)cDevices * sizeof(IOHIDDeviceRef));
                     if (hidDevicesCollection)
                     {
@@ -1731 +1750 @@
                         }
 
-                        RTMemFree(hidDevicesCollection);
+                        free(hidDevicesCollection);
                     }
+
+                    CFRelease(hidDevicesSetRef);
                 }
 
@@ -1740 +1761 @@
             }
 
+            IOHIDManagerUnscheduleFromRunLoop(hidManagerRef, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+
             CFRelease(deviceMatchingDictRef);
         }
@@ -1745 +1768 @@
         CFRelease(hidManagerRef);
     }
-#else // !VBOX_WITH_KBD_LEDS_SYNC
-
+#else /* !VBOX_WITH_KBD_LEDS_SYNC */
     (void)fNumLockOn;
     (void)fCapsLockOn;