Changeset 4437

Timestamp:

06/10/07 14:36:44 (6 years ago)

Author:

khali

Message:

More cleanups to fancontrol:
* No longer depend on grep. We already depend on egrep so let's use it

everywhere.

* Don't depend on awk to compute the target PWM value. Bash has an arithmetic

expression evaluation engine which does the job just fine.

* Use read instead of cat to read the sensor values. read is built-in, so

it's cheaper.

* When sysfs is used (2.6 kernel), do not postproces the sensor value reads

with cut, as it is not needed.

* Update the dependency list.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/pwm/fancontrol (modified) (8 diffs)

lm-sensors/trunk/CHANGES

@@ -16 +16 @@
                    Fix Super-I/O exit sequence for Winbond/Fintek chips
   Program fancontrol: Use let for arithmetic evaluation
+                      No longer need awk and grep
+                      Limit calls to external programs (Linux 2.6 only)
   Program pwmconfig: Use smaller steps for low PWM values
   Program rrd: Support non-i2c devices (hwmon class)

lm-sensors/trunk/prog/pwm/fancontrol

@@ -3 +3 @@
 # Simple script implementing a temperature dependent fan speed control
 #
-# Version 0.64
+# Version 0.65
 #
 # Usage: fancontrol [CONFIGFILE]
 #
 # Dependencies:
-#   bash, awk, egrep, sed, lm_sensors :)
+#   bash, egrep, sed, cut, sleep, lm_sensors :)
 #
 # Please send any questions, comments or success stories to
@@ -105 +105 @@
 then
         # For Linux 2.6, detect if config file uses the hwmon class or not yet
-        if echo "$AFCPWM[0]" | grep '^hwmon[0-9]'
+        if echo "${AFCPWM[0]}" | egrep -q '^hwmon[0-9]'
         then
                 SDIR=/sys/class/hwmon
@@ -196 +196 @@
 
 trap restorefans SIGHUP SIGINT SIGQUIT SIGTERM SIGKILL
-
-# function doing all the math
-function calc () {
-        awk "BEGIN { print $@ }"
-}
 
 # main function
@@ -216 +211 @@
                 minso=${AFCMINSTOP[$fcvcount]}
                 
-                tval=`cat ${tsens}`
+                read tval < ${tsens}
                 if [ $? -ne 0 ]
                 then
@@ -222 +217 @@
                         restorefans
                 fi
-                tval=`echo ${tval} |cut -d' ' -f3 |cut -d'.' -f1`
                 if [ "$SYSFS" = "1" ]
                 then
-                        let tval="$tval / 1000"
-                fi
-
-                pwmpval=`cat ${pwmo}`
+                        let tval="($tval+500)/1000"
+                else
+                        tval=`echo ${tval} | cut -d' ' -f3 | cut -d'.' -f1`
+                fi
+
+                read pwmpval < ${pwmo}
                 if [ $? -ne 0 ]
                 then
@@ -234 +230 @@
                         restorefans
                 fi
-                pwmpval=`echo ${pwmpval} | cut -d' ' -f1`
+                if [ "$SYSFS" != "1" ]
+                then
+                        pwmpval=`echo ${pwmpval} | cut -d' ' -f1`
+                fi
                 
                 # If fanspeed-sensor output shall be used, do it
                 if [[ -n ${fan} ]]
                 then
-                        fanval=`cat ${fan}`
+                        read fanval < ${fan}
                         if [ $? -ne 0 ]
                         then
@@ -245 +244 @@
                                 restorefans
                         fi
-                        fanval=`echo ${fanval} | cut -d' ' -f2`
+                        if [ "$SYSFS" != "1" ]
+                        then
+                                fanval=`echo ${fanval} | cut -d' ' -f2`
+                        fi
                 else
                         fanval=1  # set it to a non zero value, so the rest of the script still works
@@ -271 +273 @@
                 else 
                   # calculate the new value from temperature and settings
-                  pwmval=`calc "(((${tval}-${mint})/(${maxt}-${mint}))^2*(255-${minso})+${minso})" |cut -d'.' -f1`
+                  let pwmval="((${tval}-${mint})**2)*(255-${minso})/((${maxt}-${mint})**2)+${minso}"
                   if [ $pwmpval -eq 0 -o $fanval -eq 0 ]
                   then # if fan was stopped start it using a safe value