enable/disable of lmsensor provider

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

diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c
index fa5a898..797bbf4 100644 (file)
--- a/src/lib/nvidia.c
+++ b/src/lib/nvidia.c
@@ -35,6 +35,8 @@
 
 Display *display;
 
+static const char *PROVIDER_NAME = "nvctrl";
+
 static char *get_product_name(int id, int type)
 {
        char *name;
@@ -50,13 +52,11 @@ static char *get_product_name(int id, int type)
                                                NV_CTRL_STRING_PRODUCT_NAME,
                                                &name);
        if (res == True) {
-               if (strcmp(name, "Unknown")) {
+               if (strcmp(name, "Unknown"))
                        return name;
-               } else {
-                       log_err(_("Unknown NVIDIA product name for GPU %d"),
-                               id);
-                       free(name);
-               }
+
+               log_err(_("Unknown NVIDIA product name for GPU %d"), id);
+               free(name);
        } else {
                log_err(_("Failed to retrieve NVIDIA product name for GPU %d"),
                        id);
@@ -74,8 +74,8 @@ static double get_att(int target, int id, int att)
 
        if (res == True)
                return temp;
-       else
-               return UNKNOWN_DBL_VALUE;
+
+       return UNKNOWN_DBL_VALUE;
 }
 
 static double get_usage_att(char *atts, const char *att)
@@ -151,8 +151,8 @@ static const char *get_nvidia_type_str(int type)
        if (type & SENSOR_TYPE_FAN) {
                if (type & SENSOR_TYPE_RPM)
                        return "fan rpm";
-               else
-                       return "fan level";
+
+               return "fan level";
        }
 
        return "unknown";
@@ -264,12 +264,11 @@ static struct psensor *create_nvidia_sensor(int id, int subtype, int value_len)
        stype = get_nvidia_type_str(type);
 
        n = strlen(pname) + 1 + strlen(strnid) + 1 + strlen(stype) + 1;
-
        name = malloc(n);
        sprintf(name, "%s %s %s", pname, strnid, stype);
 
-       sid = malloc(strlen("nvidia") + 1 + strlen(name) + 1);
-       sprintf(sid, "nvidia %s", name);
+       sid = malloc(strlen(PROVIDER_NAME) + 1 + strlen(name) + 1);
+       sprintf(sid, "%s %s", PROVIDER_NAME, name);
 
        s = psensor_create(sid, name, pname, type, value_len);
        s->nvidia_id = id;
@@ -306,7 +305,8 @@ void nvidia_psensor_list_update(struct psensor **sensors)
        while (*ss) {
                s = *ss;
 
-               if (s->type & SENSOR_TYPE_NVCTRL)
+               if (!(s->type & SENSOR_TYPE_REMOTE)
+                   && s->type & SENSOR_TYPE_NVCTRL)
                        update(s);
 
                ss++;
@@ -323,29 +323,28 @@ static void add(struct psensor ***sensors, int id, int type, int values_len)
                psensor_list_append(sensors, s);
 }
 
-struct psensor **
-nvidia_psensor_list_add(struct psensor **ss, int values_len)
+void nvidia_psensor_list_append(struct psensor ***ss, int values_len)
 {
        int i, n, utype;
        Bool ret;
 
        if (!init())
-               return ss;
+               return;
 
        ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_GPU, &n);
        if (ret == True) {
                for (i = 0; i < n; i++) {
-                       add(&ss,
+                       add(ss,
                            i,
                            SENSOR_TYPE_GPU | SENSOR_TYPE_TEMP,
                            values_len);
 
                        utype = SENSOR_TYPE_GPU | SENSOR_TYPE_PERCENT;
-                       add(&ss, i, utype | SENSOR_TYPE_AMBIENT, values_len);
-                       add(&ss, i, utype | SENSOR_TYPE_GRAPHICS, values_len);
-                       add(&ss, i, utype | SENSOR_TYPE_VIDEO, values_len);
-                       add(&ss, i, utype | SENSOR_TYPE_MEMORY, values_len);
-                       add(&ss, i, utype | SENSOR_TYPE_PCIE, values_len);
+                       add(ss, i, utype | SENSOR_TYPE_AMBIENT, values_len);
+                       add(ss, i, utype | SENSOR_TYPE_GRAPHICS, values_len);
+                       add(ss, i, utype | SENSOR_TYPE_VIDEO, values_len);
+                       add(ss, i, utype | SENSOR_TYPE_MEMORY, values_len);
+                       add(ss, i, utype | SENSOR_TYPE_PCIE, values_len);
                }
        }
 
@@ -355,17 +354,15 @@ nvidia_psensor_list_add(struct psensor **ss, int values_len)
                for (i = 0; i < n; i++) {
                        utype = SENSOR_TYPE_FAN | SENSOR_TYPE_RPM;
                        if (check_sensor(i, utype))
-                               add(&ss, i, utype, values_len);
+                               add(ss, i, utype, values_len);
 
                        utype = SENSOR_TYPE_FAN | SENSOR_TYPE_PERCENT;
                        if (check_sensor(i, utype))
-                               add(&ss, i, utype, values_len);
+                               add(ss, i, utype, values_len);
                }
        } else {
                log_err(_("NVIDIA: failed to retrieve number of fans."));
        }
-
-       return ss;
 }
 
 void nvidia_cleanup()