 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysmon_envsys.c,v 1.111 2010/12/16 16:08:57 njoly Exp $	*/
+/*	$NetBSD: sysmon_envsys.c,v 1.112 2010/12/30 03:59:59 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
  * All rights reserved.
+ *
  * 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.
 @@ -54,27 +54,27 @@
  * 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.
  */
 /*
  * Environmental sensor framework for sysmon, exported to userland
  * with proplib(3).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.111 2010/12/16 16:08:57 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.112 2010/12/30 03:59:59 pgoyette Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 /* #define ENVSYS_DEBUG */
 @@ -1165,26 +1165,27 @@ sme_remove_userprops(void)
 				sdt_units = sme_find_table_entry(SME_DESC_UNITS,
 				    edata->units);
 				sme_event_register(sdict, edata, sme,
 				    &lims, props, PENVSYS_EVENT_LIMITS,
 				    sdt_units->crittype);
+			}
+		}
 		/*
 		 * Restore default timeout value.
 		 */
 		sme->sme_events_timeout = SME_EVENTS_DEFTIMEOUT;
 		sme_schedule_callout(sme);
 		sysmon_envsys_release(sme, false);
+	}
 	mutex_exit(&sme_global_mtx);
+}
 /*
  * sme_add_property_dictionary:
+ *
  * 	+ Add global properties into a device.
  */
 static int
 sme_add_property_dictionary(struct sysmon_envsys *sme, prop_array_t array,
 			    prop_dictionary_t dict)
 @@ -1204,28 +1205,30 @@ sme_add_property_dictionary(struct sysmo
 	 * 	...
 	 * 	<dict>
 	 * 		<key>device-properties</key>
 	 * 		<dict>
 	 * 			<key>refresh-timeout</key>
 	 * 			<integer>120</integer<
 	 *			<key>device-class</key>
 	 *			<string>class_name</string>
 	 * 		</dict>
 	 * 	</dict>
 	 * 	...
+	 *
 	 */
-	if (!sme->sme_events_timeout)
+	if (sme->sme_events_timeout == 0) {
 		sme->sme_events_timeout = SME_EVENTS_DEFTIMEOUT;
 		sme_schedule_callout(sme);
+	}
 	if (!prop_dictionary_set_uint64(pdict, "refresh-timeout",
 					sme->sme_events_timeout)) {
 		error = EINVAL;
 		goto out;
+	}
 	if (sme->sme_class == SME_CLASS_BATTERY)
 		class = "battery";
 	else if (sme->sme_class == SME_CLASS_ACADAPTER)
 		class = "ac-adapter";
 	else
 		class = "other";
 	if (!prop_dictionary_set_cstring_nocopy(pdict, "device-class", class)) {
 @@ -1795,27 +1798,30 @@ sme_userset_dictionary(struct sysmon_env
 	if (obj && prop_object_type(obj) == PROP_TYPE_DICTIONARY) {
 		/*
 		 * Get the 'refresh-timeout' property for this device.
 		 */
 		obj1 = prop_dictionary_get(obj, "refresh-timeout");
 		if (obj1 && prop_object_type(obj1) == PROP_TYPE_NUMBER) {
 			targetfound = true;
 			refresh_timo =
 			    prop_number_unsigned_integer_value(obj1);
 			if (refresh_timo < 1)
 				error = EINVAL;
 			else {
 				mutex_enter(&sme->sme_mtx);
-				sme->sme_events_timeout = refresh_timo;
+				if (sme->sme_events_timeout != refresh_timo) {
 					sme->sme_events_timeout = refresh_timo;
 					sme_schedule_callout(sme);
+				}
 				mutex_exit(&sme->sme_mtx);
+		}
+		}
 		return error;
 	} else if (!obj) {
 		/*
 		 * Get sensor's index from userland dictionary.
 		 */
 		obj = prop_dictionary_get(udict, "index");
 		if (!obj)
 			return EINVAL;
 		if (prop_object_type(obj) != PROP_TYPE_STRING) {

 @@ -1,14 +1,14 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.96 2010/12/15 17:17:17 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.97 2010/12/30 03:59:59 pgoyette Exp $ */
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
  * All rights reserved.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * 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.
  */
 /*
  * sysmon_envsys(9) events framework.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.96 2010/12/15 17:17:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.97 2010/12/30 03:59:59 pgoyette Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <sys/callout.h>
 /* #define ENVSYS_DEBUG */
 @@ -476,53 +476,71 @@ do {									\
 	 */
 	kmem_free(sed_t, sizeof(*sed_t));
+}
 /*
  * sme_events_init:
+ *
  * 	+ Initialize the events framework for this device.
  */
 int
 sme_events_init(struct sysmon_envsys *sme)
+{
 	int error = 0;
 	uint64_t timo;
 	KASSERT(sme != NULL);
 	KASSERT(mutex_owned(&sme->sme_mtx));
 	if (sme->sme_events_timeout)
 		timo = sme->sme_events_timeout * hz;
 	else
 		timo = SME_EVTIMO;
 	error = workqueue_create(&sme->sme_wq, sme->sme_name,
 	    sme_events_worker, sme, PRI_NONE, IPL_SOFTCLOCK, WQ_MPSAFE);
 	if (error)
 		return error;
 	mutex_init(&sme->sme_callout_mtx, MUTEX_DEFAULT, IPL_SOFTCLOCK);
 	callout_init(&sme->sme_callout, CALLOUT_MPSAFE);
 	callout_setfunc(&sme->sme_callout, sme_events_check, sme);
 	callout_schedule(&sme->sme_callout, timo);
 	sme->sme_flags |= SME_CALLOUT_INITIALIZED;
 	sme_schedule_callout(sme);
 	DPRINTF(("%s: events framework initialized for '%s'\n",
 	    __func__, sme->sme_name));
 	return error;
+}
 /*
  * sme_schedule_callout
+ *
  *	(Re)-schedule the device's callout timer
  */
 void
 sme_schedule_callout(struct sysmon_envsys *sme)
+{
 	uint64_t timo;
 	KASSERT(sme != NULL);
 	if ((sme->sme_flags & SME_CALLOUT_INITIALIZED) == 0)
 		return;
 	if (sme->sme_events_timeout)
 		timo = sme->sme_events_timeout * hz;
 	else
 		timo = SME_EVTIMO;
 	callout_stop(&sme->sme_callout);
 	callout_schedule(&sme->sme_callout, timo);
+}
 /*
  * sme_events_destroy:
+ *
  * 	+ Destroys the event framework for this device: callout
  * 	  stopped, workqueue destroyed and callout mutex destroyed.
  */
 void
 sme_events_destroy(struct sysmon_envsys *sme)
+{
 	KASSERT(mutex_owned(&sme->sme_mtx));
 	callout_stop(&sme->sme_callout);
 	workqueue_destroy(sme->sme_wq);
 	mutex_destroy(&sme->sme_callout_mtx);
 @@ -620,27 +638,27 @@ sme_events_check(void *arg)
 	KASSERT(sme != NULL);
 	mutex_enter(&sme->sme_callout_mtx);
 	LIST_FOREACH(see, &sme->sme_events_list, see_list) {
 		workqueue_enqueue(sme->sme_wq, &see->see_wk, NULL);
 		see->see_edata->flags |= ENVSYS_FNEED_REFRESH;
+	}
 	if (sme->sme_events_timeout)
 		timo = sme->sme_events_timeout * hz;
 	else
 		timo = SME_EVTIMO;
 	if (!sysmon_low_power)
-		callout_schedule(&sme->sme_callout, timo);
+		sme_schedule_callout(sme);
 	mutex_exit(&sme->sme_callout_mtx);
+}
 /*
  * sme_events_worker:
+ *
  * 	+ workqueue thread that checks if there's a critical condition
  * 	  and sends an event if it was triggered.
  */
 void
 sme_events_worker(struct work *wk, void *arg)
+{
 	sme_event_t *see = (void *)wk;

 @@ -1,14 +1,14 @@
-/* $NetBSD: sysmon_envsysvar.h,v 1.37 2010/12/15 17:17:17 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsysvar.h,v 1.38 2010/12/30 03:59:59 pgoyette Exp $ */
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
  * All rights reserved.
+ *
  * 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.
 @@ -123,25 +123,26 @@ void	sysmon_envsys_release(struct sysmon
  */
 int	sme_event_register(prop_dictionary_t, envsys_data_t *,
 			   struct sysmon_envsys *, sysmon_envsys_lim_t *,
 			   uint32_t, int, int);
 int	sme_event_unregister(struct sysmon_envsys *, const char *, int);
 void	sme_event_unregister_all(struct sysmon_envsys *);
 void	sme_event_drvadd(void *);
 int	sme_events_init(struct sysmon_envsys *);
 void	sme_events_destroy(struct sysmon_envsys *);
 void	sme_events_check(void *);
 void	sme_events_worker(struct work *, void *);
 void	sme_deliver_event(sme_event_t *);
 int	sme_update_limits(struct sysmon_envsys *, envsys_data_t *);
 void	sme_schedule_callout(struct sysmon_envsys *);
 /*
  * common functions to create/update objects in a dictionary.
  */
 int	sme_sensor_upbool(prop_dictionary_t, const char *, bool);
 int	sme_sensor_upint32(prop_dictionary_t, const char *, int32_t);
 int	sme_sensor_upuint32(prop_dictionary_t, const char *, uint32_t);
 int	sme_sensor_upstring(prop_dictionary_t, const char *, const char *);
 const struct sme_descr_entry *sme_find_table_entry(enum sme_descr_type, int);
 #endif /* _DEV_SYSMON_ENVSYSVAR_H_ */