Modify automatic performance adjustment mode so that the cpu is set

to go fast if the power is connected and the battery is more than 15%
charged, and when on batteries keeps setperf low unless needed.
add a cool runnings mode option (-C) that does the previous behaviour
of keeping the CPU as low as possible unless needed.
ok deradt@, sturm@, "i like it's" djm@ henning@ and others.

6 files changed, 94 insertions, 46 deletions

diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index 3ecd14f5a81..45407b60eff 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.8,v 1.22 2005/11/23 08:02:58 sturm Exp $
+.\"	$OpenBSD: apm.8,v 1.23 2005/12/02 04:27:52 beck Exp $
 .\"
 .\" Copyright (c) 1996 John T. Kohl
 .\" All rights reserved.
@@ -38,7 +38,7 @@
 .Op Fl f Ar sockname
 .Br
 .Nm apm
-.Op Fl AabHLlmPSsvz
+.Op Fl AabCHLlmPSsvz
 .Op Fl f Ar sockname
 .Sh DESCRIPTION
 .Nm
@@ -64,6 +64,10 @@ means connected, 2 means backup power source, and 255 means unknown.
 Display the battery status.
 0 means high, 1 means low, 2 means
 critical, 3 means charging, 4 means absent, and 255 means unknown.
+.It Fl C
+Set
+.Xr apmd 8
+to cool running performance adjustment mode.
 .It Fl f Ar sockname
 Set the name of the socket via which to contact
 .Xr apmd 8
@@ -87,7 +91,8 @@ Display the estimated battery lifetime (in percent).
 Display the estimated battery lifetime (in minutes).
 .It Fl P
 Display the performance adjustment mode.
-0 means uninitialized, 1 means manual, and 2 means automatic mode.
+0 means uninitialized, 1 means manual, 2 means automatic mode, and 3
+means cool running mode.
 .It Fl S
 Put the system into stand-by (light sleep) mode.
 .It Fl s
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 334384b6d2f..9f6aa554693 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.13 2005/11/23 08:02:58 sturm Exp $	*/
+/*	$OpenBSD: apm.c,v 1.14 2005/12/02 04:27:52 beck Exp $	*/
 
 /*
  *  Copyright (c) 1996 John T. Kohl
@@ -58,8 +58,8 @@ int send_command(int fd, struct apm_command *cmd, struct apm_reply *reply);
 void
 usage(void)
 {
-	fprintf(stderr,"usage: %s [-ablmPSsvz] [-f sockname] [-A | -L | -H]\n",
-	    __progname);
+	fprintf(stderr,"usage: %s [-ablmPSsvz] [-f sockname]"
+		" [-C | -A | -L | -H]\n", __progname);
 	exit(1);
 }
 
@@ -149,7 +149,7 @@ main(int argc, char *argv[])
 	struct apm_command command;
 	struct apm_reply reply;
 
-	while ((ch = getopt(argc, argv, "AHLlmbvaPsSzf:")) != -1) {
+	while ((ch = getopt(argc, argv, "ACHLlmbvaPsSzf:")) != -1) {
 		switch (ch) {
 		case 'v':
 			verbose = TRUE;
@@ -172,6 +172,11 @@ main(int argc, char *argv[])
 				usage();
 			action = SETPERF_AUTO;
 			break;
+		case 'C':
+			if (action != NONE)
+				usage();
+			action = SETPERF_COOL;
+			break;
 		case 'H':
 			if (action != NONE)
 				usage();
@@ -248,6 +253,7 @@ main(int argc, char *argv[])
 	case SETPERF_LOW:
 	case SETPERF_HIGH:
 	case SETPERF_AUTO:
+	case SETPERF_COOL:
 		command.action = action;
 		break;
 	default:
diff --git a/usr.sbin/apmd/apm-proto.h b/usr.sbin/apmd/apm-proto.h
index ea07c7c2170..8f8726bb323 100644
--- a/usr.sbin/apmd/apm-proto.h
+++ b/usr.sbin/apmd/apm-proto.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm-proto.h,v 1.5 2005/11/23 08:02:58 sturm Exp $	*/
+/*	$OpenBSD: apm-proto.h,v 1.6 2005/12/02 04:27:52 beck Exp $	*/
 
 /*
  *  Copyright (c) 1996 John T. Kohl
@@ -36,7 +36,8 @@ enum apm_action {
 	GETSTATUS,
 	SETPERF_LOW,
 	SETPERF_HIGH,
-	SETPERF_AUTO
+	SETPERF_AUTO,
+	SETPERF_COOL
 };
 
 enum apm_state {
@@ -48,7 +49,8 @@ enum apm_state {
 enum apm_perfstate {
 	PERF_NONE,
 	PERF_MANUAL,
-	PERF_AUTO
+	PERF_AUTO,
+	PERF_COOL
 };
 
 struct apm_command {
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index a64bb0951fc..24991e1a810 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apmd.8,v 1.30 2005/11/23 08:02:58 sturm Exp $
+.\"	$OpenBSD: apmd.8,v 1.31 2005/12/02 04:27:52 beck Exp $
 .\"
 .\" Copyright (c) 1995 John T. Kohl
 .\" All rights reserved.
@@ -34,7 +34,7 @@
 .Nd Advanced Power Management monitor daemon
 .Sh SYNOPSIS
 .Nm apmd
-.Op Fl AadeHLmps
+.Op Fl AaCdeHLmps
 .Op Fl f Ar devname
 .Op Fl S Ar sockname
 .Op Fl t Ar seconds
@@ -65,10 +65,37 @@ The options are as follows:
 Start
 .Nm
 in automatic performance adjustment mode.
+In this mode, when CPU idle time falls below 10%,
+or if the AC power is connected and the battery is more than 15% charged, 
+.Nm
+raises
+.Va hw.setperf
+as much as possible.
+Otherwise, when the CPU idle time
+is above 30% and the system is running on battery power, 
+.Nm
+lowers 
+.Va hw.setperf
+as much as possible to reduce power consumption.
 .It Fl a
 BIOS-initiated suspend or standby requests are
 ignored if the system is connected to line current and not running from
 batteries (user requests are still honored).
+.It Fl C
+Start
+.Nm
+in cool running performance adjustment mode.
+In this mode, when CPU idle time falls below
+10%, 
+.Nm 
+raises
+.Va hw.setperf
+as much as necessary.
+Otherwise, when idle time is above 30%
+.Nm
+reduces
+.Va hw.setperf
+as much as possible to reduce heat, noise, and power comsumption.
 .It Fl d
 .Nm
 enters debug mode, logging to facility
@@ -139,26 +166,6 @@ once per 10 minutes, but may be specified using the
 command-line flag.
 .El
 .Pp
-In automatic performance adjustment mode,
-.Nm
-monitors the processor's idle time and adjusts
-.Va hw.setperf
-dynamically.
-This keeps the processor at low speed whenever possible, reducing noise and
-power consumption.
-When idle time falls below 10%, the daemon raises
-.Va hw.setperf
-as much as necessary.
-When idle time is above 30%,
-.Nm
-reduces
-.Va hw.setperf
-as much as possible.
-By default
-.Nm
-does not change
-.Va hw.setperf .
-.Pp
 When a client requests a suspend or stand-by mode,
 .Nm
 does not wait for positive confirmation that the requested
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 64ea149b029..6aa6414c8b4 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmd.c,v 1.38 2005/11/23 08:21:09 deraadt Exp $	*/
+/*	$OpenBSD: apmd.c,v 1.39 2005/12/02 04:27:52 beck Exp $	*/
 
 /*
  *  Copyright (c) 1995, 1996 John T. Kohl
@@ -74,7 +74,7 @@ void usage(void);
 int power_status(int fd, int force, struct apm_power_info *pinfo);
 int bind_socket(const char *sn);
 enum apm_state handle_client(int sock_fd, int ctl_fd);
-void perf_status(void);
+void perf_status(struct apm_power_info *pinfo);
 void suspend(int ctl_fd);
 void stand_by(int ctl_fd);
 void setperf(int new_perf);
@@ -95,7 +95,7 @@ usage(void)
 {
 	fprintf(stderr,
 	    "usage: %s [-ademps] [-f devname] [-S sockname] [-t seconds]"
-	    " [-A | -L | -H]\n", __progname);
+	    " [-C | -A | -L | -H]\n", __progname);
 	exit(1);
 }
 
@@ -192,7 +192,7 @@ power_status(int fd, int force, struct apm_power_info *pinfo)
 }
 
 void
-perf_status(void)
+perf_status(struct apm_power_info *pinfo)
 {
 	static long cp_time_old[CPUSTATES];
 	static int avg_idle;
@@ -200,6 +200,7 @@ perf_status(void)
 	int cp_time_mib[] = {CTL_KERN, KERN_CPTIME};
 	int hw_perf_mib[] = {CTL_HW, HW_SETPERF};
 	int i, idle, perf;
+	int forcehi = 0;
 	int sum = 0;
 	size_t cp_time_sz = sizeof(cp_time);
 	size_t perf_sz = sizeof(perf);
@@ -223,10 +224,24 @@ perf_status(void)
 	/* smooth data */
 	avg_idle = (avg_idle + (100 * idle) / sum) / 2;
 
+	switch (doperf) {
+	case PERF_AUTO:
+		/*
+		 * force setperf towards the max if we are connected to AC
+		 * power and have a battery life greater than 15%
+		 */
+		if (pinfo->ac_state == APM_AC_ON && pinfo->battery_life > 15)
+			forcehi = 1;		
+		break;
+	case PERF_COOL:
+		forcehi = 0;
+		break;
+	}
+	
 	if (sysctl(hw_perf_mib, 2, &perf, &perf_sz, NULL, 0) < 0)
 		syslog(LOG_INFO, "cannot read hw.setperf");
 
-	if (avg_idle < PERFINCTHRES && perf < PERFMAX) {
+	if (forcehi || (avg_idle < PERFINCTHRES && perf < PERFMAX)) {
 		perf += PERFINC;
 		if (perf > PERFMAX)
 			perf = PERFMAX;
@@ -336,6 +351,11 @@ handle_client(int sock_fd, int ctl_fd)
 		reply.newstate = NORMAL;
 		syslog(LOG_NOTICE, "setting hw.setperf automatically");
 		break;
+	case SETPERF_COOL:
+		doperf = PERF_COOL;
+		reply.newstate = NORMAL;
+		syslog(LOG_NOTICE, "setting hw.setperf for cool running");
+		break;
 	default:
 		reply.newstate = NORMAL;
 		break;
@@ -386,12 +406,13 @@ main(int argc, char *argv[])
 	int messages = 0;
 	int noacsleep = 0;
 	struct timespec ts = {TIMO, 0}, sts = {0, 0};
+	struct apm_power_info pinfo;
 	time_t apmtimeout = 0;
 	const char *sockname = sockfile;
 	int kq, nchanges;
 	struct kevent ev[2];
 
-	while ((ch = getopt(argc, argv, "aAdHLsepmf:t:S:")) != -1)
+	while ((ch = getopt(argc, argv, "aACdHLsepmf:t:S:")) != -1)
 		switch(ch) {
 		case 'a':
 			noacsleep = 1;
@@ -424,6 +445,11 @@ main(int argc, char *argv[])
 				usage();
 			doperf = PERF_AUTO;
 			break;
+		case 'C':
+			if (doperf != PERF_NONE)
+				usage();
+			doperf = PERF_COOL;
+			break;
 		case 'L':
 			if (doperf != PERF_NONE)
 				usage();
@@ -470,7 +496,7 @@ main(int argc, char *argv[])
 	if (fcntl(sock_fd, F_SETFD, 1) == -1)
 		error("cannot set close-on-exec for the socket", NULL);
 
-	power_status(ctl_fd, 1, 0);
+	power_status(ctl_fd, 1, &pinfo);
 
 	if (statonly)
 		exit(0);
@@ -509,9 +535,9 @@ main(int argc, char *argv[])
 
 		sts = ts;
 
-		if (doperf == PERF_AUTO) {
+		if (doperf == PERF_AUTO || doperf == PERF_COOL) {
 			sts.tv_sec = 1;
-			perf_status();
+			perf_status(&pinfo);
 		}
 
 		apmtimeout += sts.tv_sec;
@@ -522,7 +548,7 @@ main(int argc, char *argv[])
 			apmtimeout = 0;
 
 			/* wakeup for timeout: take status */
-			powerbak = power_status(ctl_fd, 0, 0);
+			powerbak = power_status(ctl_fd, 0, &pinfo);
 			if (powerstatus != powerbak) {
 				powerstatus = powerbak;
 				powerchange = 1;
@@ -557,7 +583,7 @@ main(int argc, char *argv[])
 			case APM_NORMAL_RESUME:
 			case APM_CRIT_RESUME:
 			case APM_SYS_STANDBY_RESUME:
-				powerbak = power_status(ctl_fd, 0, 0);
+				powerbak = power_status(ctl_fd, 0, &pinfo);
 				if (powerstatus != powerbak) {
 					powerstatus = powerbak;
 					powerchange = 1;
@@ -565,7 +591,7 @@ main(int argc, char *argv[])
 				resumes++;
 				break;
 			case APM_POWER_CHANGE:
-				powerbak = power_status(ctl_fd, 0, 0);
+				powerbak = power_status(ctl_fd, 0, &pinfo);
 				if (powerstatus != powerbak) {
 					powerstatus = powerbak;
 					powerchange = 1;
@@ -576,7 +602,7 @@ main(int argc, char *argv[])
 			}
 
 			if ((standbys || suspends) && noacsleep &&
-			    power_status(ctl_fd, 0, 0))
+			    power_status(ctl_fd, 0, &pinfo))
 				syslog(LOG_DEBUG, "no! sleep! till brooklyn!");
 			else if (suspends)
 				suspend(ctl_fd);
diff --git a/usr.sbin/apmd/apmsubr.c b/usr.sbin/apmd/apmsubr.c
index 7cc8305c8cc..1686ea6a9a1 100644
--- a/usr.sbin/apmd/apmsubr.c
+++ b/usr.sbin/apmd/apmsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmsubr.c,v 1.4 2005/11/23 08:02:58 sturm Exp $	*/
+/*	$OpenBSD: apmsubr.c,v 1.5 2005/12/02 04:27:52 beck Exp $	*/
 
 /*
  *  Copyright (c) 1995,1996 John T. Kohl
@@ -81,6 +81,8 @@ perf_state(int state)
 		return "manual";
 	case PERF_AUTO:
 		return "auto";
+	case PERF_COOL:
+		return "cool running";
 	default:
 		return "invalid performance status";
 	}