X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fnvidia.c;h=797bbf4756c918d39c28d11c466d64fcc670032c;hb=2291a5e288aab0c29e2886ae2e60aa254d698e0e;hp=47ec7aedb68177f654255d40ff7056313466339d;hpb=b44cf2b8b40c27578d0083678e8ff8f64e644ce8;p=psensor.git diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c index 47ec7ae..797bbf4 100644 --- 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) @@ -132,20 +132,30 @@ static const char *get_nvidia_type_str(int type) { if (type & SENSOR_TYPE_GRAPHICS) return "graphics"; - else if (type & SENSOR_TYPE_VIDEO) + + if (type & SENSOR_TYPE_VIDEO) return "video"; - else if (type & SENSOR_TYPE_MEMORY) + + if (type & SENSOR_TYPE_MEMORY) return "memory"; - else if (type & SENSOR_TYPE_PCIE) + + if (type & SENSOR_TYPE_PCIE) return "PCIe"; - else if (type & SENSOR_TYPE_AMBIENT) + + if (type & SENSOR_TYPE_AMBIENT) return "ambient"; - else if (type & SENSOR_TYPE_TEMP) + + if (type & SENSOR_TYPE_TEMP) return "temp"; - else if (type & SENSOR_TYPE_FAN) - return "fan"; - else - return "unknown"; + + if (type & SENSOR_TYPE_FAN) { + if (type & SENSOR_TYPE_RPM) + return "fan rpm"; + + return "fan level"; + } + + return "unknown"; } static double get_usage(int id, int type) @@ -189,10 +199,15 @@ static double get_value(int id, int type) return get_att(NV_CTRL_TARGET_TYPE_GPU, id, att); } else if (type & SENSOR_TYPE_FAN) { - return get_att(NV_CTRL_TARGET_TYPE_COOLER, - id, - NV_CTRL_THERMAL_COOLER_SPEED); - } else { /* SENSOR_TYPE_USAGE */ + if (type & SENSOR_TYPE_RPM) + return get_att(NV_CTRL_TARGET_TYPE_COOLER, + id, + NV_CTRL_THERMAL_COOLER_SPEED); + else /* SENSOR_TYPE_PERCENT */ + return get_att(NV_CTRL_TARGET_TYPE_COOLER, + id, + NV_CTRL_THERMAL_COOLER_LEVEL); + } else { /* SENSOR_TYPE_PERCENT */ return get_usage(id, type); } } @@ -249,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; @@ -291,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++; @@ -300,45 +315,36 @@ void nvidia_psensor_list_update(struct psensor **sensors) static void add(struct psensor ***sensors, int id, int type, int values_len) { - struct psensor **tmp, *s; + struct psensor *s; s = create_nvidia_sensor(id, type, values_len); - if (s) { - tmp = psensor_list_add(*sensors, s); - free(*sensors); - *sensors = tmp; - } + if (s) + 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, rpm; + 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_USAGE; - - 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); + 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); } } @@ -346,40 +352,17 @@ nvidia_psensor_list_add(struct psensor **ss, int values_len) if (ret == True) { log_debug("NVIDIA: number of fans: %d", n); for (i = 0; i < n; i++) { - ret = XNVCTRLQueryTargetAttribute - (display, - NV_CTRL_TARGET_TYPE_COOLER, - i, - 0, - NV_CTRL_THERMAL_COOLER_SPEED, &rpm); - if (ret == True) - log_debug("NVIDIA: fan speed %d %d", i, rpm); - else - log_err(_("NVIDIA: " - "failed to retrieve fan speed %d"), - i); - - ret = XNVCTRLQueryTargetAttribute - (display, - NV_CTRL_TARGET_TYPE_COOLER, - i, - 0, - NV_CTRL_THERMAL_COOLER_LEVEL, &rpm); - if (ret == True) - log_debug("NVIDIA: fan level %d %d", i, rpm); - else - log_err(_("NVIDIA: " - "failed to retrieve fan level %d"), - i); - - - add(&ss, i, SENSOR_TYPE_FAN, values_len); + utype = SENSOR_TYPE_FAN | SENSOR_TYPE_RPM; + if (check_sensor(i, utype)) + add(ss, i, utype, values_len); + + utype = SENSOR_TYPE_FAN | SENSOR_TYPE_PERCENT; + if (check_sensor(i, utype)) + add(ss, i, utype, values_len); } } else { log_err(_("NVIDIA: failed to retrieve number of fans.")); } - - return ss; } void nvidia_cleanup()