Changeset 5770

Timestamp:

09/16/09 17:57:53 (4 years ago)

Author:

khali

Message:

Save hwmon device paths and names in configuration file, and check them
before starting any fan control operation.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/pwm/fancontrol (modified) (4 diffs)
• prog/pwm/fancontrol.8 (modified) (3 diffs)
• prog/pwm/pwmconfig (modified) (6 diffs)

lm-sensors/trunk/CHANGES

@@ -5 +5 @@
   libsensors: Support upcoming sysfs path to i2c adapters
   fancontrol: Check that all referenced sysfs files exist
+              Check that all devices match the configuration file
   pwmconfig: Exit immediately if not root
+             Save device paths and names in configuration file
   sensors.conf.default: Encourage user to not modify this file
   sensors-detect: Refer to tmp401 driver if TMP411 is detected

lm-sensors/trunk/prog/pwm/fancontrol

@@ -4 +4 @@
 # Supported Linux kernel versions: 2.6.5 and later
 #
-# Version 0.69
+# Version 0.70
 #
 # Usage: fancontrol [CONFIGFILE]
 #
 # Dependencies:
-#   bash, egrep, sed, cut, sleep, lm_sensors :)
+#   bash, egrep, sed, cut, sleep, readlink, lm_sensors :)
 #
 # Please send any questions, comments or success stories to
@@ -56 +56 @@
         # grep configuration from file
         INTERVAL=`egrep '^INTERVAL=.*$' $1 | sed -e 's/INTERVAL=//g'`
+        DEVPATH=`egrep '^DEVPATH=.*$' $1 | sed -e 's/DEVPATH= *//g'`
+        DEVNAME=`egrep '^DEVNAME=.*$' $1 | sed -e 's/DEVNAME= *//g'`
         FCTEMPS=`egrep '^FCTEMPS=.*$' $1 | sed -e 's/FCTEMPS=//g'`
         MINTEMP=`egrep '^MINTEMP=.*$' $1 | sed -e 's/MINTEMP=//g'`
@@ -153 +155 @@
 }
 
+function DevicePath()
+{
+        if [ -h "$1/device" ]
+        then
+                readlink -f "$1/device" | sed -e 's/^\/sys\///'
+        fi
+}
+
+function DeviceName()
+{
+        if [ -r "$1/name" ]
+        then
+                cat "$1/name" | sed -e 's/[[:space:]=]/_/g'
+        elif [ -r "$1/device/name" ]
+        then
+                cat "$1/device/name" | sed -e 's/[[:space:]=]/_/g'
+        fi
+}
+
+function ValidateDevices()
+{
+        local OLD_DEVPATH="$1" OLD_DEVNAME="$2" outdated=0
+        local entry device name path
+
+        for entry in $OLD_DEVPATH
+        do
+                device=`echo "$entry" | sed -e 's/=[^=]*$//'`
+                path=`echo "$entry" | sed -e 's/^[^=]*=//'`
+
+                if [ "`DevicePath "$device"`" != "$path" ]
+                then
+                        echo "Device path of $device has changed"
+                        outdated=1
+                fi
+        done
+
+        for entry in $OLD_DEVNAME
+        do
+                device=`echo "$entry" | sed -e 's/=[^=]*$//'`
+                name=`echo "$entry" | sed -e 's/^[^=]*=//'`
+
+                if [ "`DeviceName "$device"`" != "$name" ]
+                then
+                        echo "Device name of $device has changed"
+                        outdated=1
+                fi
+        done
+
+        return $outdated
+}
+
 # Check that all referenced sysfs files exist
 function CheckFiles {
@@ -233 +286 @@
 cd $DIR
 
+# Check for configuration change
+if [ -z "$DEVPATH" -o -z "$DEVNAME" ]
+then
+        echo "Configuration is too old, please run pwmconfig again"
+        exit 1
+fi
+if ! ValidateDevices "$DEVPATH" "$DEVNAME"
+then
+        echo "Configuration appears to be outdated, please run pwmconfig again"
+        exit 1
+fi
 CheckFiles || exit 1
 

lm-sensors/trunk/prog/pwm/fancontrol.8

@@ -39 +39 @@
 \fBfancontrol\fP will be executed
 .TP
+.B DEVPATH
+Maps hwmon class devices to physical devices. This lets \fBfancontrol\fP
+check that the configuration file is still up-to-date.
+.TP
+.B DEVNAME
+Records hwmon class device names. This lets \fBfancontrol\fP check that
+the configuration file is still up-to-date.
+.TP
 .B FCTEMPS
 Maps PWM outputs to temperature sensors so \fBfancontrol\fP knows which
@@ -45 +53 @@
 .TP
 .B FCFANS
-FCFANS records the association between a PWM and a fan.
+Records the association between a PWM output and a fan input.
 Then \fBfancontrol\fP can check the fan speed and restart it if it
 stops unexpectedly.
@@ -93 +101 @@
 editing the config file directly following the rules above.
 
-Upon starting, fancontrol will make sure that all referenced sysfs files
-do exist. If not, it will quit immediately, upon the assumption that the
-configuration file may be out-of-sync with the loaded kernel drivers.
+Upon starting, fancontrol will make sure that all referenced devices
+do exist and match what they were at configuration time, and that all
+referenced sysfs files do exist. If not, it will quit immediately, upon
+the assumption that the configuration file may be out-of-sync with the
+loaded kernel drivers.
 
 .SH THE ALGORITHM

lm-sensors/trunk/prog/pwm/pwmconfig

@@ -540 +540 @@
 fi
 
+function DevicePath()
+{
+        if [ -h "$1/device" ]
+        then
+                readlink -f "$1/device" | sed -e 's/^\/sys\///'
+        fi
+}
+
+function DeviceName()
+{
+        if [ -r "$1/name" ]
+        then
+                cat "$1/name" | sed -e 's/[[:space:]=]/_/g'
+        elif [ -r "$1/device/name" ]
+        then
+                cat "$1/device/name" | sed -e 's/[[:space:]=]/_/g'
+        fi
+}
+
+function ValidateDevices()
+{
+        local OLD_DEVPATH="$1" OLD_DEVNAME="$2" outdated=0
+        local entry device name path
+
+        for entry in $OLD_DEVPATH
+        do
+                device=`echo "$entry" | sed -e 's/=[^=]*$//'`
+                path=`echo "$entry" | sed -e 's/^[^=]*=//'`
+
+                if [ "`DevicePath "$device"`" != "$path" ]
+                then
+                        echo "Device path of $device has changed"
+                        outdated=1
+                fi
+        done
+
+        for entry in $OLD_DEVNAME
+        do
+                device=`echo "$entry" | sed -e 's/=[^=]*$//'`
+                name=`echo "$entry" | sed -e 's/^[^=]*=//'`
+
+                if [ "`DeviceName "$device"`" != "$name" ]
+                then
+                        echo "Device name of $device has changed"
+                        outdated=1
+                fi
+        done
+
+        return $outdated
+}
+
 function AskPath()
 {
@@ -567 +618 @@
 function LoadConfig()
 {
+        local OLD_DEVPATH OLD_DEVNAME
+
         # Nothing to do
         if [ ! -f "$1" ]
@@ -576 +629 @@
         echo "Loading configuration from $1 ..."
         INTERVAL=`egrep '^INTERVAL=.*$' $1 | sed -e 's/INTERVAL= *//g'`
+        OLD_DEVPATH=`egrep '^DEVPATH=.*$' $1 | sed -e 's/DEVPATH= *//g'`
+        OLD_DEVNAME=`egrep '^DEVNAME=.*$' $1 | sed -e 's/DEVNAME= *//g'`
         FCTEMPS=`egrep '^FCTEMPS=.*$' $1 | sed -e 's/FCTEMPS= *//g'`
         FCFANS=`egrep '^FCFANS=.*$' $1 | sed -e 's/FCFANS= *//g'`
@@ -586 +641 @@
 
         # Check for configuration change
-        local item
-        for item in $FCFANS
-        do
-                if [ ! -f "`echo $item | sed -e 's/=.*$//'`" ]
-                then
-                        echo "Configuration appears to be outdated, discarded"
-                        ClearConfig
-                        return 0
-                fi
-        done
+        if ! ValidateDevices "$OLD_DEVPATH" "$OLD_DEVNAME"
+        then
+                echo "Configuration appears to be outdated, discarded"
+                ClearConfig
+                return 0
+        fi
 }
 
@@ -676 +727 @@
 }
 
+# Remember the path and name of each device with at least one
+# reference (pwm, temp or fan) in the configuration file.
+# This function sets globals DEVPATH and DEVNAME as a side effect.
+function RememberDevices()
+{
+        local used entry device name path tempfandev pwmdev
+        DEVPATH=""
+        DEVNAME=""
+
+        for device in $DEVICES
+        do
+                device=`echo "$device" | sed -e 's/\/.*$//'`
+
+                used=0
+                for entry in $1 $2
+                do
+                        pwmdev=`echo "$entry" | sed -e 's/\/.*$//'`
+                        tempfandev=`echo "$entry" | sed -e 's/^[^=]*=//' -e 's/\/.*$//'`
+
+                        if [ "$device" = "$pwmdev" -o "$device" = "$tempfandev" ]
+                        then
+                                used=1
+                        fi
+                done
+                if [ "$used" -eq 0 ]
+                then
+                        continue
+                fi
+
+                # Record the device path and name. This lets the fancontrol
+                # script check that they didn't change. If they did, then the
+                # configuration file can no longer be trusted.
+                path=`DevicePath "$device"`
+                if [ -z "$DEVPATH" ]
+                then
+                        DEVPATH="$device=$path"
+                else
+                        DEVPATH="$DEVPATH $device=$path"
+                fi
+
+                name=`DeviceName "$device"`
+                if [ -z "$DEVNAME" ]
+                then
+                        DEVNAME="$device=$name"
+                else
+                        DEVNAME="$DEVNAME $device=$name"
+                fi
+        done
+}
+
 function SaveConfig()
 {
+        RememberDevices "$FCTEMPS" "$FCFANS"
+
         echo
         echo "Saving configuration to $FCCONFIG..."
@@ -684 +787 @@
         echo "# Configuration file generated by pwmconfig, changes will be lost" >$tmpfile
         echo "INTERVAL=$INTERVAL" >>$tmpfile
+        echo "DEVPATH=$DEVPATH" >>$tmpfile
+        echo "DEVNAME=$DEVNAME" >>$tmpfile
         echo "FCTEMPS=$FCTEMPS" >>$tmpfile
         echo "FCFANS=$FCFANS" >>$tmpfile