X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/3e170ce000f1506b7b5d2c5c7faec85ceabb573d..4d15aeb193b2c68f1d38666c317f8d3734f5f083:/libsyscall/wrappers/libproc/libproc.c

diff --git a/libsyscall/wrappers/libproc/libproc.c b/libsyscall/wrappers/libproc/libproc.c
index 730a15e41..cc0321e2d 100644
--- a/libsyscall/wrappers/libproc/libproc.c
+++ b/libsyscall/wrappers/libproc/libproc.c
@@ -362,11 +362,21 @@ proc_terminate(pid_t pid, int *sig)
 	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;
 
+	 /* 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;
@@ -410,6 +420,16 @@ proc_set_cpumon_defaults(pid_t pid)
 		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
 proc_disable_cpumon(pid_t pid)
 {
@@ -449,6 +469,10 @@ proc_set_cpumon_params_fatal(pid_t pid, int percentage, int interval)
 	 * 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)
@@ -544,12 +568,18 @@ proc_list_uptrs(int pid, uint64_t *buf, uint32_t bufsz)
 		return -1;
 	}
 
-	struct proc_fdinfo fdlist[OPEN_MAX];
-	nfds = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, fdlist, OPEN_MAX*sizeof(struct proc_fdinfo));
-	if (nfds <= 0 || nfds > OPEN_MAX) {
+	/* get the list of FDs for this process */
+	struct proc_fdinfo fdlist[OPEN_MAX+1];
+	nfds = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, &fdlist[1], OPEN_MAX*sizeof(struct proc_fdinfo));
+	if (nfds < 0 || nfds > OPEN_MAX) {
 		return -1;
 	}
 
+	/* Add FD -1, the implicit workq kqueue */
+	fdlist[0].proc_fd = -1;
+	fdlist[0].proc_fdtype = PROX_FDTYPE_KQUEUE;
+	nfds++;
+
 	struct kevent_extinfo *kqext = malloc(knote_max * sizeof(struct kevent_extinfo));
 	if (!kqext) {
 		errno = ENOMEM;
@@ -603,6 +633,29 @@ proc_list_uptrs(int pid, uint64_t *buf, uint32_t bufsz)
 	return count;
 }
 
+int 
+proc_setcpu_percentage(pid_t pid, int action, int percentage)
+{
+	proc_policy_cpuusage_attr_t attr;
+
+	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);
+}
+
+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);
+}
+
 
 
 /* Donate importance to adaptive processes from this process */