Changeset 4693

Timestamp:

08/22/07 19:04:12 (6 years ago)

Author:

khali

Message:

Drop support for reloading the configuration with sensors_init().
Instead, the application will have to call sensors_exit() explicitly
before calling sensors_init() again. Most applications don't offer
any way to reload the configuration file, so better optimize for the
initial load.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• lib/init.c (modified) (1 diff)
• lib/libsensors.3 (modified) (1 diff)
• lib/sensors.h (modified) (1 diff)
• prog/sensord/lib.c (modified) (1 diff)

lm-sensors/branches/lm-sensors-3.0.0/lib/init.c

@@ -41 +41 @@
 {
   int res;
-  sensors_cleanup();
+
   if (!sensors_init_sysfs())
     return -SENSORS_ERR_PROC;

lm-sensors/branches/lm-sensors-3.0.0/lib/libsensors.3

@@ -54 +54 @@
 .B int sensors_init(FILE *input);
 .br
-(Re)load the configuration file and the detected chips list. If this returns a value unequal to zero, you are in trouble; you can not assume anything will be initialized properly.
+Load the configuration file and the detected chips list. If this returns a
+value unequal to zero, you are in trouble; you can not assume anything will
+be initialized properly. If you want to reload the configuration file, call
+sensors_cleanup() below before calling sensors_init() again.
 
 .B void sensors_cleanup(void);

lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.h

@@ -57 +57 @@
 } sensors_chip_name;
 
-/* (Re)load the configuration file and the detected chips list. If this
-    returns a value unequal to zero, you are in trouble; you can not
-    assume anything will be initialized properly. */
+/* Load the configuration file and the detected chips list. If this
+   returns a value unequal to zero, you are in trouble; you can not
+   assume anything will be initialized properly. If you want to
+   reload the configuration file, call sensors_cleanup() below before
+   calling sensors_init() again. */
 int sensors_init(FILE *input);
 

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/lib.c

@@ -91 +91 @@
     ret = 10;
   } else if (!reload || (difftime (stats.st_mtime, cfgLastModified) > 0.0)) {
-    if (reload)
+    if (reload) {
       sensorLog (LOG_INFO, "configuration reloading");
+      sensors_cleanup ();
+    }
     if (!(cfg = fopen (cfgPath, "r"))) {
       sensorLog (LOG_ERR, "Error opening sensors configuration file: %s", cfgPath);