display the name of chip in sensor preferences.

[psensor.git] / src / lib / lmsensor.c

diff --git a/src/lib/lmsensor.c b/src/lib/lmsensor.c
index 8bf9d13..f12955c 100644 (file)
--- a/src/lib/lmsensor.c
+++ b/src/lib/lmsensor.c
@@ -1,22 +1,21 @@
 /*
-    Copyright (C) 2010-2011 jeanfi@gmail.com
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2012 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #include <locale.h>
 #include <libintl.h>
 #define _(str) gettext(str)
@@ -30,6 +29,8 @@
 
 #include "psensor.h"
 
+static int init_done;
+
 static double get_value(const sensors_chip_name *name,
                        const sensors_subfeature *sub)
 {
@@ -38,8 +39,7 @@ static double get_value(const sensors_chip_name *name,
 
        err = sensors_get_value(name, sub->number, &val);
        if (err) {
-               fprintf(stderr,
-                       _("ERROR: Can't get value of subfeature %s: %s\n"),
+               log_err(_("lmsensor: cannot get value of subfeature %s: %s."),
                        sub->name, sensors_strerror(err));
                val = UNKNOWN_DBL_VALUE;
        }
@@ -80,6 +80,9 @@ void lmsensor_psensor_list_update(struct psensor **sensors)
 {
        struct psensor **s_ptr = sensors;
 
+       if (!init_done)
+               return ;
+
        while (*s_ptr) {
                struct psensor *sensor = *s_ptr;
 
@@ -94,16 +97,15 @@ void lmsensor_psensor_list_update(struct psensor **sensors)
        }
 }
 
-struct psensor *
+static struct psensor *
 lmsensor_psensor_create(const sensors_chip_name *chip,
                        const sensors_feature *feature,
                        int values_max_length)
 {
        char name[200];
        const sensors_subfeature *sf;
-       char *label;
        int type;
-       char *id;
+       char *id, *label, *cname;
        struct psensor *psensor;
        sensors_subfeature_type fault_subfeature;
 
@@ -117,8 +119,8 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
                fault_subfeature = SENSORS_SUBFEATURE_FAN_FAULT;
 
        } else {
-               fprintf(stderr,
-                       _("ERROR: create_sensor, wrong feature type\n"));
+               log_err(_(
+"lmsensor: lmsensor_psensor_create failure: wrong feature type."));
                return NULL;
        }
 
@@ -142,7 +144,16 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
                    1);
        sprintf(id, "lmsensor %s %s", name, label);
 
-       psensor = psensor_create(id, label, type, values_max_length);
+       if (!strcmp(chip->prefix, "coretemp"))
+               cname = strdup("Intel CPU");
+       else if (!strcmp(chip->prefix, "k10temp"))
+               cname = strdup("AMD CPU");
+       else if (!strcmp(chip->prefix, "nouveau"))
+               cname = strdup("Nvidia GPU");
+       else
+               cname = strdup(chip->prefix);
+
+       psensor = psensor_create(id, label, cname, type, values_max_length);
 
        psensor->iname = chip;
        psensor->feature = feature;
@@ -156,16 +167,60 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
        return psensor;
 }
 
-int lmsensor_init()
+struct psensor **lmsensor_psensor_list_add(struct psensor **sensors,
+                                          int vn)
+{
+       const sensors_chip_name *chip;
+       int chip_nr = 0;
+       struct psensor **tmp, **result;
+       const sensors_feature *feature;
+       struct psensor *s;
+       int i;
+
+       if (!init_done)
+               return NULL;
+
+       result = sensors;
+       while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) {
+
+               i = 0;
+               while ((feature = sensors_get_features(chip, &i))) {
+
+                       if (feature->type == SENSORS_FEATURE_TEMP
+                           || feature->type == SENSORS_FEATURE_FAN) {
+
+                               s = lmsensor_psensor_create(chip, feature, vn);
+
+                               if (s) {
+                                       tmp = psensor_list_add(result, s);
+
+                                       if (tmp != sensors)
+                                               free(result);
+
+                                       result = tmp;
+                               }
+                       }
+               }
+       }
+
+       return result;
+}
+
+void lmsensor_init()
 {
        int err = sensors_init(NULL);
 
        if (err) {
-               fprintf(stderr,
-                       _("ERROR: lm-sensors initialization failure: %s\n"),
+               log_err(_("lmsensor: initialization failure: %s."),
                        sensors_strerror(err));
-               return 0;
+               init_done = 0;
        } else {
-               return 1;
+               init_done = 1;
        }
 }
+
+void lmsensor_cleanup()
+{
+       if (init_done)
+               sensors_cleanup();
+}