Module Name: src
Committed By: pgoyette
Date: Sat Jan 30 02:46:53 UTC 2010
Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c sysmon_envsys_events.c
Log Message:
Validate limit-based monitoring in one place, so we can apply the
constraints to both driver-requested and user-requested monitoring.
While here, clean up some of the debugging DPRINTFs.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/sysmon/sysmon_envsys_events.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.90 src/sys/dev/sysmon/sysmon_envsys.c:1.91
--- src/sys/dev/sysmon/sysmon_envsys.c:1.90 Fri Jul 10 13:09:09 2009
+++ src/sys/dev/sysmon/sysmon_envsys.c Sat Jan 30 02:46:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.90 2009/07/10 13:09:09 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.91 2010/01/30 02:46:52 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.90 2009/07/10 13:09:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.91 2010/01/30 02:46:52 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1791,12 +1791,6 @@
obj2 = prop_dictionary_get(udict, "critical-capacity");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- if ((edata->flags & ENVSYS_FMONNOTSUPP) ||
- (edata->flags & ENVSYS_FPERCENT) == 0) {
- error = ENOTSUP;
- goto out;
- }
-
lims.sel_critmin = prop_number_integer_value(obj2);
lims.sel_flags |= PROP_BATTCAP;
}
@@ -1807,12 +1801,6 @@
obj2 = prop_dictionary_get(udict, "warning-capacity");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- if ((edata->flags & ENVSYS_FMONNOTSUPP) ||
- (edata->flags & ENVSYS_FPERCENT) == 0) {
- error = ENOTSUP;
- goto out;
- }
-
lims.sel_warnmin = prop_number_integer_value(obj2);
lims.sel_flags |= PROP_BATTWARN;
}
@@ -1823,13 +1811,6 @@
obj2 = prop_dictionary_get(udict, "critical-max");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- if (edata->units == ENVSYS_INDICATOR ||
- edata->flags &
- (ENVSYS_FPERCENT | ENVSYS_FMONNOTSUPP)) {
- error = ENOTSUP;
- goto out;
- }
-
lims.sel_critmax = prop_number_integer_value(obj2);
lims.sel_flags |= PROP_CRITMAX;
}
@@ -1840,13 +1821,6 @@
obj2 = prop_dictionary_get(udict, "warning-max");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- if (edata->units == ENVSYS_INDICATOR ||
- edata->flags &
- (ENVSYS_FPERCENT | ENVSYS_FMONNOTSUPP)) {
- error = ENOTSUP;
- goto out;
- }
-
lims.sel_warnmax = prop_number_integer_value(obj2);
lims.sel_flags |= PROP_WARNMAX;
}
@@ -1857,13 +1831,6 @@
obj2 = prop_dictionary_get(udict, "critical-min");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- if (edata->units == ENVSYS_INDICATOR ||
- edata->flags &
- (ENVSYS_FPERCENT | ENVSYS_FMONNOTSUPP)) {
- error = ENOTSUP;
- goto out;
- }
-
lims.sel_critmin = prop_number_integer_value(obj2);
lims.sel_flags |= PROP_CRITMIN;
}
@@ -1874,18 +1841,15 @@
obj2 = prop_dictionary_get(udict, "warning-min");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- if (edata->units == ENVSYS_INDICATOR ||
- edata->flags &
- (ENVSYS_FPERCENT | ENVSYS_FMONNOTSUPP)) {
- error = ENOTSUP;
- goto out;
- }
-
lims.sel_warnmin = prop_number_integer_value(obj2);
lims.sel_flags |= PROP_WARNMIN;
}
if (lims.sel_flags) {
+ if (edata->flags & ENVSYS_FMONNOTSUPP) {
+ error = ENOTSUP;
+ goto out;
+ }
error = sme_event_register(dict, edata, sme, &lims,
(edata->flags & ENVSYS_FPERCENT)?
PENVSYS_EVENT_CAPACITY:
Index: src/sys/dev/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.76 src/sys/dev/sysmon/sysmon_envsys_events.c:1.77
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.76 Tue Jan 26 14:22:00 2010
+++ src/sys/dev/sysmon/sysmon_envsys_events.c Sat Jan 30 02:46:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.76 2010/01/26 14:22:00 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.77 2010/01/30 02:46:52 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.76 2010/01/26 14:22:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.77 2010/01/30 02:46:52 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -93,6 +93,27 @@
KASSERT(sdict != NULL);
KASSERT(edata != NULL);
KASSERT(sme != NULL);
+ KASSERT(lims != NULL);
+
+ /*
+ * Some validation first for limit-checking events
+ *
+ * Capacity limits are permitted only if the sensor has the
+ * ENVSYS_FPERCENT flag set.
+ * Value limits are permitted only if the ENVSYS_FPERCENT
+ * flag is not set and the units is not ENVSYS_INDICATOR.
+ */
+
+ DPRINTF(("%s: units %d lim-flags 0x%04x edata-flags 0x%04x\n",
+ __func__, edata->units, lims->sel_flags, edata->flags));
+
+ if ((lims->sel_flags & PROP_VAL_LIMITS) &&
+ ((edata->flags & ENVSYS_FPERCENT) ||
+ (edata->units == ENVSYS_INDICATOR)))
+ return ENOTSUP;
+ if ((lims->sel_flags & PROP_CAP_LIMITS) &&
+ !(edata->flags & ENVSYS_FPERCENT))
+ return ENOTSUP;
/*
* check if the event is already on the list and return
@@ -111,8 +132,8 @@
*/
KASSERT(edata == osee->see_edata);
- DPRINTF(("%s: dev %s sensor %s lim_flags 0x%04x event exists\n",
- __func__, sme->sme_name, edata->desc, lims->sel_flags));
+ DPRINTF(("%s: dev %s sensor %s: event type %d exists\n",
+ __func__, sme->sme_name, edata->desc, crittype));
see = osee;
if (lims->sel_flags & PROP_CRITMAX) {
@@ -125,16 +146,14 @@
}
if (lims->sel_flags & PROP_WARNMAX) {
if (lims->sel_warnmax == edata->limits.sel_warnmax) {
- DPRINTF(("%s: type=%d (warnmax exists)\n",
- __func__, crittype));
+ DPRINTF(("%s: warnmax exists\n", __func__));
error = EEXIST;
lims->sel_flags &= ~PROP_WARNMAX;
}
}
if (lims->sel_flags & (PROP_WARNMIN | PROP_BATTWARN)) {
if (lims->sel_warnmin == edata->limits.sel_warnmin) {
- DPRINTF(("%s: type=%d (warnmin exists)\n",
- __func__, crittype));
+ DPRINTF(("%s: warnmin exists\n", __func__));
error = EEXIST;
lims->sel_flags &=
~(PROP_WARNMIN | PROP_BATTWARN);
@@ -142,8 +161,7 @@
}
if (lims->sel_flags & (PROP_CRITMIN | PROP_BATTCAP)) {
if (lims->sel_critmin == edata->limits.sel_critmin) {
- DPRINTF(("%s: type=%d (critmin exists)\n",
- __func__, crittype));
+ DPRINTF(("%s: critmin exists\n", __func__));
error = EEXIST;
lims->sel_flags &=
~(PROP_CRITMIN | PROP_BATTCAP);
@@ -159,8 +177,8 @@
if (see == NULL)
return ENOMEM;
- DPRINTF(("%s: dev %s sensor %s lim_flags 0x%04x new event\n",
- __func__, sme->sme_name, edata->desc, lims->sel_flags));
+ DPRINTF(("%s: dev %s sensor %s: new event\n",
+ __func__, sme->sme_name, edata->des));
see->see_type = crittype;
see->see_sme = sme;
