2007-09-20 22:38:49 +04:00
|
|
|
/* $NetBSD: envstat.c,v 1.53 2007/09/20 18:38:49 plunky Exp $ */
|
2000-03-10 08:51:56 +03:00
|
|
|
|
|
|
|
/*-
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
* Copyright (c) 2007 The NetBSD Foundation, Inc.
|
2000-03-10 08:51:56 +03:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
* by Juan Romero Pardines.
|
2000-03-10 08:51:56 +03:00
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
* This product includes software developed by Juan Romero Pardines
|
|
|
|
* for the NetBSD Foundation, Inc. and its contributors.
|
2000-03-10 08:51:56 +03:00
|
|
|
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived
|
|
|
|
* from this software without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
|
|
|
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
|
|
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
|
|
|
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/*
|
|
|
|
* TODO:
|
|
|
|
*
|
|
|
|
* o Some checks should be added to ensure that the user does not
|
|
|
|
* set unwanted values for the critical limits.
|
|
|
|
*/
|
2000-03-10 08:51:56 +03:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
#include <stdbool.h>
|
2000-03-10 08:51:56 +03:00
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
#include <fcntl.h>
|
2000-06-24 04:41:10 +04:00
|
|
|
#include <err.h>
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
#include <errno.h>
|
|
|
|
#include <prop/proplib.h>
|
2000-03-10 08:51:56 +03:00
|
|
|
#include <sys/envsys.h>
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
#define _PATH_DEV_SYSMON "/dev/sysmon"
|
|
|
|
|
|
|
|
#define ENVSYS_DFLAG 0x00000001 /* list registered devices */
|
|
|
|
#define ENVSYS_FFLAG 0x00000002 /* show temp in farenheit */
|
|
|
|
#define ENVSYS_LFLAG 0x00000004 /* list sensors */
|
|
|
|
#define ENVSYS_XFLAG 0x00000008 /* externalize dictionary */
|
2007-09-03 01:25:24 +04:00
|
|
|
#define ENVSYS_IFLAG 0x00000010 /* skips invalid sensors */
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Operation flags for -m.
|
|
|
|
*/
|
|
|
|
#define USERF_SCRITICAL 0x00000001 /* set a critical limit */
|
|
|
|
#define USERF_RCRITICAL 0x00000002 /* remove a critical limit */
|
|
|
|
#define USERF_SCRITMAX 0x00000004 /* set a critical max limit */
|
|
|
|
#define USERF_RCRITMAX 0x00000008 /* remove a critical max limit */
|
|
|
|
#define USERF_SCRITMIN 0x00000010 /* set a critical min limit */
|
|
|
|
#define USERF_RCRITMIN 0x00000020 /* remove a critical min limit */
|
|
|
|
#define USERF_SRFACT 0x00000040 /* set a new rfact */
|
|
|
|
#define USERF_SDESCR 0x00000080 /* set a new description */
|
|
|
|
|
|
|
|
struct envsys_sensor {
|
2007-07-04 23:56:02 +04:00
|
|
|
bool invalid;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
bool visible;
|
|
|
|
bool percentage;
|
|
|
|
int32_t cur_value;
|
|
|
|
int32_t max_value;
|
|
|
|
int32_t min_value;
|
|
|
|
int32_t avg_value;
|
|
|
|
int32_t critcap_value;
|
|
|
|
int32_t critmin_value;
|
|
|
|
int32_t critmax_value;
|
|
|
|
char desc[ENVSYS_DESCLEN];
|
|
|
|
char type[ENVSYS_DESCLEN];
|
|
|
|
char drvstate[ENVSYS_DESCLEN];
|
2007-09-04 20:54:37 +04:00
|
|
|
char battstate[ENVSYS_DESCLEN];
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static int interval, flags, width;
|
|
|
|
static char *mydevname, *sensors, *userreq;
|
|
|
|
static struct envsys_sensor *gesen;
|
2007-07-12 22:24:35 +04:00
|
|
|
static size_t gnelems, newsize;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
static int parse_dictionary(int);
|
|
|
|
static int send_dictionary(int);
|
|
|
|
static int find_sensors(prop_array_t);
|
|
|
|
static void print_sensors(struct envsys_sensor *, size_t);
|
|
|
|
static int check_sensors(struct envsys_sensor *, char *, size_t);
|
|
|
|
static int usage(void);
|
|
|
|
|
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
2000-03-10 08:51:56 +03:00
|
|
|
{
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_dictionary_t dict;
|
|
|
|
int c, fd, rval;
|
2007-08-06 03:20:44 +04:00
|
|
|
char *buf, *endptr;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
rval = flags = interval = width = 0;
|
2007-07-12 22:24:35 +04:00
|
|
|
newsize = gnelems = 0;
|
|
|
|
gesen = NULL;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
setprogname(argv[0]);
|
|
|
|
|
2007-09-20 22:38:49 +04:00
|
|
|
while ((c = getopt(argc, argv, "Dd:fIi:lm:rs:w:x")) != -1) {
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
switch (c) {
|
2007-09-03 01:25:24 +04:00
|
|
|
case 'D': /* list registered devices */
|
|
|
|
flags |= ENVSYS_DFLAG;
|
|
|
|
break;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
case 'd': /* show sensors of a specific device */
|
|
|
|
mydevname = strdup(optarg);
|
|
|
|
if (mydevname == NULL)
|
|
|
|
err(ENOMEM, "out of memory");
|
|
|
|
break;
|
2007-09-03 01:25:24 +04:00
|
|
|
case 'f': /* display temperature in Farenheit */
|
|
|
|
flags |= ENVSYS_FFLAG;
|
|
|
|
break;
|
2007-09-20 22:38:49 +04:00
|
|
|
case 'I': /* Skips invalid sensors */
|
|
|
|
flags |= ENVSYS_IFLAG;
|
|
|
|
break;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
case 'i': /* wait time between intervals */
|
|
|
|
interval = strtoul(optarg, &endptr, 10);
|
|
|
|
if (*endptr != '\0')
|
|
|
|
errx(1, "interval must be an integer");
|
2002-12-31 08:27:29 +03:00
|
|
|
break;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
case 'l': /* list sensors */
|
|
|
|
flags |= ENVSYS_LFLAG;
|
2000-03-10 08:51:56 +03:00
|
|
|
break;
|
2007-09-03 01:25:24 +04:00
|
|
|
case 'm':
|
|
|
|
userreq = strdup(optarg);
|
|
|
|
if (userreq == NULL)
|
|
|
|
err(ENOMEM, "out of memory");
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
break;
|
2007-07-17 17:12:46 +04:00
|
|
|
case 'r':
|
|
|
|
/*
|
|
|
|
* This flag doesn't do anything... it's only here for
|
|
|
|
* compatibility with the old implementation.
|
|
|
|
*/
|
|
|
|
break;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
case 's': /* only show specified sensors */
|
|
|
|
sensors = strdup(optarg);
|
2000-03-10 08:51:56 +03:00
|
|
|
if (sensors == NULL)
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
err(ENOMEM, "out of memory");
|
2000-03-10 08:51:56 +03:00
|
|
|
break;
|
2007-09-03 01:25:24 +04:00
|
|
|
case 'w': /* width value for the lines */
|
|
|
|
width = strtoul(optarg, &endptr, 10);
|
|
|
|
if (*endptr != '\0')
|
|
|
|
errx(1, "width must be an integer");
|
|
|
|
break;
|
|
|
|
case 'x': /* print the dictionary in raw format */
|
|
|
|
flags |= ENVSYS_XFLAG;
|
2000-03-10 08:51:56 +03:00
|
|
|
break;
|
|
|
|
case '?':
|
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
/* NOTREACHED */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-03 01:25:24 +04:00
|
|
|
argc -= optind;
|
|
|
|
argv += optind;
|
|
|
|
|
2007-09-10 17:58:50 +04:00
|
|
|
if (argc > 0)
|
|
|
|
usage();
|
|
|
|
|
2007-09-10 21:39:14 +04:00
|
|
|
if ((fd = open(_PATH_DEV_SYSMON, O_RDONLY)) == -1)
|
|
|
|
err(EXIT_FAILURE, "open");
|
|
|
|
|
2007-09-10 17:58:50 +04:00
|
|
|
if (flags & ENVSYS_XFLAG) {
|
2007-07-17 22:15:02 +04:00
|
|
|
rval = prop_dictionary_recv_ioctl(fd,
|
2007-09-10 17:58:50 +04:00
|
|
|
ENVSYS_GETDICTIONARY,
|
|
|
|
&dict);
|
2007-07-17 22:15:02 +04:00
|
|
|
if (rval) {
|
|
|
|
(void)printf("%s: %s\n", getprogname(),
|
|
|
|
strerror(rval));
|
|
|
|
goto out;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
}
|
2007-09-10 17:58:50 +04:00
|
|
|
buf = prop_dictionary_externalize(dict);
|
|
|
|
(void)printf("%s", buf);
|
|
|
|
free(buf);
|
2000-06-24 04:41:10 +04:00
|
|
|
|
2007-07-21 15:11:10 +04:00
|
|
|
} else if (userreq) {
|
|
|
|
if (!sensors || !mydevname) {
|
2007-09-10 17:58:50 +04:00
|
|
|
(void)fprintf(stderr, "%s: -m cannot be used "
|
|
|
|
"without -s and -d\n", getprogname());
|
2007-09-10 21:39:14 +04:00
|
|
|
rval = EINVAL;
|
|
|
|
goto out;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
}
|
|
|
|
rval = send_dictionary(fd);
|
|
|
|
goto out;
|
|
|
|
|
2007-09-10 18:15:11 +04:00
|
|
|
#define MISSING_FLAG() \
|
|
|
|
do { \
|
|
|
|
if (sensors && !mydevname) { \
|
|
|
|
(void)fprintf(stderr, "%s: -s cannot be used " \
|
|
|
|
"without -d\n", getprogname()); \
|
|
|
|
rval = EINVAL; \
|
|
|
|
goto out; \
|
|
|
|
} \
|
|
|
|
} while (/* CONSTCOND */ 0)
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
} else if (interval) {
|
|
|
|
for (;;) {
|
2007-09-10 18:15:11 +04:00
|
|
|
MISSING_FLAG();
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
rval = parse_dictionary(fd);
|
|
|
|
if (rval)
|
|
|
|
goto out;
|
|
|
|
(void)fflush(stdout);
|
|
|
|
(void)sleep(interval);
|
|
|
|
}
|
2007-09-10 18:15:11 +04:00
|
|
|
} else {
|
|
|
|
MISSING_FLAG();
|
2007-09-10 17:58:50 +04:00
|
|
|
rval = parse_dictionary(fd);
|
2007-09-10 18:15:11 +04:00
|
|
|
}
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
out:
|
|
|
|
if (sensors)
|
|
|
|
free(sensors);
|
|
|
|
if (userreq)
|
|
|
|
free(userreq);
|
|
|
|
if (mydevname)
|
|
|
|
free(mydevname);
|
|
|
|
(void)close(fd);
|
|
|
|
return rval;
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
static int
|
|
|
|
send_dictionary(int fd)
|
|
|
|
{
|
|
|
|
prop_dictionary_t dict, udict;
|
|
|
|
prop_object_t obj;
|
|
|
|
char *buf, *target, *endptr;
|
|
|
|
int error, i, uflag;
|
|
|
|
double val;
|
|
|
|
|
|
|
|
error = uflag = val = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* part 1: kernel dictionary.
|
|
|
|
*
|
2007-09-10 21:40:44 +04:00
|
|
|
* This part consists in parsing the kernel dictionary
|
|
|
|
* to check for unknown devices or sensors. This is to
|
|
|
|
* know what type of sensor are we trying to set a
|
|
|
|
* a critical limit.
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
*/
|
2007-07-17 21:40:59 +04:00
|
|
|
error = prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &dict);
|
|
|
|
if (error)
|
|
|
|
return error;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
if (mydevname) {
|
|
|
|
obj = prop_dictionary_get(dict, mydevname);
|
|
|
|
if (prop_object_type(obj) != PROP_TYPE_ARRAY) {
|
|
|
|
warnx("unknown device `%s'", mydevname);
|
|
|
|
prop_object_release(dict);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
if (find_sensors(obj)) {
|
|
|
|
prop_object_release(dict);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* find the type for selected sensor */
|
|
|
|
for (i = 0; i < gnelems; i++)
|
|
|
|
if (strcmp(sensors, gesen[i].desc) == 0)
|
|
|
|
break;
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* we know the type of the sensor now, release kernel dict */
|
|
|
|
prop_object_release(dict);
|
2007-07-17 19:43:08 +04:00
|
|
|
/* we don't need the rdonly fd */
|
|
|
|
(void)close(fd);
|
|
|
|
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/*
|
|
|
|
* part 2: userland dictionary.
|
|
|
|
*
|
2007-09-10 21:41:26 +04:00
|
|
|
* This part consists in setting the values provided
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
* by the user and convert when necesssary to send
|
|
|
|
* them to the kernel again.
|
|
|
|
*/
|
|
|
|
udict = prop_dictionary_create();
|
2002-12-31 08:27:29 +03:00
|
|
|
|
2007-07-13 04:42:57 +04:00
|
|
|
#define MKPROP(var, str) \
|
|
|
|
do { \
|
|
|
|
obj = prop_string_create_cstring_nocopy(var); \
|
|
|
|
if (obj == NULL || !prop_dictionary_set(udict, (str), obj)) { \
|
|
|
|
error = EINVAL; \
|
|
|
|
goto out; \
|
|
|
|
} \
|
|
|
|
} while (/* CONSTCOND */ 0)
|
2002-12-31 08:27:29 +03:00
|
|
|
|
2007-07-13 04:42:57 +04:00
|
|
|
/* create the driver-name object */
|
|
|
|
MKPROP(mydevname, "driver-name");
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_object_release(obj);
|
2002-12-31 08:27:29 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* create the sensor-name object */
|
2007-07-13 04:42:57 +04:00
|
|
|
MKPROP(sensors, "sensor-name");
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_object_release(obj);
|
2007-07-13 04:42:57 +04:00
|
|
|
|
|
|
|
#undef MKPROP
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/*
|
|
|
|
* parse the -m argument; we understand the following ways:
|
|
|
|
*
|
|
|
|
* -m critical/crit{max,min}=value
|
|
|
|
* -m critical/crit{max,min}=remove
|
|
|
|
* -m desc="BLAH"
|
|
|
|
* -m rfact=value
|
|
|
|
*/
|
|
|
|
if (userreq) {
|
|
|
|
buf = strtok(userreq, "=");
|
|
|
|
target = strdup(buf);
|
|
|
|
if (target == NULL) {
|
|
|
|
error = ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
while (buf != NULL) {
|
|
|
|
/*
|
|
|
|
* skip current string if it's the same
|
|
|
|
* than target requested.
|
|
|
|
*/
|
|
|
|
if (strcmp(target, buf) == 0)
|
|
|
|
buf = strtok(NULL, "=");
|
|
|
|
|
|
|
|
/* check what target was requested */
|
|
|
|
if (strcmp(target, "desc") == 0) {
|
|
|
|
uflag |= USERF_SDESCR;
|
|
|
|
obj = prop_string_create_cstring_nocopy(buf);
|
|
|
|
break;
|
|
|
|
#define SETNCHECKVAL(a, b) \
|
|
|
|
do { \
|
|
|
|
if (strcmp(buf, "remove") == 0) \
|
|
|
|
uflag |= (a); \
|
|
|
|
else { \
|
|
|
|
uflag |= (b); \
|
|
|
|
val = strtod(buf, &endptr); \
|
|
|
|
if (*endptr != '\0') { \
|
|
|
|
(void)printf("%s: invalid value\n", \
|
|
|
|
getprogname()); \
|
|
|
|
error = EINVAL; \
|
|
|
|
goto out; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
} while (/* CONSTCOND */ 0)
|
|
|
|
|
|
|
|
} else if (strcmp(target, "critical") == 0) {
|
|
|
|
SETNCHECKVAL(USERF_RCRITICAL, USERF_SCRITICAL);
|
|
|
|
break;
|
|
|
|
} else if (strcmp(target, "critmax") == 0) {
|
|
|
|
SETNCHECKVAL(USERF_RCRITMAX, USERF_SCRITMAX);
|
|
|
|
break;
|
|
|
|
} else if (strcmp(target, "critmin") == 0) {
|
|
|
|
SETNCHECKVAL(USERF_RCRITMIN, USERF_SCRITMIN);
|
|
|
|
break;
|
|
|
|
} else if (strcmp(target, "rfact") == 0) {
|
|
|
|
uflag |= USERF_SRFACT;
|
|
|
|
val = strtod(buf, &endptr);
|
|
|
|
if (*endptr != '\0') {
|
|
|
|
(void)printf("%s: invalid value\n",
|
|
|
|
getprogname());
|
|
|
|
error = EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
(void)printf("%s: invalid target\n",
|
|
|
|
getprogname());
|
|
|
|
error = EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free(target);
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
|
2007-07-13 04:42:57 +04:00
|
|
|
#undef SETNCHECKVAL
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* critical capacity for percentage sensors */
|
|
|
|
if (uflag & USERF_SCRITICAL) {
|
|
|
|
/* sanity check */
|
|
|
|
if (val < 0 || val > 100) {
|
|
|
|
(void)printf("%s: invalid value (0><100)\n",
|
|
|
|
getprogname());
|
|
|
|
error = EINVAL;
|
|
|
|
goto out;
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* ok... convert the value */
|
|
|
|
val = (val / 100) * gesen[i].max_value;
|
|
|
|
obj = prop_number_create_unsigned_integer(val);
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/*
|
|
|
|
* conversions required to send a proper value to the kernel.
|
|
|
|
*/
|
|
|
|
if ((uflag & USERF_SCRITMAX) || (uflag & USERF_SCRITMIN)) {
|
|
|
|
/* temperatures */
|
|
|
|
if (strcmp(gesen[i].type, "Temperature") == 0) {
|
|
|
|
/* convert from farenheit to celsius */
|
|
|
|
if (flags & ENVSYS_FFLAG)
|
|
|
|
val = (val - 32.0) * (5.0 / 9.0);
|
|
|
|
|
|
|
|
/* convert to microKelvin */
|
|
|
|
val = val * 1000000 + 273150000;
|
|
|
|
/* printf("val=%d\n", (int)val); */
|
|
|
|
obj = prop_number_create_unsigned_integer(val);
|
|
|
|
/* fans */
|
|
|
|
} else if (strcmp(gesen[i].type, "Fan") == 0) {
|
|
|
|
if (val < 0 || val > 10000) {
|
|
|
|
error = EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* printf("val=%d\n", (int)val); */
|
|
|
|
obj = prop_number_create_unsigned_integer(val);
|
|
|
|
|
|
|
|
/* volts, watts, ohms, etc */
|
|
|
|
} else {
|
|
|
|
/* convert to m[V,W,Ohms] again */
|
|
|
|
val *= 1000000.0;
|
|
|
|
/* printf("val=%5.0f\n", val); */
|
|
|
|
obj = prop_number_create_integer(val);
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
|
2007-07-13 04:42:57 +04:00
|
|
|
#define SETPROP(str) \
|
|
|
|
do { \
|
|
|
|
if (!prop_dictionary_set(udict, (str), obj)) { \
|
|
|
|
error = EINVAL; \
|
|
|
|
goto out; \
|
|
|
|
} \
|
|
|
|
} while ( /*CONSTCOND*/ 0)
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* user wanted to set a new description */
|
|
|
|
if (uflag & USERF_SDESCR) {
|
2007-07-13 04:42:57 +04:00
|
|
|
SETPROP("new-description");
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* user wanted to set a new critical capacity */
|
|
|
|
} else if (uflag & USERF_SCRITICAL) {
|
2007-07-13 04:42:57 +04:00
|
|
|
SETPROP("critical-capacity");
|
2004-03-25 04:26:57 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
} else if (uflag & USERF_RCRITICAL) {
|
|
|
|
obj = prop_bool_create(1);
|
2007-07-13 04:42:57 +04:00
|
|
|
SETPROP("remove-critical-cap");
|
2004-03-25 04:26:57 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* user wanted to remove a critical min limit */
|
|
|
|
} else if (uflag & USERF_RCRITMIN) {
|
|
|
|
obj = prop_bool_create(1);
|
2007-07-13 04:42:57 +04:00
|
|
|
SETPROP("remove-cmin-limit");
|
2004-03-25 04:26:57 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* user wanted to remove a critical max limit */
|
|
|
|
} else if (uflag & USERF_RCRITMAX) {
|
|
|
|
obj = prop_bool_create(1);
|
2007-07-13 04:42:57 +04:00
|
|
|
SETPROP("remove-cmax-limit");
|
2004-03-25 04:26:57 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* user wanted to set a new critical min value */
|
|
|
|
} else if (uflag & USERF_SCRITMIN) {
|
2007-07-13 04:42:57 +04:00
|
|
|
SETPROP("critical-min-limit");
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
/* user wanted to set a new critical max value */
|
|
|
|
} else if (uflag & USERF_SCRITMAX) {
|
2007-07-13 04:42:57 +04:00
|
|
|
SETPROP("critical-max-limit");
|
2004-03-25 04:26:57 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* user wanted to set a new rfact */
|
|
|
|
} else if (uflag & USERF_SRFACT) {
|
|
|
|
obj = prop_number_create_integer(val);
|
2007-07-13 04:42:57 +04:00
|
|
|
SETPROP("new-rfact");
|
2004-03-25 04:26:57 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
} else {
|
|
|
|
(void)printf("%s: unknown operation\n", getprogname());
|
|
|
|
error = EINVAL;
|
|
|
|
goto out;
|
2004-03-25 04:26:57 +03:00
|
|
|
}
|
|
|
|
|
2007-07-13 04:42:57 +04:00
|
|
|
#undef SETPROP
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_object_release(obj);
|
2000-03-10 08:51:56 +03:00
|
|
|
|
2007-07-13 04:42:57 +04:00
|
|
|
#ifdef DEBUG
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
printf("%s", prop_dictionary_externalize(udict));
|
|
|
|
return error;
|
|
|
|
#endif
|
2002-12-31 08:27:29 +03:00
|
|
|
|
2007-07-17 19:43:08 +04:00
|
|
|
if ((fd = open(_PATH_DEV_SYSMON, O_RDWR)) == -1) {
|
|
|
|
error = errno;
|
|
|
|
warnx("%s", strerror(errno));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* all done? send our dictionary now */
|
|
|
|
error = prop_dictionary_send_ioctl(udict, fd, ENVSYS_SETDICTIONARY);
|
|
|
|
|
|
|
|
if (error)
|
|
|
|
(void)printf("%s: %s\n", getprogname(), strerror(error));
|
|
|
|
out:
|
|
|
|
prop_object_release(udict);
|
|
|
|
return error;
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
static int
|
|
|
|
parse_dictionary(int fd)
|
2000-03-10 08:51:56 +03:00
|
|
|
{
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_array_t array;
|
|
|
|
prop_dictionary_t dict;
|
|
|
|
prop_object_iterator_t iter;
|
|
|
|
prop_object_t obj;
|
|
|
|
const char *dnp = NULL;
|
|
|
|
int rval = 0;
|
|
|
|
|
|
|
|
/* receive dictionary from kernel */
|
2007-07-17 21:40:59 +04:00
|
|
|
rval = prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &dict);
|
|
|
|
if (rval)
|
|
|
|
return rval;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
2007-08-26 14:20:33 +04:00
|
|
|
if (prop_dictionary_count(dict) == 0) {
|
|
|
|
warnx("no drivers registered");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
if (mydevname) {
|
|
|
|
obj = prop_dictionary_get(dict, mydevname);
|
|
|
|
if (prop_object_type(obj) != PROP_TYPE_ARRAY) {
|
|
|
|
warnx("unknown device `%s'", mydevname);
|
|
|
|
rval = EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
2002-12-31 08:27:29 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
rval = find_sensors(obj);
|
|
|
|
if (rval)
|
|
|
|
goto out;
|
|
|
|
} else {
|
|
|
|
iter = prop_dictionary_iterator(dict);
|
|
|
|
if (iter == NULL) {
|
|
|
|
rval = EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* iterate over the dictionary returned by the kernel */
|
|
|
|
while ((obj = prop_object_iterator_next(iter)) != NULL) {
|
|
|
|
|
|
|
|
array = prop_dictionary_get_keysym(dict, obj);
|
|
|
|
if (prop_object_type(array) != PROP_TYPE_ARRAY) {
|
|
|
|
warnx("no sensors found");
|
|
|
|
rval = EINVAL;
|
|
|
|
goto out;
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
dnp = prop_dictionary_keysym_cstring_nocopy(obj);
|
|
|
|
|
|
|
|
if (flags & ENVSYS_DFLAG) {
|
2007-07-12 22:24:35 +04:00
|
|
|
(void)printf("%s\n", dnp);
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
} else {
|
|
|
|
rval = find_sensors(array);
|
|
|
|
if (rval)
|
|
|
|
goto out;
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
}
|
2007-07-12 22:24:35 +04:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_object_iterator_release(iter);
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
2007-07-13 02:52:54 +04:00
|
|
|
if (userreq == NULL)
|
|
|
|
if ((flags & ENVSYS_LFLAG) == 0)
|
|
|
|
print_sensors(gesen, gnelems);
|
|
|
|
|
|
|
|
if (interval)
|
|
|
|
(void)printf("\n");
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
out:
|
2007-07-12 22:24:35 +04:00
|
|
|
if (gesen) {
|
|
|
|
free(gesen);
|
|
|
|
gesen = NULL;
|
|
|
|
gnelems = 0;
|
|
|
|
newsize = 0;
|
|
|
|
}
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_object_release(dict);
|
|
|
|
return rval;
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
static int
|
|
|
|
find_sensors(prop_array_t array)
|
2000-03-10 08:51:56 +03:00
|
|
|
{
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_object_iterator_t iter;
|
|
|
|
prop_object_t obj, obj1;
|
|
|
|
prop_string_t state, desc = NULL;
|
2007-07-12 22:24:35 +04:00
|
|
|
struct envsys_sensor *esen = NULL;
|
|
|
|
int rval = 0;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
char *str = NULL;
|
|
|
|
|
2007-07-12 22:24:35 +04:00
|
|
|
newsize += prop_array_count(array) * sizeof(*gesen);
|
|
|
|
esen = realloc(gesen, newsize);
|
|
|
|
if (esen == NULL) {
|
|
|
|
if (gesen)
|
|
|
|
free(gesen);
|
|
|
|
gesen = NULL;
|
|
|
|
rval = ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
gesen = esen;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
iter = prop_array_iterator(array);
|
|
|
|
if (iter == NULL) {
|
|
|
|
rval = EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
2001-02-20 02:22:40 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* iterate over the array of dictionaries */
|
|
|
|
while ((obj = prop_object_iterator_next(iter)) != NULL) {
|
2007-07-12 22:24:35 +04:00
|
|
|
|
|
|
|
gesen[gnelems].visible = false;
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* check sensor's state */
|
|
|
|
state = prop_dictionary_get(obj, "state");
|
2000-03-10 08:51:56 +03:00
|
|
|
|
2007-07-04 23:56:02 +04:00
|
|
|
/* mark invalid sensors */
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
if (prop_string_equals_cstring(state, "invalid"))
|
2007-07-12 22:24:35 +04:00
|
|
|
gesen[gnelems].invalid = true;
|
|
|
|
else
|
|
|
|
gesen[gnelems].invalid = false;
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* description string */
|
|
|
|
desc = prop_dictionary_get(obj, "description");
|
2007-07-17 21:40:59 +04:00
|
|
|
if (desc != NULL) {
|
|
|
|
/* copy description */
|
|
|
|
(void)strlcpy(gesen[gnelems].desc,
|
|
|
|
prop_string_cstring_nocopy(desc),
|
|
|
|
sizeof(gesen[gnelems].desc));
|
|
|
|
} else
|
|
|
|
continue;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
/* type string */
|
|
|
|
obj1 = prop_dictionary_get(obj, "type");
|
|
|
|
/* copy type */
|
2007-07-12 22:24:35 +04:00
|
|
|
(void)strlcpy(gesen[gnelems].type,
|
|
|
|
prop_string_cstring_nocopy(obj1),
|
|
|
|
sizeof(gesen[gnelems].type));
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
/* get current drive state string */
|
|
|
|
obj1 = prop_dictionary_get(obj, "drive-state");
|
|
|
|
if (obj1 != NULL)
|
2007-07-12 22:24:35 +04:00
|
|
|
(void)strlcpy(gesen[gnelems].drvstate,
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_string_cstring_nocopy(obj1),
|
2007-07-12 22:24:35 +04:00
|
|
|
sizeof(gesen[gnelems].drvstate));
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
2007-09-04 20:54:37 +04:00
|
|
|
/* get current battery state string */
|
|
|
|
obj1 = prop_dictionary_get(obj, "battery-state");
|
2007-09-02 23:36:59 +04:00
|
|
|
if (obj1 != NULL)
|
2007-09-04 20:54:37 +04:00
|
|
|
(void)strlcpy(gesen[gnelems].battstate,
|
2007-09-02 23:36:59 +04:00
|
|
|
prop_string_cstring_nocopy(obj1),
|
2007-09-04 20:54:37 +04:00
|
|
|
sizeof(gesen[gnelems].battstate));
|
2007-09-02 23:36:59 +04:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* get current value */
|
|
|
|
obj1 = prop_dictionary_get(obj, "cur-value");
|
2007-07-12 22:24:35 +04:00
|
|
|
gesen[gnelems].cur_value = prop_number_integer_value(obj1);
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
/* get max value */
|
|
|
|
obj1 = prop_dictionary_get(obj, "max-value");
|
|
|
|
if (obj1 != NULL)
|
2007-07-12 22:24:35 +04:00
|
|
|
gesen[gnelems].max_value =
|
|
|
|
prop_number_integer_value(obj1);
|
|
|
|
else
|
|
|
|
gesen[gnelems].max_value = 0;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
/* get min value */
|
|
|
|
obj1 = prop_dictionary_get(obj, "min-value");
|
|
|
|
if (obj1 != NULL)
|
2007-07-12 22:24:35 +04:00
|
|
|
gesen[gnelems].min_value =
|
|
|
|
prop_number_integer_value(obj1);
|
|
|
|
else
|
|
|
|
gesen[gnelems].min_value = 0;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
/* get avg value */
|
|
|
|
obj1 = prop_dictionary_get(obj, "avg-value");
|
|
|
|
if (obj1 != NULL)
|
2007-07-12 22:24:35 +04:00
|
|
|
gesen[gnelems].avg_value =
|
|
|
|
prop_number_integer_value(obj1);
|
|
|
|
else
|
|
|
|
gesen[gnelems].avg_value = 0;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
/* get percentage flag */
|
|
|
|
obj1 = prop_dictionary_get(obj, "want-percentage");
|
|
|
|
if (obj1 != NULL)
|
2007-07-12 22:24:35 +04:00
|
|
|
gesen[gnelems].percentage = prop_bool_true(obj1);
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
/* get critical max value if available */
|
|
|
|
obj1 = prop_dictionary_get(obj, "critical-max-limit");
|
|
|
|
if (obj1 != NULL) {
|
2007-07-12 22:24:35 +04:00
|
|
|
gesen[gnelems].critmax_value =
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_number_integer_value(obj1);
|
2007-07-12 22:24:35 +04:00
|
|
|
} else
|
|
|
|
gesen[gnelems].critmax_value = 0;
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* get critical min value if available */
|
|
|
|
obj1 = prop_dictionary_get(obj, "critical-min-limit");
|
|
|
|
if (obj1 != NULL) {
|
2007-07-12 22:24:35 +04:00
|
|
|
gesen[gnelems].critmin_value =
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_number_integer_value(obj1);
|
2007-07-12 22:24:35 +04:00
|
|
|
} else
|
|
|
|
gesen[gnelems].critmin_value = 0;
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* get critical capacity value if available */
|
|
|
|
obj1 = prop_dictionary_get(obj, "critical-capacity");
|
|
|
|
if (obj1 != NULL) {
|
2007-07-12 22:24:35 +04:00
|
|
|
gesen[gnelems].critcap_value =
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
prop_number_integer_value(obj1);
|
2007-07-12 22:24:35 +04:00
|
|
|
} else
|
|
|
|
gesen[gnelems].critcap_value = 0;
|
2002-12-31 08:27:29 +03:00
|
|
|
|
2007-07-12 22:24:35 +04:00
|
|
|
/* pass to the next struct and increase the counter */
|
|
|
|
gnelems++;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
/* print sensor names if -l was given */
|
|
|
|
if (flags & ENVSYS_LFLAG) {
|
|
|
|
if (width)
|
|
|
|
(void)printf("%*s\n", width,
|
|
|
|
prop_string_cstring_nocopy(desc));
|
|
|
|
else
|
|
|
|
(void)printf("%s\n",
|
|
|
|
prop_string_cstring_nocopy(desc));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* free memory */
|
|
|
|
prop_object_iterator_release(iter);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* if -s was specified, we need a way to mark if a sensor
|
|
|
|
* was found.
|
|
|
|
*/
|
|
|
|
if (sensors) {
|
|
|
|
str = strdup(sensors);
|
|
|
|
if (str == NULL)
|
|
|
|
return ENOMEM;
|
|
|
|
|
2007-07-12 22:24:35 +04:00
|
|
|
rval = check_sensors(gesen, str, gnelems);
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
if (rval)
|
|
|
|
goto out;
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
out:
|
2007-07-12 22:24:35 +04:00
|
|
|
if (str)
|
|
|
|
free(str);
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
return rval;
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
static int
|
|
|
|
check_sensors(struct envsys_sensor *es, char *str, size_t nelems)
|
2000-03-10 08:51:56 +03:00
|
|
|
{
|
|
|
|
int i;
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
char *sname;
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
sname = strtok(str, ",");
|
|
|
|
while (sname != NULL) {
|
|
|
|
for (i = 0; i < nelems; i++) {
|
|
|
|
if (strcmp(sname, es[i].desc) == 0) {
|
|
|
|
es[i].visible = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i >= nelems) {
|
|
|
|
if (mydevname) {
|
|
|
|
warnx("unknown sensor `%s' for device `%s'",
|
|
|
|
sname, mydevname);
|
|
|
|
return EINVAL;
|
|
|
|
} else {
|
|
|
|
warnx("unknown sensor `%s'", sname);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sname = strtok(NULL, ",");
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* check if all sensors were ok, and error out if not */
|
|
|
|
for (i = 0; i < nelems; i++) {
|
|
|
|
if (es[i].visible)
|
|
|
|
return 0;
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
warnx("no sensors selected to display");
|
|
|
|
return EINVAL;
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
static void
|
|
|
|
print_sensors(struct envsys_sensor *es, size_t nelems)
|
2000-03-10 08:51:56 +03:00
|
|
|
{
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
size_t maxlen = 0;
|
|
|
|
double temp = 0;
|
2007-07-05 16:11:05 +04:00
|
|
|
const char *invalid = "N/A";
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
const char *degrees = NULL;
|
|
|
|
int i;
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* find the longest description */
|
2007-07-12 22:24:35 +04:00
|
|
|
for (i = 0; i < nelems; i++) {
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
if (strlen(es[i].desc) > maxlen)
|
|
|
|
maxlen = strlen(es[i].desc);
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
if (width)
|
|
|
|
maxlen = width;
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* print the sensors */
|
2007-07-12 22:24:35 +04:00
|
|
|
for (i = 0; i < nelems; i++) {
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* skip sensors that were not marked as visible */
|
|
|
|
if (sensors && !es[i].visible)
|
|
|
|
continue;
|
2000-03-10 08:51:56 +03:00
|
|
|
|
2007-09-03 01:25:24 +04:00
|
|
|
/* Do not print invalid sensors if -I is set */
|
|
|
|
if ((flags & ENVSYS_IFLAG) && es[i].invalid)
|
|
|
|
continue;
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
(void)printf("%*.*s", (int)maxlen, (int)maxlen, es[i].desc);
|
|
|
|
|
2007-07-05 18:08:37 +04:00
|
|
|
if (es[i].invalid) {
|
|
|
|
(void)printf(": %10s\n", invalid);
|
|
|
|
continue;
|
|
|
|
}
|
2007-09-03 01:25:24 +04:00
|
|
|
|
2007-09-04 20:54:37 +04:00
|
|
|
if (strcmp(es[i].type, "Indicator") == 0) {
|
2007-07-05 18:08:37 +04:00
|
|
|
|
|
|
|
(void)printf(": %10s", es[i].cur_value ? "ON" : "OFF");
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* converts the value to degC or degF */
|
|
|
|
#define CONVERTTEMP(a, b, c) \
|
|
|
|
do { \
|
2007-08-29 20:55:17 +04:00
|
|
|
if (b) \
|
|
|
|
(a) = ((b) / 1000000.0) - 273.15; \
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
if (flags & ENVSYS_FFLAG) { \
|
2007-08-29 20:55:17 +04:00
|
|
|
if (b) \
|
|
|
|
(a) = (9.0 / 5.0) * (a) + 32.0; \
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
(c) = "degF"; \
|
|
|
|
} else \
|
|
|
|
(c) = "degC"; \
|
|
|
|
} while (/* CONSTCOND */ 0)
|
|
|
|
|
|
|
|
|
|
|
|
/* temperatures */
|
2007-07-05 16:11:05 +04:00
|
|
|
} else if (strcmp(es[i].type, "Temperature") == 0) {
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
CONVERTTEMP(temp, es[i].cur_value, degrees);
|
2007-07-05 18:08:37 +04:00
|
|
|
(void)printf(": %10.3f %s", temp, degrees);
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
if (es[i].critmax_value || es[i].critmin_value)
|
|
|
|
(void)printf(" ");
|
|
|
|
|
|
|
|
if (es[i].critmax_value) {
|
|
|
|
CONVERTTEMP(temp, es[i].critmax_value, degrees);
|
|
|
|
(void)printf("max: %8.3f %s ", temp, degrees);
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
if (es[i].critmin_value) {
|
|
|
|
CONVERTTEMP(temp, es[i].critmin_value, degrees);
|
|
|
|
(void)printf("min: %8.3f %s", temp, degrees);
|
|
|
|
}
|
2007-07-13 04:42:57 +04:00
|
|
|
#undef CONVERTTEMP
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* fans */
|
|
|
|
} else if (strcmp(es[i].type, "Fan") == 0) {
|
|
|
|
|
2007-07-05 18:08:37 +04:00
|
|
|
(void)printf(": %10u RPM", es[i].cur_value);
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
|
|
|
if (es[i].critmax_value || es[i].critmin_value)
|
|
|
|
(void)printf(" ");
|
|
|
|
if (es[i].critmax_value)
|
|
|
|
(void)printf("max: %8u RPM ",
|
|
|
|
es[i].critmax_value);
|
|
|
|
if (es[i].critmin_value)
|
|
|
|
(void)printf("min: %8u RPM",
|
|
|
|
es[i].critmin_value);
|
|
|
|
|
|
|
|
/* integers */
|
|
|
|
} else if (strcmp(es[i].type, "Integer") == 0) {
|
|
|
|
|
2007-07-05 18:08:37 +04:00
|
|
|
(void)printf(": %10d", es[i].cur_value);
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
2007-09-04 20:54:37 +04:00
|
|
|
/* drives */
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
} else if (strcmp(es[i].type, "Drive") == 0) {
|
2007-07-05 16:11:05 +04:00
|
|
|
|
2007-07-05 18:11:08 +04:00
|
|
|
(void)printf(": %10s", es[i].drvstate);
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
|
2007-09-04 20:54:37 +04:00
|
|
|
/* Battery state */
|
|
|
|
} else if (strcmp(es[i].type, "Battery state") == 0) {
|
|
|
|
|
|
|
|
(void)printf(": %10s", es[i].battstate);
|
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
/* everything else */
|
|
|
|
} else {
|
|
|
|
const char *type;
|
|
|
|
|
|
|
|
if (strcmp(es[i].type, "Voltage DC") == 0)
|
|
|
|
type = "V";
|
|
|
|
else if (strcmp(es[i].type, "Voltage AC") == 0)
|
|
|
|
type = "VAC";
|
|
|
|
else if (strcmp(es[i].type, "Ampere") == 0)
|
|
|
|
type = "A";
|
|
|
|
else if (strcmp(es[i].type, "Watts") == 0)
|
|
|
|
type = "W";
|
|
|
|
else if (strcmp(es[i].type, "Ohms") == 0)
|
|
|
|
type = "Ohms";
|
|
|
|
else if (strcmp(es[i].type, "Watt hour") == 0)
|
|
|
|
type = "Wh";
|
|
|
|
else if (strcmp(es[i].type, "Ampere hour") == 0)
|
|
|
|
type = "Ah";
|
|
|
|
else
|
|
|
|
type = NULL;
|
2002-12-31 08:27:29 +03:00
|
|
|
|
2007-07-05 18:08:37 +04:00
|
|
|
(void)printf(": %10.3f %s",
|
|
|
|
es[i].cur_value / 1000000.0, type);
|
2000-03-10 08:51:56 +03:00
|
|
|
|
2007-07-05 18:08:37 +04:00
|
|
|
if (es[i].percentage && es[i].max_value) {
|
|
|
|
(void)printf(" (%5.2f%%)",
|
|
|
|
(es[i].cur_value * 100.0) /
|
|
|
|
es[i].max_value);
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (es[i].critcap_value) {
|
|
|
|
(void)printf(" critical (%5.2f%%)",
|
|
|
|
(es[i].critcap_value * 100.0) /
|
|
|
|
es[i].max_value);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (es[i].critmax_value || es[i].critmin_value)
|
|
|
|
(void)printf(" ");
|
|
|
|
if (es[i].critmax_value)
|
|
|
|
(void)printf("max: %8.3f %s ",
|
|
|
|
es[i].critmax_value / 1000000.0,
|
|
|
|
type);
|
|
|
|
if (es[i].critmin_value)
|
|
|
|
(void)printf("min: %8.3f %s",
|
|
|
|
es[i].critmin_value / 1000000.0,
|
|
|
|
type);
|
|
|
|
|
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
(void)printf("\n");
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
}
|
2000-03-10 08:51:56 +03:00
|
|
|
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
static int
|
|
|
|
usage(void)
|
|
|
|
{
|
2007-09-20 22:38:49 +04:00
|
|
|
(void)fprintf(stderr, "Usage: %s [-DfIlrx] ", getprogname());
|
|
|
|
(void)fprintf(stderr, "[-d ...] [-i num] ");
|
|
|
|
(void)fprintf(stderr, "[-m ...] [-s s1,s2 ] [-w num]\n");
|
Imported envsys 2, a brief description of the new features:
(Part 3: userland)
* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.
Tested by:
blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).
2007-07-01 11:39:45 +04:00
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
/* NOTREACHED */
|
2000-03-10 08:51:56 +03:00
|
|
|
}
|