#include <NVCtrl/NVCtrl.h>
#include <NVCtrl/NVCtrlLib.h>
+#include <nvidia.h>
#include <psensor.h>
-Display *display;
+static Display *display;
-static char *get_product_name(int id)
+static const char *PROVIDER_NAME = "nvctrl";
+
+static void set_nvidia_id(struct psensor *s, int id)
+{
+ *(int *)s->provider_data = id;
+}
+
+static int get_nvidia_id(struct psensor *s)
+{
+ return *(int *)s->provider_data;
+}
+
+static char *get_product_name(int id, int type)
{
char *name;
Bool res;
+ if (type & SENSOR_TYPE_FAN)
+ return strdup("NVIDIA");
+
res = XNVCTRLQueryTargetStringAttribute(display,
NV_CTRL_TARGET_TYPE_GPU,
id,
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(_("%s: Unknown NVIDIA product name for GPU %d"),
+ PROVIDER_NAME,
+ id);
+ free(name);
} else {
- log_err(_("Failed to retrieve NVIDIA product name for GPU %d"),
+ log_err(_("%s: "
+ "Failed to retrieve NVIDIA product name for GPU %d"),
+ PROVIDER_NAME,
id);
}
return strdup("NVIDIA");
}
-static double get_temp(int id)
+static double get_att(int target, int id, int att)
{
Bool res;
int temp;
- res = XNVCTRLQueryTargetAttribute(display,
- NV_CTRL_TARGET_TYPE_GPU,
- id,
- 0,
- NV_CTRL_GPU_CORE_TEMPERATURE,
- &temp);
+ res = XNVCTRLQueryTargetAttribute(display, target, id, 0, att, &temp);
if (res == True)
return temp;
- else
- return UNKNOWN_DBL_VALUE;
-}
-
-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;
+ return UNKNOWN_DBL_VALUE;
}
static double get_usage_att(char *atts, const char *att)
{
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
- 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)
static double get_value(int id, int type)
{
+ int att;
+
if (type & SENSOR_TYPE_TEMP) {
if (type & SENSOR_TYPE_AMBIENT)
- return get_ambient_temp(id);
+ att = NV_CTRL_AMBIENT_TEMPERATURE;
else
- return get_temp(id);
- } else { /* SENSOR_TYPE_USAGE */
+ att = NV_CTRL_GPU_CORE_TEMPERATURE;
+
+ return get_att(NV_CTRL_TARGET_TYPE_GPU, id, att);
+ } else if (type & SENSOR_TYPE_FAN) {
+ 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);
}
}
static void update(struct psensor *sensor)
{
double v;
+ int id;
+
+ id = get_nvidia_id(sensor);
- v = get_value(sensor->nvidia_id, sensor->type);
+ v = get_value(id, sensor->type);
if (v == UNKNOWN_DBL_VALUE)
- log_err(_("Failed to retrieve measure of type %x "
+ log_err(_("%s: Failed to retrieve measure of type %x "
"for NVIDIA GPU %d"),
+ PROVIDER_NAME,
sensor->type,
- sensor->nvidia_id);
+ id);
psensor_set_current_value(sensor, v);
}
int type;
size_t n;
struct psensor *s;
+ double v;
- type = SENSOR_TYPE_NVCTRL | SENSOR_TYPE_GPU | subtype;
+ type = SENSOR_TYPE_NVCTRL | subtype;
if (!check_sensor(id, type))
return NULL;
- pname = get_product_name(id);
+ pname = get_product_name(id, type);
strnid = i2str(id);
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;
+ s->provider_data = malloc(sizeof(int));
+ set_nvidia_id(s, id);
+
+ if ((type & SENSOR_TYPE_GPU) && (type & SENSOR_TYPE_TEMP)) {
+ v = get_att(NV_CTRL_TARGET_TYPE_GPU,
+ id,
+ NV_CTRL_GPU_CORE_THRESHOLD);
+ s->max = v;
+ }
free(strnid);
return s;
}
-/*
- Opens connection to X server and returns the number
- of NVIDIA GPUs.
-
- Return 0 if no NVIDIA gpus or cannot get information.
-*/
-static int init()
+static int init(void)
{
- int evt, err, n;
+ int evt, err;
display = XOpenDisplay(NULL);
if (!display) {
- log_err(_("Cannot open connection to X11 server."));
+ log_err(_("%s: Cannot open connection to X11 server."),
+ PROVIDER_NAME);
return 0;
}
- if (XNVCTRLQueryExtension(display, &evt, &err) &&
- XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_GPU, &n))
- return n;
+ if (XNVCTRLQueryExtension(display, &evt, &err))
+ return 1;
- log_err(_("Failed to retrieve NVIDIA information."));
+ log_err(_("%s: Failed to retrieve NVIDIA information."),
+ PROVIDER_NAME);
return 0;
}
void nvidia_psensor_list_update(struct psensor **sensors)
{
- struct psensor **ss, *s;
+ struct psensor *s;
- ss = sensors;
- while (*ss) {
- s = *ss;
+ while (*sensors) {
+ s = *sensors;
- if (s->type & SENSOR_TYPE_NVCTRL)
+ if (!(s->type & SENSOR_TYPE_REMOTE)
+ && s->type & SENSOR_TYPE_NVCTRL)
update(s);
- ss++;
+ sensors++;
}
}
-/* static struct psensor ** */
-/* sensor_add(struct psensor **sensors, int subtype, int values_len) */
-/* { */
-/* } */
+static void add(struct psensor ***sensors, int id, int type, int values_len)
+{
+ struct psensor *s;
+
+ s = create_nvidia_sensor(id, type, values_len);
-struct psensor **nvidia_psensor_list_add(struct psensor **sensors,
- int values_len)
+ if (s)
+ psensor_list_append(sensors, s);
+}
+
+void nvidia_psensor_list_append(struct psensor ***ss, int values_len)
{
- int i, n;
- struct psensor **tmp, **ss, *s;
-
- n = init();
-
- ss = sensors;
- for (i = 0; i < n; i++) {
- 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);
-
- 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);
-
- ss = tmp;
+ int i, n, utype;
+ Bool ret;
+
+ if (!init())
+ return;
+
+ ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_GPU, &n);
+ if (ret == True) {
+ for (i = 0; i < n; i++) {
+ 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);
+ }
}
- return ss;
+ ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_COOLER, &n);
+ if (ret == True) {
+ log_fct("%s: Number of fans: %d", PROVIDER_NAME, n);
+ for (i = 0; i < n; i++) {
+ 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(_("%s: Failed to retrieve number of fans."),
+ PROVIDER_NAME);
+ }
}
-void nvidia_cleanup()
+void nvidia_cleanup(void)
{
if (display) {
XCloseDisplay(display);