Properly type mach_port_t and friends

Author: dbwiddis

contrib/platform/src/com/sun/jna/platform/mac/IOKit.java

@@ -34,6 +34,8 @@
 import com.sun.jna.platform.mac.CoreFoundation.CFMutableDictionaryRef;
 import com.sun.jna.platform.mac.CoreFoundation.CFStringRef;
 import com.sun.jna.platform.mac.CoreFoundation.CFTypeRef;
+import com.sun.jna.platform.mac.SystemB.MachPort;
+import com.sun.jna.platform.mac.SystemB.TaskPort;
 import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.LongByReference;
 import com.sun.jna.ptr.PointerByReference;
@@ -52,8 +54,6 @@ public interface IOKit extends Library {
     double kIOPSTimeRemainingUnlimited = -2.0;
     double kIOPSTimeRemainingUnknown = -1.0;
 
-    MachPort MACH_PORT_NULL = new MachPort();
-
     /**
      * IOKitLib implements non-kernel task access to common IOKit object types -
      * IORegistryEntry, IOService, IOIterator etc. These functions are generic -
@@ -90,25 +90,6 @@ public int release() {
         }
     }
 
-    /**
-     * Communication between tasks is an important element of the Mach philosophy.
-     * Mach supports a client/server system structure in which tasks (clients)
-     * access services by making requests of other tasks (servers) via messages sent
-     * over a communication channel.
-     * <p>
-     * The endpoints of these communication channels in Mach are called ports, while
-     * port rights denote permission to use the channel.
-     */
-    class MachPort extends IOObject {
-        public MachPort() {
-            super();
-        }
-
-        public MachPort(Pointer p) {
-            super(p);
-        }
-    }
-
     /**
      * An IOKit iterator handle.
      */
@@ -128,7 +109,7 @@ public IOIterator(Pointer p) {
          *         returned, otherwise zero is returned. The element should be released
          *         by the caller when it is finished.
          */
-        public IOService next() {
+        public IORegistryEntry next() {
             return INSTANCE.IOIteratorNext(this);
         }
     }
@@ -178,7 +159,7 @@ public IOConnect(Pointer p) {
      * Returns the mach port used to initiate communication with IOKit.
      *
      * @param bootstrapPort
-     *            Pass {@link #MACH_PORT_NULL} for the default.
+     *            Pass {@link SystemB#MACH_PORT_NULL} for the default.
      * @param masterPort
      *            A pointer to the master port is returned. Multiple calls to
      *            IOMasterPort will not result in leaking ports (each call to
@@ -285,7 +266,7 @@ int IOServiceGetMatchingServices(MachPort masterPort, CFDictionaryRef matchingDi
      *         returned, otherwise zero is returned. The element should be released
      *         by the caller when it is finished.
      */
-    IOService IOIteratorNext(IOIterator iterator);
+    IORegistryEntry IOIteratorNext(IOIterator iterator);
 
     /**
      * Create a CF representation of a registry entry's property.
@@ -463,7 +444,7 @@ CFTypeRef IORegistryEntrySearchCFProperty(IORegistryEntry entry, String plane, C
      *            {@link IOServiceClose}.
      * @return A return code generated by {@code IOService::newUserClient}.
      */
-    int IOServiceOpen(IOService service, MachPort owningTask, int type, PointerByReference connect);
+    int IOServiceOpen(IOService service, TaskPort owningTask, int type, PointerByReference connect);
 
     /**
      * Returns the busyState of an IOService.

contrib/platform/src/com/sun/jna/platform/mac/IOKitUtil.java

@@ -35,7 +35,7 @@
 import com.sun.jna.platform.mac.IOKit.IOIterator;
 import com.sun.jna.platform.mac.IOKit.IORegistryEntry;
 import com.sun.jna.platform.mac.IOKit.IOService;
-import com.sun.jna.platform.mac.IOKit.MachPort;
+import com.sun.jna.platform.mac.SystemB.MachPort;
 import com.sun.jna.ptr.PointerByReference;
 
 /**
@@ -57,11 +57,11 @@ private IOKitUtil() {
      *         ports (each call to {@link IOKit#IOMasterPort} adds another send
      *         right to the port) but it is considered good programming practice to
      *         deallocate the port when you are finished with it, using
-     *         {@link IOKit#IOObjectRelease}.
+     *         {@link SystemB#mach_port_deallocate}.
      */
     public static MachPort getMasterPort() {
         PointerByReference port = new PointerByReference();
-        IO.IOMasterPort(IOKit.MACH_PORT_NULL, port);
+        IO.IOMasterPort(SystemB.MACH_PORT_NULL, port);
         return new MachPort(port.getValue());
     }
 
@@ -74,7 +74,7 @@ public static MachPort getMasterPort() {
     public static IORegistryEntry getRoot() {
         MachPort masterPort = getMasterPort();
         IORegistryEntry root = IO.IORegistryGetRootEntry(masterPort);
-        masterPort.release();
+        masterPort.deallocate();
         return root;
     }
 
@@ -108,7 +108,7 @@ public static IOService getMatchingService(String serviceName) {
     public static IOService getMatchingService(CFDictionaryRef matchingDictionary) {
         MachPort masterPort = getMasterPort();
         IOService service = IO.IOServiceGetMatchingService(masterPort, matchingDictionary);
-        masterPort.release();
+        masterPort.deallocate();
         return service;
     }
 
@@ -143,7 +143,7 @@ public static IOIterator getMatchingServices(CFDictionaryRef matchingDictionary)
         MachPort masterPort = getMasterPort();
         PointerByReference serviceIterator = new PointerByReference();
         int result = IO.IOServiceGetMatchingServices(masterPort, matchingDictionary, serviceIterator);
-        masterPort.release();
+        masterPort.deallocate();
         if (result == 0 && serviceIterator.getValue() != null) {
             return new IOIterator(serviceIterator.getValue());
         }
@@ -161,7 +161,7 @@ public static IOIterator getMatchingServices(CFDictionaryRef matchingDictionary)
     public static CFMutableDictionaryRef getBSDNameMatchingDict(String bsdName) {
         MachPort masterPort = getMasterPort();
         CFMutableDictionaryRef result = IO.IOBSDNameMatching(masterPort, 0, bsdName);
-        masterPort.release();
+        masterPort.deallocate();
         return result;
     }