#include <libintl.h>
#define _(str) gettext(str)
+#include <limits.h>
+#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <NVCtrl/NVCtrl.h>
#include <NVCtrl/NVCtrlLib.h>
-#include "psensor.h"
+#include <psensor.h>
Display *display;
-/* Returns the temperature (Celsius) of a NVIDIA GPU. */
-static int get_temp(struct psensor *sensor)
+static char *get_product_name(int id)
{
- int temp;
+ char *name;
Bool res;
+ res = XNVCTRLQueryTargetStringAttribute(display,
+ NV_CTRL_TARGET_TYPE_GPU,
+ id,
+ 0,
+ NV_CTRL_STRING_PRODUCT_NAME,
+ &name);
+ if (res == True) {
+ if (strcmp(name, "Unknown")) {
+ return name;
+ } else {
+ 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);
+ }
+
+ return strdup("NVIDIA");
+}
+
+static double get_temp(int id)
+{
+ Bool res;
+ int temp;
+
res = XNVCTRLQueryTargetAttribute(display,
NV_CTRL_TARGET_TYPE_GPU,
- sensor->nvidia_id,
+ id,
0,
NV_CTRL_GPU_CORE_TEMPERATURE,
&temp);
if (res == True)
return temp;
+ else
+ return UNKNOWN_DBL_VALUE;
+}
- log_debug(_("NVIDIA proprietary driver not used or cannot "
- "retrieve NVIDIA GPU temperature."));
- return 0;
+static double get_ambient_temp(int id)
+{
+ Bool res;
+ int temp;
+
+ res = XNVCTRLQueryTargetAttribute(display,
+ NV_CTRL_TARGET_TYPE_GPU,
+ id,
+ 0,
+ NV_CTRL_AMBIENT_TEMPERATURE,
+ &temp);
+
+ if (res == True)
+ return temp;
+ else
+ return UNKNOWN_DBL_VALUE;
}
-static double get_usage_att(char *atts, char *att)
+static double get_usage_att(char *atts, const char *att)
{
char *c, *key, *strv, *s;
size_t n;
return v;
}
-static int get_usage(struct psensor *sensor)
+static const char *get_nvidia_type_str(int type)
{
- char *temp;
+ if (type & SENSOR_TYPE_GRAPHICS)
+ return "graphics";
+ else if (type & SENSOR_TYPE_VIDEO)
+ return "video";
+ else if (type & SENSOR_TYPE_MEMORY)
+ return "memory";
+ else if (type & SENSOR_TYPE_PCIE)
+ return "PCIe";
+ else if (type & SENSOR_TYPE_AMBIENT)
+ return "ambient";
+ else if (type & SENSOR_TYPE_TEMP)
+ return "temp";
+ else
+ return "unknown";
+}
+
+static double get_usage(int id, int type)
+{
+ const char *stype;
+ char *atts;
+ double v;
Bool res;
+ stype = get_nvidia_type_str(type);
+
+ if (!stype)
+ return UNKNOWN_DBL_VALUE;
+
res = XNVCTRLQueryTargetStringAttribute(display,
- NV_CTRL_TARGET_TYPE_GPU,
- sensor->nvidia_id,
- 0,
- NV_CTRL_STRING_GPU_UTILIZATION,
- &temp);
+ NV_CTRL_TARGET_TYPE_GPU,
+ id,
+ 0,
+ NV_CTRL_STRING_GPU_UTILIZATION,
+ &atts);
- if (res == True)
- return get_usage_att(temp, "graphics");
+ if (res != True)
+ return UNKNOWN_DBL_VALUE;
- log_debug(_("NVIDIA proprietary driver not used or cannot "
- "retrieve NVIDIA GPU usage."));
- return 0;
+ v = get_usage_att(atts, stype);
+
+ free(atts);
+
+ return v;
}
-static struct psensor *create_temp_sensor(int id, int values_len)
+static double get_value(int id, int type)
{
- char name[200];
- char *sid;
- struct psensor *s;
- int t;
+ if (type & SENSOR_TYPE_TEMP) {
+ if (type & SENSOR_TYPE_AMBIENT)
+ return get_ambient_temp(id);
+ else
+ return get_temp(id);
+ } else { /* SENSOR_TYPE_USAGE */
+ return get_usage(id, type);
+ }
+}
- sprintf(name, "GPU%d", id);
+static void update(struct psensor *sensor)
+{
+ double v;
- sid = malloc(strlen("NVIDIA") + 1 + strlen(name) + 1);
- sprintf(sid, "NVIDIA %s", name);
+ v = get_value(sensor->nvidia_id, sensor->type);
- t = SENSOR_TYPE_NVCTRL | SENSOR_TYPE_GPU | SENSOR_TYPE_TEMP;
+ if (v == UNKNOWN_DBL_VALUE)
+ log_err(_("Failed to retrieve measure of type %x "
+ "for NVIDIA GPU %d"),
+ sensor->type,
+ sensor->nvidia_id);
+ psensor_set_current_value(sensor, v);
+}
- s = psensor_create(sid,
- strdup(name),
- strdup(_("NVIDIA GPU")),
- t,
- values_len);
+static int check_sensor(int id, int type)
+{
+ return get_value(id, type) != UNKNOWN_DBL_VALUE;
+}
- s->nvidia_id = id;
+static char *i2str(int i)
+{
+ char *str;
+ size_t n;
- return s;
+ /* second +1 to avoid issue about the conversion of a double
+ * to a lower int */
+ n = 1 + (ceil(log10(INT_MAX)) + 1) + 1;
+
+ str = malloc(n);
+ snprintf(str, n, "%d", i);
+
+ return str;
}
-static struct psensor *create_usage_sensor(int id, int values_len)
+static struct psensor *create_nvidia_sensor(int id, int subtype, int value_len)
{
- char name[200];
- char *sid;
+ char *pname, *name, *strnid, *sid;
+ const char *stype;
+ int type;
+ size_t n;
struct psensor *s;
- int t;
- sprintf(name, "GPU%d graphics", id);
+ type = SENSOR_TYPE_NVCTRL | SENSOR_TYPE_GPU | subtype;
- sid = malloc(strlen("NVIDIA") + 1 + strlen(name) + 1);
- sprintf(sid, "NVIDIA %s", name);
+ if (!check_sensor(id, type))
+ return NULL;
- t = SENSOR_TYPE_NVCTRL | SENSOR_TYPE_GPU | SENSOR_TYPE_USAGE;
+ pname = get_product_name(id);
+ strnid = i2str(id);
+ stype = get_nvidia_type_str(type);
- s = psensor_create(sid,
- strdup(name),
- strdup(_("NVIDIA GPU")),
- t,
- values_len);
+ 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);
+
+ s = psensor_create(sid, name, pname, type, value_len);
s->nvidia_id = id;
+ free(strnid);
+
return s;
}
while (*ss) {
s = *ss;
- if (s->type & SENSOR_TYPE_NVCTRL) {
- if (s->type & SENSOR_TYPE_TEMP)
- psensor_set_current_value(s, get_temp(s));
- else if (s->type & SENSOR_TYPE_USAGE)
- psensor_set_current_value(s, get_usage(s));
- }
+ if (s->type & SENSOR_TYPE_NVCTRL)
+ update(s);
ss++;
}
}
+/* static struct psensor ** */
+/* sensor_add(struct psensor **sensors, int subtype, int values_len) */
+/* { */
+/* } */
+
struct psensor **nvidia_psensor_list_add(struct psensor **sensors,
int values_len)
{
ss = sensors;
for (i = 0; i < n; i++) {
- s = create_temp_sensor(i, values_len);
-
+ s = create_nvidia_sensor(i, SENSOR_TYPE_TEMP, values_len);
tmp = psensor_list_add(ss, s);
+ if (ss != tmp)
+ free(ss);
+ ss = tmp;
+ s = create_nvidia_sensor
+ (i,
+ SENSOR_TYPE_USAGE | SENSOR_TYPE_AMBIENT,
+ values_len);
+ tmp = psensor_list_add(ss, s);
if (ss != tmp)
free(ss);
ss = tmp;
+ s = create_nvidia_sensor
+ (i,
+ SENSOR_TYPE_USAGE | SENSOR_TYPE_GRAPHICS,
+ values_len);
+ tmp = psensor_list_add(ss, s);
+ if (ss != tmp)
+ free(ss);
- s = create_usage_sensor(i, values_len);
+ ss = tmp;
+ s = create_nvidia_sensor
+ (i,
+ SENSOR_TYPE_USAGE | SENSOR_TYPE_VIDEO,
+ values_len);
+ tmp = psensor_list_add(ss, s);
+ if (ss != tmp)
+ free(ss);
+ ss = tmp;
+ s = create_nvidia_sensor
+ (i,
+ SENSOR_TYPE_USAGE | SENSOR_TYPE_MEMORY,
+ values_len);
tmp = psensor_list_add(ss, s);
+ if (ss != tmp)
+ free(ss);
+ ss = tmp;
+ s = create_nvidia_sensor
+ (i,
+ SENSOR_TYPE_USAGE | SENSOR_TYPE_PCIE,
+ values_len);
+ tmp = psensor_list_add(ss, s);
if (ss != tmp)
free(ss);
projects / psensor.git / blobdiff