From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Tue, 2 Sep 2014 08:52:32 +0000 (+0200)
Subject: Added NVidia GPU usage.
X-Git-Tag: v1.1.2~140
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=c3632937977f27dbe33c26409026e396672f12e1

Added NVidia GPU usage.
---

diff --git a/NEWS b/NEWS
index c725b1c..1b6e8be 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ v1.1.2
 * List of sensors UI defined in glade file instead of code.
 * Fixed graph enabled setting not saved when toggle in the list of
   sensors.
+* Added NVidia GPU usage.
 
 v1.1.1
 ------
diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c
index 4f411e9..99df996 100644
--- a/src/lib/nvidia.c
+++ b/src/lib/nvidia.c
@@ -54,7 +54,77 @@ static int get_temp(struct psensor *sensor)
 	return 0;
 }
 
-static struct psensor *create_sensor(int id, int values_len)
+static double get_usage_att(char *atts, char *att)
+{
+	char *c, *key, *strv, *s;
+	size_t n;
+	double v;
+
+	c = atts;
+
+	v = UNKNOWN_DBL_VALUE;
+	while (*c) {
+		s = c;
+		n = 0;
+		while (*c) {
+			if (*c == '=')
+				break;
+			c++;
+			n++;
+		}
+
+		key = strndup(s, n);
+
+		if (*c)
+			c++;
+
+		n = 0;
+		s = c;
+		while (*c) {
+			if (*c == ',')
+				break;
+			c++;
+			n++;
+		}
+
+		strv = strndup(s, n);
+		if (!strcmp(key, att))
+			v = atoi(strv);
+
+		free(key);
+		free(strv);
+
+		if (v != UNKNOWN_DBL_VALUE)
+			break;
+
+		while (*c && (*c == ' ' || *c == ','))
+			c++;
+	}
+
+	return v;
+}
+
+static int get_usage(struct psensor *sensor)
+{
+	char *temp;
+	Bool res;
+
+	res = XNVCTRLQueryTargetStringAttribute(display,
+					  NV_CTRL_TARGET_TYPE_GPU,
+					  sensor->nvidia_id,
+					  0,
+					  NV_CTRL_STRING_GPU_UTILIZATION,
+					  &temp);
+
+	if (res == True)
+		return get_usage_att(temp, "graphics");
+
+	log_debug(_("NVIDIA proprietary driver not used or cannot "
+		    "retrieve NVIDIA GPU usage."));
+	return 0;
+}
+
+static struct psensor *create_temp_sensor(int id, int values_len)
 {
 	char name[200];
 	char *sid;
@@ -79,6 +149,31 @@ static struct psensor *create_sensor(int id, int values_len)
 	return s;
 }
 
+static struct psensor *create_usage_sensor(int id, int values_len)
+{
+	char name[200];
+	char *sid;
+	struct psensor *s;
+	int t;
+
+	sprintf(name, "GPU%d graphics", id);
+
+	sid = malloc(strlen("NVIDIA") + 1 + strlen(name) + 1);
+	sprintf(sid, "NVIDIA %s", name);
+
+	t = SENSOR_TYPE_NVCTRL | SENSOR_TYPE_GPU | SENSOR_TYPE_USAGE;
+
+	s = psensor_create(sid,
+			   strdup(name),
+			   strdup(_("NVIDIA GPU")),
+			   t,
+			   values_len);
+
+	s->nvidia_id = id;
+
+	return s;
+}
+
 /*
   Opens connection to X server and returns the number
   of NVIDIA GPUs.
@@ -113,8 +208,12 @@ void nvidia_psensor_list_update(struct psensor **sensors)
 	while (*ss) {
 		s = *ss;
 
-		if (s->type & SENSOR_TYPE_NVCTRL)
-			psensor_set_current_value(s, get_temp(s));
+		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));
+		}
 
 		ss++;
 	}
@@ -130,7 +229,16 @@ struct psensor **nvidia_psensor_list_add(struct psensor **sensors,
 
 	ss = sensors;
 	for (i = 0; i < n; i++) {
-		s = create_sensor(i, values_len);
+		s = create_temp_sensor(i, values_len);
+
+		tmp = psensor_list_add(ss, s);
+
+		if (ss != tmp)
+			free(ss);
+
+		ss = tmp;
+
+		s = create_usage_sensor(i, values_len);
 
 		tmp = psensor_list_add(ss, s);
 
diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 9f063d0..29dd185 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -431,6 +431,8 @@ const char *psensor_type_to_str(unsigned int type)
 	if (type & SENSOR_TYPE_NVCTRL) {
 		if (type & SENSOR_TYPE_TEMP)
 			return "NVIDIA GPU Temperature";
+		else if (type & SENSOR_TYPE_USAGE)
+			return "NVIDIA GPU Usage";
 		else
 			return "NVIDIA GPU";
 	}