Add support for iOS 6.1.x.

Author: tslmy

Compat.c

@@ -24,6 +24,15 @@ in the source distribution for its full text.
 # define PATH_MAX 4096
 #endif
 
+/* iOS 6.1 SDK does not have these constants */
+#ifndef AT_FDCWD
+# define AT_FDCWD -100
+#endif
+
+#ifndef AT_SYMLINK_NOFOLLOW
+# define AT_SYMLINK_NOFOLLOW 0x100
+#endif
+
 
 int Compat_faccessat(int dirfd,
                      const char* pathname,

darwin/DarwinMachine.c

@@ -105,18 +105,22 @@ Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
    openzfs_sysctl_init(&this->zfs);
    openzfs_sysctl_updateArcStats(&this->zfs);
 
+#if !TARGET_OS_IPHONE
    this->GPUService = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("IOGPU"));
    if (!this->GPUService) {
       CRT_debug("Cannot initialize IOGPU service");
    }
+#endif
 
    return super;
 }
 
 void Machine_delete(Machine* super) {
    DarwinMachine* this = (DarwinMachine*) super;
 
+#if !TARGET_OS_IPHONE
    IOObjectRelease(this->GPUService);
+#endif
 
    DarwinMachine_freeCPULoadInfo(&this->prev_load);
 

darwin/DarwinMachine.h

@@ -7,7 +7,9 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#if !TARGET_OS_IPHONE
 #include <IOKit/IOKitLib.h>
+#endif
 #include <mach/mach_host.h>
 #include <sys/sysctl.h>
 
@@ -27,7 +29,9 @@ typedef struct DarwinMachine_ {
    processor_cpu_load_info_t prev_load;
    processor_cpu_load_info_t curr_load;
 
+#if !TARGET_OS_IPHONE
    io_service_t GPUService;
+#endif
 
    ZfsArcStats zfs;
 } DarwinMachine;

darwin/DarwinProcess.c

@@ -9,13 +9,63 @@ in the source distribution for its full text.
 
 #include "darwin/DarwinProcess.h"
 
+#if !TARGET_OS_IPHONE
 #include <libproc.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <mach/mach.h>
 #include <sys/dirent.h>
 
+/* iOS 6.1 SDK doesn't have libproc.h, define stubs */
+#if TARGET_OS_IPHONE
+#define PROC_PIDVNODEPATHINFO 9
+#define PROC_PIDTASKINFO 4
+#define PROC_PIDTASKINFO_SIZE sizeof(struct proc_taskinfo)
+#define PROC_PIDPATHINFO_MAXSIZE 4096
+
+struct proc_taskinfo {
+   uint64_t  pti_virtual_size;
+   uint64_t  pti_resident_size;
+   uint64_t  pti_total_user;
+   uint64_t  pti_total_system;
+   uint64_t  pti_threads_user;
+   uint64_t  pti_threads_system;
+   int32_t   pti_policy;
+   int32_t   pti_faults;
+   int32_t   pti_pageins;
+   int32_t   pti_cow_faults;
+   int32_t   pti_messages_sent;
+   int32_t   pti_messages_received;
+   int32_t   pti_syscalls_mach;
+   int32_t   pti_syscalls_unix;
+   int32_t   pti_csw;
+   int32_t   pti_threadnum;
+   int32_t   pti_numrunning;
+   int32_t   pti_priority;
+};
+
+struct vnode_info_path {
+   char vip_path[1024];
+};
+
+struct proc_vnodepathinfo {
+   struct vnode_info_path pvi_cdir;
+   struct vnode_info_path pvi_rdir;
+};
+
+static inline int proc_pidpath(int pid, void *buffer, uint32_t buffersize) {
+   (void)pid; (void)buffer; (void)buffersize;
+   return -1;
+}
+
+static inline int proc_pidinfo(int pid, int flavor, uint64_t arg, void *buffer, int buffersize) {
+   (void)pid; (void)flavor; (void)arg; (void)buffer; (void)buffersize;
+   return -1;
+}
+#endif
+
 #include "CRT.h"
 #include "Process.h"
 #include "darwin/DarwinMachine.h"

darwin/DarwinProcessTable.c

@@ -8,7 +8,9 @@ in the source distribution for its full text.
 #include "darwin/DarwinProcessTable.h"
 
 #include <errno.h>
+#if !TARGET_OS_IPHONE
 #include <libproc.h>
+#endif
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

darwin/Platform.c

@@ -15,23 +15,34 @@ in the source distribution for its full text.
 #include <math.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
 #include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <net/if.h>
 #include <mach/port.h>
 
+/* iOS 6.1 SDK doesn't have net/if_types.h and net/route.h, define constants manually */
+#ifndef IFT_LOOP
+#define IFT_LOOP 24 /* Software loopback network */
+#endif
+
+#ifndef RTM_IFINFO2
+#define RTM_IFINFO2 0x12
+#endif
+
 #include <CoreFoundation/CFBase.h>
 #include <CoreFoundation/CFDictionary.h>
 #include <CoreFoundation/CFNumber.h>
 #include <CoreFoundation/CFString.h>
 #include <CoreFoundation/CoreFoundation.h>
 
+/* IOKit is not available on iOS */
+#if !TARGET_OS_IPHONE
 #include <IOKit/IOKitLib.h>
 #include <IOKit/IOTypes.h>
 #include <IOKit/ps/IOPowerSources.h>
 #include <IOKit/ps/IOPSKeys.h>
 #include <IOKit/storage/IOBlockStorageDriver.h>
+#endif
 
 #include "ClockMeter.h"
 #include "CPUMeter.h"
@@ -158,7 +169,9 @@ static uint64_t Platform_nanosecondsPerMachTickDenom = 1;
 
 static double Platform_nanosecondsPerSchedulerTick = -1;
 
+#if !TARGET_OS_IPHONE
 static mach_port_t iokit_port; // the mach port used to initiate communication with IOKit
+#endif
 
 static void Platform_calculateNanosecondsPerMachTick(uint64_t* numer, uint64_t* denom) {
    // Check if we can determine the timebase used on this system.
@@ -351,6 +364,12 @@ void Platform_setGPUValues(Meter* mtr, double* totalUsage, unsigned long long* t
    mtr->curItems = 1;
    mtr->values[0] = NAN;
 
+#if TARGET_OS_IPHONE
+   /* IOKit not available on iOS */
+   (void)host;
+   (void)dhost;
+   return;
+#else
    if (!dhost->GPUService)
       return;
 
@@ -390,6 +409,7 @@ void Platform_setGPUValues(Meter* mtr, double* totalUsage, unsigned long long* t
    CFRelease(properties);
 
    mtr->values[0] = *totalUsage;
+#endif
 }
 
 void Platform_setMemoryValues(Meter* mtr) {
@@ -403,16 +423,26 @@ void Platform_setMemoryValues(Meter* mtr) {
 
    mtr->total = dhost->host_info.max_mem / 1024;
 #ifdef HAVE_STRUCT_VM_STATISTICS64
+#if !TARGET_OS_IPHONE  /* iOS 6.1 SDK doesn't have compressor_page_count and external_page_count */
    natural_t used = vm->active_count + vm->inactive_count +
               vm->speculative_count + vm->wire_count +
               vm->compressor_page_count - vm->purgeable_count - vm->external_page_count;
    mtr->values[MEMORY_METER_USED] = (double)(used - vm->compressor_page_count) * page_K;
+#else
+   natural_t used = vm->active_count + vm->inactive_count +
+              vm->speculative_count + vm->wire_count - vm->purgeable_count;
+   mtr->values[MEMORY_METER_USED] = (double)used * page_K;
+#endif
 #else
    mtr->values[MEMORY_METER_USED] = (double)(vm->active_count + vm->wire_count) * page_K;
 #endif
    // mtr->values[MEMORY_METER_SHARED] = "shared memory, like tmpfs and shm"
 #ifdef HAVE_STRUCT_VM_STATISTICS64
+#if !TARGET_OS_IPHONE
    mtr->values[MEMORY_METER_COMPRESSED] = (double)vm->compressor_page_count * page_K;
+#else
+   // mtr->values[MEMORY_METER_COMPRESSED] = "compressed memory not available on iOS 6.1"
+#endif
 #else
    // mtr->values[MEMORY_METER_COMPRESSED] = "compressed memory, like zswap on linux"
 #endif
@@ -506,7 +536,11 @@ void Platform_getFileDescriptors(double* used, double* max) {
 }
 
 bool Platform_getDiskIO(DiskIOData* data) {
-
+#if TARGET_OS_IPHONE
+   /* IOKit not available on iOS */
+   (void)data;
+   return false;
+#else
    io_iterator_t drive_list;
 
    /* Get the list of all drives */
@@ -589,6 +623,7 @@ bool Platform_getDiskIO(DiskIOData* data) {
       IOObjectRelease(drive_list);
 
    return true;
+#endif
 }
 
 /* Caution: Given that interfaces are dynamic, and it is not possible to get statistics on interfaces that no longer exist,
@@ -656,6 +691,7 @@ void Platform_getBattery(double* percent, ACPresence* isOnAC) {
    *percent = NAN;
    *isOnAC = AC_ERROR;
 
+#if !TARGET_OS_IPHONE
    CFArrayRef list = NULL;
 
    CFTypeRef power_sources = IOPSCopyPowerSourcesInfo();
@@ -705,6 +741,7 @@ void Platform_getBattery(double* percent, ACPresence* isOnAC) {
 
    if (power_sources)
       CFRelease(power_sources);
+#endif
 }
 
 void Platform_gettime_monotonic(uint64_t* msec) {