xnu-6153.11.26.tar.gz

[apple/xnu.git] / libsyscall / wrappers / libproc / libproc.c

diff --git a/libsyscall/wrappers/libproc/libproc.c b/libsyscall/wrappers/libproc/libproc.c
index fa0b8c16eea8f8b93742c65859aa9ba87f4e537c..8cf27b6ac87931e00fbd4ed0787326da0362b651 100644 (file)
--- a/libsyscall/wrappers/libproc/libproc.c
+++ b/libsyscall/wrappers/libproc/libproc.c
@@ -1,15 +1,15 @@
 /*
 /*

- * Copyright (c) 2006, 2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2018 Apple Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  *
  * @APPLE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * compliance with the License. Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this
  * file.
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * compliance with the License. Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this
  * file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -17,7 +17,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_LICENSE_HEADER_END@
  */
 
  * @APPLE_LICENSE_HEADER_END@
  */
 


@@ -26,11 +26,12 @@
 #include <errno.h>
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
 #include <string.h>
 #include <strings.h>

+#include <stdlib.h>

 #include <sys/errno.h>
 #include <sys/msgbuf.h>
 #include <sys/resource.h>
 #include <sys/errno.h>
 #include <sys/msgbuf.h>
 #include <sys/resource.h>

-#define BUILD_LIBSYSCALL 1

 #include <sys/process_policy.h>
 #include <sys/process_policy.h>

+#include <sys/event.h>

 #include <mach/message.h>
 
 #include "libproc_internal.h"
 #include <mach/message.h>
 
 #include "libproc_internal.h"


@@ -40,83 +41,130 @@ __private_extern__ int proc_setthreadname(void * buffer, int buffersize);
 int __process_policy(int scope, int action, int policy, int policy_subtype, proc_policy_attribute_t * attrp, pid_t target_pid, uint64_t target_threadid);
 int proc_rlimit_control(pid_t pid, int flavor, void *arg);
 
 int __process_policy(int scope, int action, int policy, int policy_subtype, proc_policy_attribute_t * attrp, pid_t target_pid, uint64_t target_threadid);
 int proc_rlimit_control(pid_t pid, int flavor, void *arg);
 

-int 
-proc_listpids(uint32_t type, uint32_t typeinfo, void *buffer, int buffersize) 
+int
+proc_listpids(uint32_t type, uint32_t typeinfo, void *buffer, int buffersize)

 {
        int retval;
 {
        int retval;

-       
+

        if ((type >= PROC_ALL_PIDS) || (type <= PROC_PPID_ONLY)) {
        if ((type >= PROC_ALL_PIDS) || (type <= PROC_PPID_ONLY)) {

-               if ((retval = __proc_info(PROC_INFO_CALL_LISTPIDS, type, typeinfo,(uint64_t)0, buffer, buffersize)) == -1)
-                       return(0);
+               if ((retval = __proc_info(PROC_INFO_CALL_LISTPIDS, type, typeinfo, (uint64_t)0, buffer, buffersize)) == -1) {
+                       return 0;
+               }

        } else {
                errno = EINVAL;
                retval = 0;
        }
        } else {
                errno = EINVAL;
                retval = 0;
        }

-       return(retval);
+       return retval;

 }
 
 
 }
 
 

-int 
+int

 proc_listallpids(void * buffer, int buffersize)
 {
        int numpids;
        numpids = proc_listpids(PROC_ALL_PIDS, (uint32_t)0, buffer, buffersize);
 
 proc_listallpids(void * buffer, int buffersize)
 {
        int numpids;
        numpids = proc_listpids(PROC_ALL_PIDS, (uint32_t)0, buffer, buffersize);
 

-       if (numpids == -1)
-               return(-1);
-       else
-               return(numpids/sizeof(int));
+       if (numpids == -1) {
+               return -1;
+       } else {
+               return numpids / sizeof(int);
+       }

 }
 
 }
 

-int 
+int

 proc_listpgrppids(pid_t pgrpid, void * buffer, int buffersize)
 {
        int numpids;
        numpids = proc_listpids(PROC_PGRP_ONLY, (uint32_t)pgrpid, buffer, buffersize);
 proc_listpgrppids(pid_t pgrpid, void * buffer, int buffersize)
 {
        int numpids;
        numpids = proc_listpids(PROC_PGRP_ONLY, (uint32_t)pgrpid, buffer, buffersize);

-       if (numpids == -1)
-               return(-1);
-       else
-               return(numpids/sizeof(int));
+       if (numpids == -1) {
+               return -1;
+       } else {
+               return numpids / sizeof(int);
+       }

 }
 
 }
 

-int 
+int

 proc_listchildpids(pid_t ppid, void * buffer, int buffersize)
 {
        int numpids;
        numpids = proc_listpids(PROC_PPID_ONLY, (uint32_t)ppid, buffer, buffersize);
 proc_listchildpids(pid_t ppid, void * buffer, int buffersize)
 {
        int numpids;
        numpids = proc_listpids(PROC_PPID_ONLY, (uint32_t)ppid, buffer, buffersize);

-       if (numpids == -1)
-               return(-1);
-       else
-               return(numpids/sizeof(int));
+       if (numpids == -1) {
+               return -1;
+       } else {
+               return numpids / sizeof(int);
+       }

 }
 
 
 }
 
 

-int 
-proc_pidinfo(int pid, int flavor, uint64_t arg,  void *buffer, int buffersize)
+int
+proc_pidinfo(int pid, int flavor, uint64_t arg, void *buffer, int buffersize)
+{
+       int retval;
+
+       if ((retval = __proc_info(PROC_INFO_CALL_PIDINFO, pid, flavor, arg, buffer, buffersize)) == -1) {
+               return 0;
+       }
+
+       return retval;
+}
+
+
+int
+proc_pidoriginatorinfo(int flavor, void *buffer, int buffersize)
+{
+       int retval;
+
+       if ((retval = __proc_info(PROC_INFO_CALL_PIDORIGINATORINFO, getpid(), flavor, 0, buffer, buffersize)) == -1) {
+               return 0;
+       }
+
+       return retval;
+}
+
+int
+proc_listcoalitions(int flavor, int coaltype, void *buffer, int buffersize)

 {
        int retval;
 
 {
        int retval;
 

-       if ((retval = __proc_info(PROC_INFO_CALL_PIDINFO, pid, flavor,  arg,  buffer, buffersize)) == -1)
-               return(0);
-               
-       return(retval);
+       if ((retval = __proc_info(PROC_INFO_CALL_LISTCOALITIONS, flavor, coaltype, 0, buffer, buffersize)) == -1) {
+               return 0;
+       }
+
+       return retval;

 }
 
 int
 proc_pid_rusage(int pid, int flavor, rusage_info_t *buffer)
 {
 }
 
 int
 proc_pid_rusage(int pid, int flavor, rusage_info_t *buffer)
 {

-       return (__proc_info(PROC_INFO_CALL_PIDRUSAGE, pid, flavor, 0, buffer, 0));
+       return __proc_info(PROC_INFO_CALL_PIDRUSAGE, pid, flavor, 0, buffer, 0);

 }
 
 }
 

-int    
+int
+proc_setthread_cpupercent(uint8_t percentage, uint32_t ms_refill)
+{
+       uint32_t arg = 0;
+
+       /* Pack percentage and refill into a 32-bit number to match existing kernel implementation */
+       if ((percentage >= 100) || (ms_refill & ~0xffffffU)) {
+               errno = EINVAL;
+               return -1;
+       }
+
+       arg = ((ms_refill << 8) | percentage);
+
+       return proc_rlimit_control(-1, RLIMIT_THREAD_CPULIMITS, (void *)(uintptr_t)arg);
+}
+
+int

 proc_pidfdinfo(int pid, int fd, int flavor, void * buffer, int buffersize)
 {
        int retval;
 
 proc_pidfdinfo(int pid, int fd, int flavor, void * buffer, int buffersize)
 {
        int retval;
 

-       if ((retval = __proc_info(PROC_INFO_CALL_PIDFDINFO, pid,  flavor, (uint64_t)fd, buffer, buffersize)) == -1)
-               return(0);
-               
-       return (retval);
+       if ((retval = __proc_info(PROC_INFO_CALL_PIDFDINFO, pid, flavor, (uint64_t)fd, buffer, buffersize)) == -1) {
+               return 0;
+       }
+
+       return retval;

 }
 
 
 }
 
 


@@ -125,22 +173,40 @@ proc_pidfileportinfo(int pid, uint32_t fileport, int flavor, void *buffer, int b
 {
        int retval;
 
 {
        int retval;
 

-       if ((retval = __proc_info(PROC_INFO_CALL_PIDFILEPORTINFO, pid, flavor, (uint64_t)fileport, buffer, buffersize)) == -1)
-               return (0);
-       return (retval);
+       if ((retval = __proc_info(PROC_INFO_CALL_PIDFILEPORTINFO, pid, flavor, (uint64_t)fileport, buffer, buffersize)) == -1) {
+               return 0;
+       }
+       return retval;

 }
 
 }
 

+int
+proc_piddynkqueueinfo(int pid, int flavor, kqueue_id_t kq_id, void *buffer, int buffersize)
+{
+       int ret;
+
+       if ((ret = __proc_info(PROC_INFO_CALL_PIDDYNKQUEUEINFO, pid, flavor, (uint64_t)kq_id, buffer, buffersize)) == -1) {
+               return 0;
+       }
+
+       return ret;
+}
+
+int
+proc_udata_info(int pid, int flavor, void *buffer, int buffersize)
+{
+       return __proc_info(PROC_INFO_CALL_UDATA_INFO, pid, flavor, 0, buffer, buffersize);
+}

 
 int
 proc_name(int pid, void * buffer, uint32_t buffersize)
 {
        int retval = 0, len;
        struct proc_bsdinfo pbsd;
 
 int
 proc_name(int pid, void * buffer, uint32_t buffersize)
 {
        int retval = 0, len;
        struct proc_bsdinfo pbsd;

-       
-       
+
+

        if (buffersize < sizeof(pbsd.pbi_name)) {
                errno = ENOMEM;
        if (buffersize < sizeof(pbsd.pbi_name)) {
                errno = ENOMEM;

-               return(0);
+               return 0;

        }
 
        retval = proc_pidinfo(pid, PROC_PIDTBSDINFO, (uint64_t)0, &pbsd, sizeof(struct proc_bsdinfo));
        }
 
        retval = proc_pidinfo(pid, PROC_PIDTBSDINFO, (uint64_t)0, &pbsd, sizeof(struct proc_bsdinfo));


@@ -150,36 +216,28 @@ proc_name(int pid, void * buffer, uint32_t buffersize)
                } else {
                        bcopy(&pbsd.pbi_comm, buffer, sizeof(pbsd.pbi_comm));
                }
                } else {
                        bcopy(&pbsd.pbi_comm, buffer, sizeof(pbsd.pbi_comm));
                }

-               len = strlen(buffer);
-               return(len);
+               len = (int)strlen(buffer);
+               return len;

        }
        }

-       return(0);
+       return 0;

 }
 
 }
 

-int 
+int

 proc_regionfilename(int pid, uint64_t address, void * buffer, uint32_t buffersize)
 {
 proc_regionfilename(int pid, uint64_t address, void * buffer, uint32_t buffersize)
 {

-       int retval = 0, len;
-       struct proc_regionwithpathinfo reginfo;
-       
+       int retval;
+       struct proc_regionpath path;
+

        if (buffersize < MAXPATHLEN) {
                errno = ENOMEM;
        if (buffersize < MAXPATHLEN) {
                errno = ENOMEM;

-               return(0);
+               return 0;

        }
        }

-       
-       retval = proc_pidinfo(pid, PROC_PIDREGIONPATHINFO, (uint64_t)address, &reginfo, sizeof(struct proc_regionwithpathinfo));
+
+       retval = proc_pidinfo(pid, PROC_PIDREGIONPATH, (uint64_t)address, &path, sizeof(struct proc_regionpath));

        if (retval != -1) {
        if (retval != -1) {

-               len = strlen(&reginfo.prp_vip.vip_path[0]);
-               if (len != 0) {
-                       if (len > MAXPATHLEN)
-                               len = MAXPATHLEN;
-                       bcopy(&reginfo.prp_vip.vip_path[0], buffer, len);
-                       return(len);
-               }
-               return(0);
+               return (int)(strlcpy(buffer, path.prpo_path, buffersize));

        }
        }

-       return(0);
-                       
+       return 0;

 }
 
 int
 }
 
 int


@@ -187,9 +245,10 @@ proc_kmsgbuf(void * buffer, uint32_t  buffersize)
 {
        int retval;
 
 {
        int retval;
 

-       if ((retval = __proc_info(PROC_INFO_CALL_KERNMSGBUF, 0,  0, (uint64_t)0, buffer, buffersize)) == -1)
-               return(0);
-       return (retval);
+       if ((retval = __proc_info(PROC_INFO_CALL_KERNMSGBUF, 0, 0, (uint64_t)0, buffer, buffersize)) == -1) {
+               return 0;
+       }
+       return retval;

 }
 
 int
 }
 
 int


@@ -199,45 +258,48 @@ proc_pidpath(int pid, void * buffer, uint32_t  buffersize)
 
        if (buffersize < PROC_PIDPATHINFO_SIZE) {
                errno = ENOMEM;
 
        if (buffersize < PROC_PIDPATHINFO_SIZE) {
                errno = ENOMEM;

-               return(0);
+               return 0;

        }
        }

-       if (buffersize >  PROC_PIDPATHINFO_MAXSIZE) {
+       if (buffersize > PROC_PIDPATHINFO_MAXSIZE) {

                errno = EOVERFLOW;
                errno = EOVERFLOW;

-               return(0);
+               return 0;

        }
 
        }
 

-       retval = __proc_info(PROC_INFO_CALL_PIDINFO, pid, PROC_PIDPATHINFO,  (uint64_t)0,  buffer, buffersize);
+       retval = __proc_info(PROC_INFO_CALL_PIDINFO, pid, PROC_PIDPATHINFO, (uint64_t)0, buffer, buffersize);

        if (retval != -1) {
        if (retval != -1) {

-               len = strlen(buffer);
-               return(len);
+               len = (int)strlen(buffer);
+               return len;

        }
        }

-       return (0);
+       return 0;

 }
 
 
 }
 
 

-int 
+int

 proc_libversion(int *major, int * minor)
 {
 proc_libversion(int *major, int * minor)
 {

-
-       if (major != NULL)
+       if (major != NULL) {

                *major = 1;
                *major = 1;

-       if (minor != NULL)
+       }
+       if (minor != NULL) {

                *minor = 1;
                *minor = 1;

-       return(0);
+       }
+       return 0;

 }
 
 int
 proc_setpcontrol(const int control)
 {
 }
 
 int
 proc_setpcontrol(const int control)
 {

-       int retval ;
+       int retval;
+
+       if (control < PROC_SETPC_NONE || control > PROC_SETPC_TERMINATE) {
+               return EINVAL;
+       }

 
 

-       if (control < PROC_SETPC_NONE || control > PROC_SETPC_TERMINATE)
-               return(EINVAL);
+       if ((retval = __proc_info(PROC_INFO_CALL_SETCONTROL, getpid(), PROC_SELFSET_PCONTROL, (uint64_t)control, NULL, 0)) == -1) {
+               return errno;
+       }

 
 

-       if ((retval = __proc_info(PROC_INFO_CALL_SETCONTROL, getpid(), PROC_SELFSET_PCONTROL, (uint64_t)control, NULL, 0)) == -1)
-               return(errno);
-               
-       return(0);
+       return 0;

 }
 
 
 }
 
 


@@ -246,12 +308,13 @@ proc_setthreadname(void * buffer, int buffersize)
 {
        int retval;
 
 {
        int retval;
 

-        retval = __proc_info(PROC_INFO_CALL_SETCONTROL, getpid(), PROC_SELFSET_THREADNAME, (uint64_t)0, buffer, buffersize);
+       retval = __proc_info(PROC_INFO_CALL_SETCONTROL, getpid(), PROC_SELFSET_THREADNAME, (uint64_t)0, buffer, buffersize);

 
 

-       if (retval == -1)
-                return(errno);
-       else
-               return(0);
+       if (retval == -1) {
+               return errno;
+       } else {
+               return 0;
+       }

 }
 
 int
 }
 
 int


@@ -260,7 +323,7 @@ proc_track_dirty(pid_t pid, uint32_t flags)
        if (__proc_info(PROC_INFO_CALL_DIRTYCONTROL, pid, PROC_DIRTYCONTROL_TRACK, flags, NULL, 0) == -1) {
                return errno;
        }
        if (__proc_info(PROC_INFO_CALL_DIRTYCONTROL, pid, PROC_DIRTYCONTROL_TRACK, flags, NULL, 0) == -1) {
                return errno;
        }

-               
+

        return 0;
 }
 
        return 0;
 }
 


@@ -268,7 +331,7 @@ int
 proc_set_dirty(pid_t pid, bool dirty)
 {
        if (__proc_info(PROC_INFO_CALL_DIRTYCONTROL, pid, PROC_DIRTYCONTROL_SET, dirty, NULL, 0) == -1) {
 proc_set_dirty(pid_t pid, bool dirty)
 {
        if (__proc_info(PROC_INFO_CALL_DIRTYCONTROL, pid, PROC_DIRTYCONTROL_SET, dirty, NULL, 0) == -1) {

-               return errno;           
+               return errno;

        }
 
        return 0;
        }
 
        return 0;


@@ -278,52 +341,72 @@ int
 proc_get_dirty(pid_t pid, uint32_t *flags)
 {
        int retval;
 proc_get_dirty(pid_t pid, uint32_t *flags)
 {
        int retval;

-       
+

        if (!flags) {
                return EINVAL;
        }
        if (!flags) {
                return EINVAL;
        }

-       
+

        retval = __proc_info(PROC_INFO_CALL_DIRTYCONTROL, pid, PROC_DIRTYCONTROL_GET, 0, NULL, 0);
        if (retval == -1) {
        retval = __proc_info(PROC_INFO_CALL_DIRTYCONTROL, pid, PROC_DIRTYCONTROL_GET, 0, NULL, 0);
        if (retval == -1) {

-               return errno;           
+               return errno;

        }
        }

-       
+

        *flags = retval;
 
        return 0;
 }
 
        *flags = retval;
 
        return 0;
 }
 

+int
+proc_clear_dirty(pid_t pid, uint32_t flags)
+{
+       if (__proc_info(PROC_INFO_CALL_DIRTYCONTROL, pid, PROC_DIRTYCONTROL_CLEAR, flags, NULL, 0) == -1) {
+               return errno;
+       }
+
+       return 0;
+}
+

 int
 proc_terminate(pid_t pid, int *sig)
 {
        int retval;
 int
 proc_terminate(pid_t pid, int *sig)
 {
        int retval;

-       
+

        if (!sig) {
                return EINVAL;
        }
        if (!sig) {
                return EINVAL;
        }

-       
+

        retval = __proc_info(PROC_INFO_CALL_TERMINATE, pid, 0, 0, NULL, 0);
        if (retval == -1) {
        retval = __proc_info(PROC_INFO_CALL_TERMINATE, pid, 0, 0, NULL, 0);
        if (retval == -1) {

-               return errno;           
+               return errno;

        }
        }

-       
+

        *sig = retval;
        *sig = retval;

-       
+

        return 0;
 }
 
        return 0;
 }
 

+/*
+ * XXX the _fatal() variant both checks for an existing monitor
+ * (with important policy effects on first party background apps)
+ * and validates inputs.
+ */

 int
 proc_set_cpumon_params(pid_t pid, int percentage, int interval)
 {
        proc_policy_cpuusage_attr_t attr;
 
 int
 proc_set_cpumon_params(pid_t pid, int percentage, int interval)
 {
        proc_policy_cpuusage_attr_t attr;
 

+       /* no argument validation ...
+        * task_set_cpuusage() ignores 0 values and squashes negative
+        * values into uint32_t.
+        */
+

        attr.ppattr_cpu_attr = PROC_POLICY_RSRCACT_NOTIFY_EXC;
        attr.ppattr_cpu_percentage = percentage;
        attr.ppattr_cpu_attr_interval = (uint64_t)interval;
        attr.ppattr_cpu_attr_deadline = 0;
 
        attr.ppattr_cpu_attr = PROC_POLICY_RSRCACT_NOTIFY_EXC;
        attr.ppattr_cpu_percentage = percentage;
        attr.ppattr_cpu_attr_interval = (uint64_t)interval;
        attr.ppattr_cpu_attr_deadline = 0;
 

-       return(__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_SET, PROC_POLICY_RESOURCE_USAGE,
-               PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, 0));
+       return __process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_SET, PROC_POLICY_RESOURCE_USAGE,
+                  PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, 0);

 }
 
 int
 }
 
 int


@@ -333,17 +416,17 @@ proc_get_cpumon_params(pid_t pid, int *percentage, int *interval)
        int ret;
 
        ret = __process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_GET, PROC_POLICY_RESOURCE_USAGE,
        int ret;
 
        ret = __process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_GET, PROC_POLICY_RESOURCE_USAGE,

-               PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, 0);
+           PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, 0);

 
        if ((ret == 0) && (attr.ppattr_cpu_attr == PROC_POLICY_RSRCACT_NOTIFY_EXC)) {
                *percentage = attr.ppattr_cpu_percentage;
 
        if ((ret == 0) && (attr.ppattr_cpu_attr == PROC_POLICY_RSRCACT_NOTIFY_EXC)) {
                *percentage = attr.ppattr_cpu_percentage;

-               *interval = attr.ppattr_cpu_attr_interval;
+               *interval = (int)attr.ppattr_cpu_attr_interval;

        } else {
                *percentage = 0;
                *interval = 0;
        }
 
        } else {
                *percentage = 0;
                *interval = 0;
        }
 

-       return (ret);
+       return ret;

 }
 
 int
 }
 
 int


@@ -356,8 +439,18 @@ proc_set_cpumon_defaults(pid_t pid)
        attr.ppattr_cpu_attr_interval = 0;
        attr.ppattr_cpu_attr_deadline = 0;
 
        attr.ppattr_cpu_attr_interval = 0;
        attr.ppattr_cpu_attr_deadline = 0;
 

-       return(__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_SET, PROC_POLICY_RESOURCE_USAGE,
-               PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, 0));
+       return __process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_SET, PROC_POLICY_RESOURCE_USAGE,
+                  PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, 0);
+}
+
+int
+proc_resume_cpumon(pid_t pid)
+{
+       return __process_policy(PROC_POLICY_SCOPE_PROCESS,
+                  PROC_POLICY_ACTION_ENABLE,
+                  PROC_POLICY_RESOURCE_USAGE,
+                  PROC_POLICY_RUSAGE_CPU,
+                  NULL, pid, 0);

 }
 
 int
 }
 
 int


@@ -370,8 +463,61 @@ proc_disable_cpumon(pid_t pid)
        attr.ppattr_cpu_attr_interval = 0;
        attr.ppattr_cpu_attr_deadline = 0;
 
        attr.ppattr_cpu_attr_interval = 0;
        attr.ppattr_cpu_attr_deadline = 0;
 

-       return(__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_SET, PROC_POLICY_RESOURCE_USAGE,
-               PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, 0));
+       return __process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_SET, PROC_POLICY_RESOURCE_USAGE,
+                  PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, 0);
+}
+
+
+/*
+ * Turn on the CPU usage monitor using the supplied parameters, and make
+ * violations of the monitor fatal.
+ *
+ * Returns:  0 on success;
+ *         -1 on failure and sets errno
+ */
+int
+proc_set_cpumon_params_fatal(pid_t pid, int percentage, int interval)
+{
+       int current_percentage = 0;
+       int current_interval = 0;   /* intervals are in seconds */
+       int ret = 0;
+
+       if ((percentage <= 0) || (interval <= 0)) {
+               errno = EINVAL;
+               return -1;
+       }
+
+       /*
+        * Do a simple query to see if CPU monitoring is
+        * already active.  If either the percentage or the
+        * interval is nonzero, then CPU monitoring is
+        * already in use for this process.
+        *
+        * XXX: need set...() and set..fatal() to behave similarly.
+        * Currently, this check prevents 1st party apps (which get a
+        * default non-fatal monitor) not to get a fatal monitor.
+        */
+       (void)proc_get_cpumon_params(pid, &current_percentage, &current_interval);
+       if (current_percentage || current_interval) {
+               /*
+                * The CPU monitor appears to be active.
+                * We choose not to disturb those settings.
+                */
+               errno = EBUSY;
+               return -1;
+       }
+
+       if ((ret = proc_set_cpumon_params(pid, percentage, interval)) != 0) {
+               /* Failed to activate the CPU monitor */
+               return ret;
+       }
+
+       if ((ret = proc_rlimit_control(pid, RLIMIT_CPU_USAGE_MONITOR, (void *)(uintptr_t)CPUMON_MAKE_FATAL)) != 0) {
+               /* Failed to set termination, back out the CPU monitor settings. */
+               (void)proc_disable_cpumon(pid);
+       }
+
+       return ret;

 }
 
 int
 }
 
 int


@@ -382,7 +528,7 @@ proc_set_wakemon_params(pid_t pid, int rate_hz, int flags __unused)
        params.wm_flags = WAKEMON_ENABLE;
        params.wm_rate = rate_hz;
 
        params.wm_flags = WAKEMON_ENABLE;
        params.wm_rate = rate_hz;
 

-       return (proc_rlimit_control(pid, RLIMIT_WAKEUPS_MONITOR, &params));
+       return proc_rlimit_control(pid, RLIMIT_WAKEUPS_MONITOR, &params);

 }
 
 #ifndef WAKEMON_GET_PARAMS
 }
 
 #ifndef WAKEMON_GET_PARAMS


@@ -399,13 +545,13 @@ proc_get_wakemon_params(pid_t pid, int *rate_hz, int *flags)
        params.wm_flags = WAKEMON_GET_PARAMS;
 
        if ((error = proc_rlimit_control(pid, RLIMIT_WAKEUPS_MONITOR, &params)) != 0) {
        params.wm_flags = WAKEMON_GET_PARAMS;
 
        if ((error = proc_rlimit_control(pid, RLIMIT_WAKEUPS_MONITOR, &params)) != 0) {

-               return (error);
+               return error;

        }
 
        *rate_hz = params.wm_rate;
        *flags = params.wm_flags;
 
        }
 
        *rate_hz = params.wm_rate;
        *flags = params.wm_flags;
 

-       return (0);
+       return 0;

 }
 
 int
 }
 
 int


@@ -416,7 +562,7 @@ proc_set_wakemon_defaults(pid_t pid)
        params.wm_flags = WAKEMON_ENABLE | WAKEMON_SET_DEFAULTS;
        params.wm_rate = -1;
 
        params.wm_flags = WAKEMON_ENABLE | WAKEMON_SET_DEFAULTS;
        params.wm_rate = -1;
 

-       return (proc_rlimit_control(pid, RLIMIT_WAKEUPS_MONITOR, &params));
+       return proc_rlimit_control(pid, RLIMIT_WAKEUPS_MONITOR, &params);

 }
 
 int
 }
 
 int


@@ -427,13 +573,25 @@ proc_disable_wakemon(pid_t pid)
        params.wm_flags = WAKEMON_DISABLE;
        params.wm_rate = -1;
 
        params.wm_flags = WAKEMON_DISABLE;
        params.wm_rate = -1;
 

-       return (proc_rlimit_control(pid, RLIMIT_WAKEUPS_MONITOR, &params));
+       return proc_rlimit_control(pid, RLIMIT_WAKEUPS_MONITOR, &params);

 }
 
 }
 

+int
+proc_list_uptrs(int pid, uint64_t *buf, uint32_t bufsz)
+{
+       return __proc_info(PROC_INFO_CALL_PIDINFO, pid, PROC_PIDLISTUPTRS, 0,
+                  buf, bufsz);
+}

 
 

-#if TARGET_OS_EMBEDDED
+int
+proc_list_dynkqueueids(int pid, kqueue_id_t *buf, uint32_t bufsz)
+{
+       return __proc_info(PROC_INFO_CALL_PIDINFO, pid, PROC_PIDLISTDYNKQUEUES, 0,
+                  buf, bufsz);
+}

 
 

-int 
+
+int

 proc_setcpu_percentage(pid_t pid, int action, int percentage)
 {
        proc_policy_cpuusage_attr_t attr;
 proc_setcpu_percentage(pid_t pid, int action, int percentage)
 {
        proc_policy_cpuusage_attr_t attr;


@@ -441,12 +599,31 @@ proc_setcpu_percentage(pid_t pid, int action, int percentage)
        bzero(&attr, sizeof(proc_policy_cpuusage_attr_t));
        attr.ppattr_cpu_attr = action;
        attr.ppattr_cpu_percentage = percentage;
        bzero(&attr, sizeof(proc_policy_cpuusage_attr_t));
        attr.ppattr_cpu_attr = action;
        attr.ppattr_cpu_percentage = percentage;

-       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_RESOURCE_USAGE, PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, (uint64_t)0) != -1)
-               return(0);
-       else
-               return(errno);
+       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_RESOURCE_USAGE, PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, (uint64_t)0) != -1) {
+               return 0;
+       } else {
+               return errno;
+       }
+}
+
+int
+proc_reset_footprint_interval(pid_t pid)
+{
+       return proc_rlimit_control(pid, RLIMIT_FOOTPRINT_INTERVAL, (void *)(uintptr_t)FOOTPRINT_INTERVAL_RESET);

 }
 
 }
 

+int
+proc_clear_cpulimits(pid_t pid)
+{
+       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_RESTORE, PROC_POLICY_RESOURCE_USAGE, PROC_POLICY_RUSAGE_CPU, NULL, pid, (uint64_t)0) != -1) {
+               return 0;
+       } else {
+               return errno;
+       }
+}
+
+#if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
+

 int
 proc_setcpu_deadline(pid_t pid, int action, uint64_t deadline)
 {
 int
 proc_setcpu_deadline(pid_t pid, int action, uint64_t deadline)
 {


@@ -455,14 +632,13 @@ proc_setcpu_deadline(pid_t pid, int action, uint64_t deadline)
        bzero(&attr, sizeof(proc_policy_cpuusage_attr_t));
        attr.ppattr_cpu_attr = action;
        attr.ppattr_cpu_attr_deadline = deadline;
        bzero(&attr, sizeof(proc_policy_cpuusage_attr_t));
        attr.ppattr_cpu_attr = action;
        attr.ppattr_cpu_attr_deadline = deadline;

-       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_RESOURCE_USAGE, PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, (uint64_t)0) != -1)
-               return(0);
-       else
-               return(errno);
-
+       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_RESOURCE_USAGE, PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, (uint64_t)0) != -1) {
+               return 0;
+       } else {
+               return errno;
+       }

 }
 
 }
 

-

 int
 proc_setcpu_percentage_withdeadline(pid_t pid, int action, int percentage, uint64_t deadline)
 {
 int
 proc_setcpu_percentage_withdeadline(pid_t pid, int action, int percentage, uint64_t deadline)
 {


@@ -472,21 +648,11 @@ proc_setcpu_percentage_withdeadline(pid_t pid, int action, int percentage, uint6
        attr.ppattr_cpu_attr = action;
        attr.ppattr_cpu_percentage = percentage;
        attr.ppattr_cpu_attr_deadline = deadline;
        attr.ppattr_cpu_attr = action;
        attr.ppattr_cpu_percentage = percentage;
        attr.ppattr_cpu_attr_deadline = deadline;

-       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_RESOURCE_USAGE, PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, (uint64_t)0) != -1)
-               return(0);
-       else
-               return(errno);
-}
-
-int
-proc_clear_cpulimits(pid_t pid)
-{
-       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_RESTORE, PROC_POLICY_RESOURCE_USAGE, PROC_POLICY_RUSAGE_CPU, NULL, pid, (uint64_t)0) != -1)
-               return(0);
-       else
-               return(errno);
-
-
+       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_RESOURCE_USAGE, PROC_POLICY_RUSAGE_CPU, (proc_policy_attribute_t*)&attr, pid, (uint64_t)0) != -1) {
+               return 0;
+       } else {
+               return errno;
+       }

 }
 
 int
 }
 
 int


@@ -495,117 +661,128 @@ proc_appstate(int pid, int * appstatep)
        int state;
 
        if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_GET, PROC_POLICY_APP_LIFECYCLE, PROC_POLICY_APPLIFE_STATE, (proc_policy_attribute_t*)&state, pid, (uint64_t)0) != -1) {
        int state;
 
        if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_GET, PROC_POLICY_APP_LIFECYCLE, PROC_POLICY_APPLIFE_STATE, (proc_policy_attribute_t*)&state, pid, (uint64_t)0) != -1) {

-               if (appstatep != NULL)
+               if (appstatep != NULL) {

                        *appstatep = state;
                        *appstatep = state;

-               return(0);
-        } else
-               return(errno);
-
+               }
+               return 0;
+       } else {
+               return errno;
+       }

 }
 
 }
 

-

 int
 proc_setappstate(int pid, int appstate)
 {
        int state = appstate;
 
        switch (state) {
 int
 proc_setappstate(int pid, int appstate)
 {
        int state = appstate;
 
        switch (state) {

-               case PROC_APPSTATE_NONE:
-               case PROC_APPSTATE_ACTIVE:
-               case PROC_APPSTATE_INACTIVE:
-               case PROC_APPSTATE_BACKGROUND:
-               case PROC_APPSTATE_NONUI:
-                       break;
-               default:
-                       return(EINVAL);
-       }
-       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_APP_LIFECYCLE, PROC_POLICY_APPLIFE_STATE, (proc_policy_attribute_t*)&state, pid, (uint64_t)0) != -1)
-               return(0);
-       else
-               return(errno);
-}
-
-int 
+       case PROC_APPSTATE_NONE:
+       case PROC_APPSTATE_ACTIVE:
+       case PROC_APPSTATE_INACTIVE:
+       case PROC_APPSTATE_BACKGROUND:
+       case PROC_APPSTATE_NONUI:
+               break;
+       default:
+               return EINVAL;
+       }
+       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_APP_LIFECYCLE, PROC_POLICY_APPLIFE_STATE, (proc_policy_attribute_t*)&state, pid, (uint64_t)0) != -1) {
+               return 0;
+       } else {
+               return errno;
+       }
+}
+
+int

 proc_devstatusnotify(int devicestatus)
 {
        int state = devicestatus;
 
        switch (devicestatus) {
 proc_devstatusnotify(int devicestatus)
 {
        int state = devicestatus;
 
        switch (devicestatus) {

-               case PROC_DEVSTATUS_SHORTTERM:
-               case PROC_DEVSTATUS_LONGTERM:
-                       break;
-               default:
-                       return(EINVAL);
+       case PROC_DEVSTATUS_SHORTTERM:
+       case PROC_DEVSTATUS_LONGTERM:
+               break;
+       default:
+               return EINVAL;

        }
 
        if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_APP_LIFECYCLE, PROC_POLICY_APPLIFE_DEVSTATUS, (proc_policy_attribute_t*)&state, getpid(), (uint64_t)0) != -1) {
        }
 
        if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_APP_LIFECYCLE, PROC_POLICY_APPLIFE_DEVSTATUS, (proc_policy_attribute_t*)&state, getpid(), (uint64_t)0) != -1) {

-               return(0);
-        } else
-               return(errno);
-
+               return 0;
+       } else {
+               return errno;
+       }

 }
 
 int
 proc_pidbind(int pid, uint64_t threadid, int bind)
 {
 }
 
 int
 proc_pidbind(int pid, uint64_t threadid, int bind)
 {

-       int state = bind; 
+       int state = bind;

        pid_t passpid = pid;
 
        switch (bind) {
        pid_t passpid = pid;
 
        switch (bind) {

-               case PROC_PIDBIND_CLEAR:
-                       passpid = getpid();     /* ignore pid on clear */
-                       break;
-               case PROC_PIDBIND_SET:
-                       break;
-               default:
-                       return(EINVAL);
+       case PROC_PIDBIND_CLEAR:
+               passpid = getpid();             /* ignore pid on clear */
+               break;
+       case PROC_PIDBIND_SET:
+               break;
+       default:
+               return EINVAL;
+       }
+       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_APP_LIFECYCLE, PROC_POLICY_APPLIFE_PIDBIND, (proc_policy_attribute_t*)&state, passpid, threadid) != -1) {
+               return 0;
+       } else {
+               return errno;

        }
        }

-       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_APPLY, PROC_POLICY_APP_LIFECYCLE, PROC_POLICY_APPLIFE_PIDBIND, (proc_policy_attribute_t*)&state, passpid, threadid) != -1)
-               return(0);
-       else
-               return(errno);

 }
 }

-#endif /* TARGET_OS_EMBEDDED */
+
+int
+proc_can_use_foreground_hw(int pid, uint32_t *reason)
+{
+       return __proc_info(PROC_INFO_CALL_CANUSEFGHW, pid, 0, 0, reason, sizeof(*reason));
+}
+#endif /* (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) */

 
 
 /* Donate importance to adaptive processes from this process */
 
 
 /* Donate importance to adaptive processes from this process */

-int 
+int

 proc_donate_importance_boost()
 {
        int rval;
 
 proc_donate_importance_boost()
 {
        int rval;
 

-#if TARGET_OS_EMBEDDED
+#if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)

        rval = __process_policy(PROC_POLICY_SCOPE_PROCESS,
        rval = __process_policy(PROC_POLICY_SCOPE_PROCESS,

-                                                       PROC_POLICY_ACTION_ENABLE,
-                                                       PROC_POLICY_APPTYPE,
-                                                       PROC_POLICY_IOS_DONATEIMP,
-                                                       NULL, getpid(), (uint64_t)0);
-#else /* TARGET_OS_EMBEDDED */
+           PROC_POLICY_ACTION_ENABLE,
+           PROC_POLICY_APPTYPE,
+           PROC_POLICY_IOS_DONATEIMP,
+           NULL, getpid(), (uint64_t)0);
+#else /* (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) */

        rval = __process_policy(PROC_POLICY_SCOPE_PROCESS,
        rval = __process_policy(PROC_POLICY_SCOPE_PROCESS,

-                                                       PROC_POLICY_ACTION_SET,
-                                                       PROC_POLICY_BOOST,
-                                                       PROC_POLICY_IMP_DONATION,
-                                                       NULL, getpid(), 0);
-#endif /* TARGET_OS_EMBEDDED */
-
-       if (rval == 0)
-               return (0);
-       else
-               return (errno);
+           PROC_POLICY_ACTION_SET,
+           PROC_POLICY_BOOST,
+           PROC_POLICY_IMP_DONATION,
+           NULL, getpid(), 0);
+#endif /* (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) */
+
+       if (rval == 0) {
+               return 0;
+       } else {
+               return errno;
+       }

 }
 
 static __attribute__((noinline)) void
 }
 
 static __attribute__((noinline)) void

-proc_importance_bad_assertion(char *reason) {
-    (void)reason;
+proc_importance_bad_assertion(char *reason)
+{
+       (void)reason;

 }
 
 }
 

-/* 
+/*

  * Use the address of these variables as the token.  This way, they can be
  * printed in the debugger as useful names.
  */
 uint64_t important_boost_assertion_token = 0xfafafafafafafafa;
 uint64_t normal_boost_assertion_token    = 0xfbfbfbfbfbfbfbfb;
 uint64_t non_boost_assertion_token       = 0xfcfcfcfcfcfcfcfc;
  * Use the address of these variables as the token.  This way, they can be
  * printed in the debugger as useful names.
  */
 uint64_t important_boost_assertion_token = 0xfafafafafafafafa;
 uint64_t normal_boost_assertion_token    = 0xfbfbfbfbfbfbfbfb;
 uint64_t non_boost_assertion_token       = 0xfcfcfcfcfcfcfcfc;

+uint64_t denap_boost_assertion_token     = 0xfdfdfdfdfdfdfdfd;

 
 /*
  * Accept the boost on a message, or request another boost assertion
 
 /*
  * Accept the boost on a message, or request another boost assertion


@@ -618,55 +795,48 @@ uint64_t non_boost_assertion_token       = 0xfcfcfcfcfcfcfcfc;
  */
 int
 proc_importance_assertion_begin_with_msg(mach_msg_header_t  *msg,
  */
 int
 proc_importance_assertion_begin_with_msg(mach_msg_header_t  *msg,

-                                __unused mach_msg_trailer_t *trailer,
-                                         uint64_t           *assertion_token)
+    __unused mach_msg_trailer_t *trailer,
+    uint64_t           *assertion_token)

 {
        int rval = 0;
 
 {
        int rval = 0;
 

-       if (assertion_token == NULL)
-               return (EINVAL);
-       
-       /* Is this a boosting message? */
-       if ((msg->msgh_bits & MACH_MSGH_BITS_RAISEIMP) != 0) {
+       if (assertion_token == NULL) {
+               return EINVAL;
+       }
+
+#define LEGACYBOOSTMASK (MACH_MSGH_BITS_VOUCHER_MASK | MACH_MSGH_BITS_RAISEIMP)
+#define LEGACYBOOSTED(m) (((m)->msgh_bits & LEGACYBOOSTMASK) == MACH_MSGH_BITS_RAISEIMP)

 
 

-               /* 
+       /* Is this a legacy boosted message? */
+       if (LEGACYBOOSTED(msg)) {
+               /*

                 * Have we accepted the implicit boost for this message yet?
                 * Have we accepted the implicit boost for this message yet?

-                * If we haven't accepted it yet, no need to call into kernel. 
+                * If we haven't accepted it yet, no need to call into kernel.

                 */
                if ((msg->msgh_bits & MACH_MSGH_BITS_IMPHOLDASRT) == 0) {
                        msg->msgh_bits |= MACH_MSGH_BITS_IMPHOLDASRT;
                        *assertion_token = (uint64_t) &important_boost_assertion_token;
                 */
                if ((msg->msgh_bits & MACH_MSGH_BITS_IMPHOLDASRT) == 0) {
                        msg->msgh_bits |= MACH_MSGH_BITS_IMPHOLDASRT;
                        *assertion_token = (uint64_t) &important_boost_assertion_token;

-                       return (0);
+                       return 0;

                }
 
                /* Request an additional boost count */
                }
 
                /* Request an additional boost count */

-
-#if TARGET_OS_EMBEDDED
-               rval = __process_policy(PROC_POLICY_SCOPE_PROCESS,
-                                                               PROC_POLICY_ACTION_ENABLE,
-                                                               PROC_POLICY_APPTYPE,
-                                                               PROC_POLICY_IOS_HOLDIMP,
-                                                               NULL, getpid(), 0);
-#else /* TARGET_OS_EMBEDDED */

                rval = __process_policy(PROC_POLICY_SCOPE_PROCESS,
                rval = __process_policy(PROC_POLICY_SCOPE_PROCESS,

-                                                               PROC_POLICY_ACTION_HOLD,
-                                                               PROC_POLICY_BOOST,
-                                                               PROC_POLICY_IMP_IMPORTANT,
-                                                               NULL, getpid(), 0);
-#endif /* TARGET_OS_EMBEDDED */
-
+                   PROC_POLICY_ACTION_HOLD,
+                   PROC_POLICY_BOOST,
+                   PROC_POLICY_IMP_IMPORTANT,
+                   NULL, getpid(), 0);

                if (rval == 0) {
                        *assertion_token = (uint64_t) &important_boost_assertion_token;
                if (rval == 0) {
                        *assertion_token = (uint64_t) &important_boost_assertion_token;

-                       return (0);
+                       return 0;

                } else if (errno == EOVERFLOW) {
                        proc_importance_bad_assertion("Attempted to take assertion while not boosted");
                } else if (errno == EOVERFLOW) {
                        proc_importance_bad_assertion("Attempted to take assertion while not boosted");

-                       return (errno);
+                       return errno;

                } else {
                } else {

-                       return (errno);
+                       return errno;

                }
        }
                }
        }

-       
-       return (EIO);
+
+       return EIO;

 }
 
 
 }
 
 


@@ -679,126 +849,150 @@ proc_importance_assertion_complete(uint64_t assertion_token)
 {
        int rval = 0;
 
 {
        int rval = 0;
 

-       if (assertion_token == 0)
-               return (0);
+       if (assertion_token == 0) {
+               return 0;
+       }

 
        if (assertion_token == (uint64_t) &important_boost_assertion_token) {
 
        if (assertion_token == (uint64_t) &important_boost_assertion_token) {

-
-#if TARGET_OS_EMBEDDED

                rval = __process_policy(PROC_POLICY_SCOPE_PROCESS,
                rval = __process_policy(PROC_POLICY_SCOPE_PROCESS,

-                                                               PROC_POLICY_ACTION_ENABLE,
-                                                               PROC_POLICY_APPTYPE,
-                                                               PROC_POLICY_IOS_DROPIMP,
-                                                               NULL, getpid(), 0);
-#else /* TARGET_OS_EMBEDDED */
-               rval = __process_policy(PROC_POLICY_SCOPE_PROCESS,
-                                                               PROC_POLICY_ACTION_DROP,
-                                                               PROC_POLICY_BOOST,
-                                                               PROC_POLICY_IMP_IMPORTANT,
-                                                               NULL, getpid(), 0);
-#endif /* TARGET_OS_EMBEDDED */
-               
+                   PROC_POLICY_ACTION_DROP,
+                   PROC_POLICY_BOOST,
+                   PROC_POLICY_IMP_IMPORTANT,
+                   NULL, getpid(), 0);

                if (rval == 0) {
                if (rval == 0) {

-                       return (0);
+                       return 0;

                } else if (errno == EOVERFLOW) {
                        proc_importance_bad_assertion("Attempted to drop too many assertions");
                } else if (errno == EOVERFLOW) {
                        proc_importance_bad_assertion("Attempted to drop too many assertions");

-                       return (errno);
+                       return errno;

                } else {
                } else {

-                       return (errno);
+                       return errno;

                }
        } else {
                proc_importance_bad_assertion("Attempted to drop assertion with invalid token");
                }
        } else {
                proc_importance_bad_assertion("Attempted to drop assertion with invalid token");

-               return (EIO);
+               return EIO;

        }
 }
 
        }
 }
 

-#if !TARGET_OS_EMBEDDED
+/*
+ * Accept the De-Nap boost on a message, or request another boost assertion
+ * if we have already accepted the implicit boost for this message.
+ *
+ * Interface is deprecated before it really got started - just as synonym
+ * for proc_importance_assertion_begin_with_msg() now.
+ */
+int
+proc_denap_assertion_begin_with_msg(mach_msg_header_t  *msg,
+    uint64_t           *assertion_token)
+{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+       return proc_importance_assertion_begin_with_msg(msg, NULL, assertion_token);
+#pragma clang diagnostic pop
+}
+
+
+/*
+ * Drop a denap boost assertion.
+ *
+ * Interface is deprecated before it really got started - just a synonym
+ * for proc_importance_assertion_complete() now.
+ */
+int
+proc_denap_assertion_complete(uint64_t assertion_token)
+{
+       return proc_importance_assertion_complete(assertion_token);
+}
+
+#if !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)

 
 int
 proc_clear_vmpressure(pid_t pid)
 {
 
 int
 proc_clear_vmpressure(pid_t pid)
 {

-       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_RESTORE, PROC_POLICY_RESOURCE_STARVATION, PROC_POLICY_RS_VIRTUALMEM, NULL, pid, (uint64_t)0) != -1)
-               return(0);
-       else
-               return(errno);
+       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_RESTORE, PROC_POLICY_RESOURCE_STARVATION, PROC_POLICY_RS_VIRTUALMEM, NULL, pid, (uint64_t)0) != -1) {
+               return 0;
+       } else {
+               return errno;
+       }

 }
 
 /* set the current process as one who can resume suspended processes due to low virtual memory. Need to be root */
 }
 
 /* set the current process as one who can resume suspended processes due to low virtual memory. Need to be root */

-int 
+int

 proc_set_owner_vmpressure(void)
 {
        int retval;
 
 proc_set_owner_vmpressure(void)
 {
        int retval;
 

-       if ((retval = __proc_info(PROC_INFO_CALL_SETCONTROL, getpid(), PROC_SELFSET_VMRSRCOWNER, (uint64_t)0, NULL, 0)) == -1)
-               return(errno);
-               
-       return(0);
+       if ((retval = __proc_info(PROC_INFO_CALL_SETCONTROL, getpid(), PROC_SELFSET_VMRSRCOWNER, (uint64_t)0, NULL, 0)) == -1) {
+               return errno;
+       }
+
+       return 0;

 }
 
 /* mark yourself to delay idle sleep on disk IO */
 }
 
 /* mark yourself to delay idle sleep on disk IO */

-int 
+int

 proc_set_delayidlesleep(void)
 {
        int retval;
 
 proc_set_delayidlesleep(void)
 {
        int retval;
 

-       if ((retval = __proc_info(PROC_INFO_CALL_SETCONTROL, getpid(), PROC_SELFSET_DELAYIDLESLEEP, (uint64_t)1, NULL, 0)) == -1)
-               return(errno);
+       if ((retval = __proc_info(PROC_INFO_CALL_SETCONTROL, getpid(), PROC_SELFSET_DELAYIDLESLEEP, (uint64_t)1, NULL, 0)) == -1) {
+               return errno;
+       }

 
 

-       return(0);
+       return 0;

 }
 
 /* Reset yourself to delay idle sleep on disk IO, if already set */
 }
 
 /* Reset yourself to delay idle sleep on disk IO, if already set */

-int 
+int

 proc_clear_delayidlesleep(void)
 {
        int retval;
 
 proc_clear_delayidlesleep(void)
 {
        int retval;
 

-       if ((retval = __proc_info(PROC_INFO_CALL_SETCONTROL, getpid(), PROC_SELFSET_DELAYIDLESLEEP, (uint64_t)0, NULL, 0)) == -1)
-               return(errno);
+       if ((retval = __proc_info(PROC_INFO_CALL_SETCONTROL, getpid(), PROC_SELFSET_DELAYIDLESLEEP, (uint64_t)0, NULL, 0)) == -1) {
+               return errno;
+       }

 
 

-       return(0);
+       return 0;

 }
 
 /* disable the launch time backgroudn policy and restore the process to default group */
 }
 
 /* disable the launch time backgroudn policy and restore the process to default group */

-int 
+int

 proc_disable_apptype(pid_t pid, int apptype)
 {
        switch (apptype) {
 proc_disable_apptype(pid_t pid, int apptype)
 {
        switch (apptype) {

-               case PROC_POLICY_OSX_APPTYPE_TAL:
-               case PROC_POLICY_OSX_APPTYPE_DASHCLIENT:
-                       break;
-               default:
-                       return(EINVAL);
+       case PROC_POLICY_OSX_APPTYPE_TAL:
+       case PROC_POLICY_OSX_APPTYPE_DASHCLIENT:
+               break;
+       default:
+               return EINVAL;

        }
 
        }
 

-       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_DISABLE, PROC_POLICY_APPTYPE, apptype, NULL, pid, (uint64_t)0) != -1)
-               return(0);
-       else
-               return(errno);
-
+       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_DISABLE, PROC_POLICY_APPTYPE, apptype, NULL, pid, (uint64_t)0) != -1) {
+               return 0;
+       } else {
+               return errno;
+       }

 }
 
 /* re-enable the launch time background policy if it had been disabled. */
 }
 
 /* re-enable the launch time background policy if it had been disabled. */

-int 
+int

 proc_enable_apptype(pid_t pid, int apptype)
 {
        switch (apptype) {
 proc_enable_apptype(pid_t pid, int apptype)
 {
        switch (apptype) {

-               case PROC_POLICY_OSX_APPTYPE_TAL:
-               case PROC_POLICY_OSX_APPTYPE_DASHCLIENT:
-                       break;
-               default:
-                       return(EINVAL);
-
+       case PROC_POLICY_OSX_APPTYPE_TAL:
+       case PROC_POLICY_OSX_APPTYPE_DASHCLIENT:
+               break;
+       default:
+               return EINVAL;

        }
 
        }
 

-       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_ENABLE, PROC_POLICY_APPTYPE, apptype, NULL, pid, (uint64_t)0) != -1)
-               return(0);
-       else
-               return(errno);
- 
+       if (__process_policy(PROC_POLICY_SCOPE_PROCESS, PROC_POLICY_ACTION_ENABLE, PROC_POLICY_APPTYPE, apptype, NULL, pid, (uint64_t)0) != -1) {
+               return 0;
+       } else {
+               return errno;
+       }

 }
 
 }
 

-#if !TARGET_IPHONE_SIMULATOR
+#if !TARGET_OS_SIMULATOR

 
 int
 proc_suppress(__unused pid_t pid, __unused uint64_t *generation)
 
 int
 proc_suppress(__unused pid_t pid, __unused uint64_t *generation)


@@ -806,9 +1000,6 @@ proc_suppress(__unused pid_t pid, __unused uint64_t *generation)
        return 0;
 }
 
        return 0;
 }
 

-#endif /* !TARGET_IPHONE_SIMULATOR */
-
-#endif /* !TARGET_OS_EMBEDDED */
-
-
+#endif /* !TARGET_OS_SIMULATOR */

 
 

+#endif /* !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) */