Ticket #1027: updated_temp_sensor.patch

configure

@@ -1792 +1792 @@
   fi
 fi
 
+#########################################
+# lmsensor probe
+
+cat > $TMPC << EOF
+#include <sensors/sensors.h>
+int main( void ) { return; };
+EOF
+
+lmsensors=no
+if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -lsensors > /dev/null 2>&1; then
+  lmsensors=yes
+fi
+
 ##########################################
 # SDL probe
 
@@ -2442 +2455 @@
   echo "FREETYPE_CFLAGS=`freetype-config --cflags`" >> $MYTH_CONFIG_MAK
   echo "FREETYPE_LIBS=`freetype-config --libs`" >> $MYTH_CONFIG_MAK
 fi
+if test "$lmsensors" = "yes" ; then
+  CCONFIG="$CCONFIG using_lmsensors"
+  echo "#define CONFIG_LMSENSORS 1" >> $TMPH
+fi
 if test "$sunmlib" = "yes" ; then
   echo "HAVE_MLIB=yes" >> $MYTH_CONFIG_MAK
   echo "#define HAVE_MLIB 1" >> $TMPH

programs/mythbackend/mythbackend.pro

@@ -24 +24 @@
 using_dvb:DEFINES += USING_DVB
 
 using_valgrind:DEFINES += USING_VALGRIND
+
+using_lmsensors:LIBS += -lsensors

programs/mythbackend/mainserver.cpp

@@ -45 +45 @@
 #include "jobqueue.h"
 #include "autoexpire.h"
 #include "previewgenerator.h"
+#ifdef CONFIG_LMSENSORS
+    #define LMSENSOR_DEFAULT_CONFIG_FILE "/etc/sensors.conf"
+    #include <sensors/sensors.h>
+    #include <sensors/chips.h>
+#endif
 
 /** Milliseconds to wait for an existing thread from
  *  process request thread pool.
@@ -3903 +3908 @@
     QDomElement mInfo   = pDoc->createElement("MachineInfo");
     QDomElement storage = pDoc->createElement("Storage"    );
     QDomElement load    = pDoc->createElement("Load"       );
+    QDomElement thermal = pDoc->createElement("Thermal"    );
     QDomElement guide   = pDoc->createElement("Guide"      );
 
     root.appendChild (mInfo  );
@@ -3984 +3990 @@
         load.setAttribute("avg3", rgdAverages[2]);
     }
 
+    //temperature -----------------
+    // Try ACPI first, then lmsensor 2nd
+    QDir dir("/proc/acpi/thermal_zone");
+    bool found_acpi = false;
+    if (dir.exists())
+    {
+        QString acpiTempDir;
+        QStringList lst = dir.entryList();
+        QRegExp rxp = QRegExp ("TH?M?", TRUE, FALSE);
+        QString line, temp;
+        for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it)
+        {
+            if ( (*it).contains(rxp))
+            {
+                acpiTempDir = dir.absFilePath(*it);
+            }
+        }
+       
+        QFile acpiTempFile(acpiTempDir.append("/temperature"));
+        if (acpiTempFile.open(IO_ReadOnly))
+        {
+            QTextStream stream (&acpiTempFile);
+            line = stream.readLine();
+            rxp = QRegExp ("(\\d+)", TRUE, FALSE);
+            if (rxp.search(line) != -1 )
+            {
+                temp = rxp.cap(1);
+                temp += " &#8451;"; // print degress Celsius 
+                mInfo.appendChild(thermal);
+                thermal.setAttribute("temperature", temp);
+                found_acpi = true;
+            }
+        }
+        acpiTempFile.close();
+    }
+#ifdef CONFIG_LMSENSORS
+    if (!found_acpi)
+    {
+        int chip_nr, a, b;
+        char *label;
+        double value;
+        const sensors_chip_name *chip;
+        const sensors_feature_data *data;
+        const char* lmsensorConfigName = LMSENSOR_DEFAULT_CONFIG_FILE;
+        a = b = 0;
+        FILE *lmsensorConfigFile = fopen(lmsensorConfigName, "r");
+        sensors_init(lmsensorConfigFile);
+        fclose(lmsensorConfigFile);
+        for (chip_nr = 0 ; (chip = sensors_get_detected_chips(&chip_nr)) ; )
+        {
+            while ((data = sensors_get_all_features(*chip, &a, &b)))
+            {
+                if ((!sensors_get_label(*chip, data->number, &label)) && 
+                    (!sensors_get_feature(*chip, data->number, &value)))
+                {
+                    // Find label matching "CPU Temp" or "Temp/CPU" or something close to that
+                    QRegExp rxp = QRegExp ("(CPU.+Temp)|(Temp.+CPU)", FALSE, FALSE);
+                    if (rxp.search(QString(label)) != -1  && value > 0)
+                    {
+                        VERBOSE(VB_IMPORTANT,
+                                QString("Temp debug. Remove before committing: lmsensor temp label %1 value %2")
+                                .arg(label).arg(value));
+                        QString temp = QString("%1").arg(value);
+                        temp += " &#8451;";
+                        mInfo.appendChild(thermal);
+                        thermal.setAttribute("temperature", temp);
+                    }
+                }
+            }
+        }
+    }
+#endif
     // Guide Data ---------------------
 
     QDateTime GuideDataThrough;

programs/mythbackend/httpstatus.cpp

@@ -733 +733 @@
         }
     }
 
+   // ACPI temperature ------------------
+
+    node = info.namedItem( "Thermal" );
+
+    if (!node.isNull())
+    {
+        QDomElement e = node.toElement();
+
+        if (!e.isNull())
+        {
+            std::string temperature = e.attribute( "temperature" , "0" );
+
+            os << "      Current CPU temperature: "
+               << temperature
+               << ".<br />\r\n";
+        }
+    }
+        
     // Guide Info ---------------------
 
     node = info.namedItem( "Guide" );