[src/trunk]: src/sys/dev/sysmon Check for value exceeding crit-max limit befo...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d8acb53d90a5
branches:  trunk
changeset: 750305:d8acb53d90a5
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed Dec 23 18:31:00 2009 +0000

description:
Check for value exceeding crit-max limit before checking against warn-max
limit.  Otherwise we'll never notice if we exceed crit-max (assuming that
crit-max is at least as large as warn-max).

diffstat:

 sys/dev/sysmon/sysmon_envsys_events.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 7327b99f267c -r d8acb53d90a5 sys/dev/sysmon/sysmon_envsys_events.c
--- a/sys/dev/sysmon/sysmon_envsys_events.c     Wed Dec 23 18:02:25 2009 +0000
+++ b/sys/dev/sysmon/sysmon_envsys_events.c     Wed Dec 23 18:31:00 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.71 2009/07/10 15:27:33 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.72 2009/12/23 18:31:00 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.71 2009/07/10 15:27:33 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.72 2009/12/23 18:31:00 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -671,10 +671,10 @@
                        else if __EXCEED_LIM(PROP_WARNMIN | PROP_BATTWARN, 
                                        sel_warnmin, <)
                                edata->state = ENVSYS_SWARNUNDER;
+                       else if __EXCEED_LIM(PROP_CRITMAX, sel_critmax, >)
+                               edata->state = ENVSYS_SCRITOVER;
                        else if __EXCEED_LIM(PROP_WARNMAX, sel_warnmax, >)
                                edata->state = ENVSYS_SWARNOVER;
-                       else if __EXCEED_LIM(PROP_CRITMAX, sel_critmax, >)
-                               edata->state = ENVSYS_SCRITOVER;
                }
 #undef __EXCEED_LIM