[PATCH i-g-t 09/12] lib/igt_drm_clients: Store second data for ticks busyness

[Lucas De Marchi]

When unit is "ticks" store the second counter to be used by tools.

Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
---
 lib/igt_drm_clients.c | 22 +++++++++++++++++-----
 lib/igt_drm_clients.h |  2 ++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/lib/igt_drm_clients.c b/lib/igt_drm_clients.c
index 40d494441..da966769f 100644
--- a/lib/igt_drm_clients.c
+++ b/lib/igt_drm_clients.c
@@ -108,14 +108,22 @@ igt_drm_client_update(struct igt_drm_client *c, unsigned int pid, char *name,
 
 	for (i = 0; i <= c->engines->max_engine_id; i++) {
 		assert(i < ARRAY_SIZE(info->busy));
-
 		if (info->busy[i] < c->last[i])
 			continue; /* It will catch up soon. */
 
-		c->total_runtime += info->busy[i];
-		c->val[i] = info->busy[i] - c->last[i];
-		c->last_runtime += c->val[i];
-		c->last[i] = info->busy[i];
+		if (info->unit[i] == DRM_CLIENT_ENGINE_UNIT_NS) {
+			c->total_runtime += info->busy[i];
+			c->val[i] = info->busy[i] - c->last[i];
+			c->last_runtime += c->val[i];
+			c->last[i] = info->busy[i];
+		} else if (info->unit[i] == DRM_CLIENT_ENGINE_UNIT_TICKS) {
+			c->total_runtime += info->busy2[i];
+			c->val[i] = info->busy[i] - c->last[i];
+			c->val2[i] = info->busy2[i] - c->last2[i];
+			c->last[i] = info->busy[i];
+			c->last2[i] = info->busy2[i];
+			c->last_runtime += c->val2[i];
+		}
 	}
 
 	/* Memory regions */
@@ -184,7 +192,9 @@ igt_drm_client_add(struct igt_drm_clients *clients,
 	}
 
 	c->val = calloc(c->engines->max_engine_id + 1, sizeof(*c->val));
+	c->val2 = calloc(c->engines->max_engine_id + 1, sizeof(*c->val2));
 	c->last = calloc(c->engines->max_engine_id + 1, sizeof(*c->last));
+	c->last2 = calloc(c->engines->max_engine_id + 1, sizeof(*c->last2));
 	assert(c->val && c->last);
 
 	/* Memory regions */
@@ -224,7 +234,9 @@ void igt_drm_client_free(struct igt_drm_client *c, bool clear)
 	free(c->engines);
 
 	free(c->val);
+	free(c->val2);
 	free(c->last);
+	free(c->last2);
 
 	if (c->regions) {
 		for (i = 0; i <= c->regions->max_region_id; i++)
diff --git a/lib/igt_drm_clients.h b/lib/igt_drm_clients.h
index 52888aedc..cfc53a344 100644
--- a/lib/igt_drm_clients.h
+++ b/lib/igt_drm_clients.h
@@ -66,7 +66,9 @@ struct igt_drm_client {
 	unsigned long total_runtime; /* Aggregate busyness on all engines since client start. */
 	unsigned long last_runtime; /* Aggregate busyness on all engines since previous scan. */
 	unsigned long *val; /* Array of engine busyness data, relative to previous scan. */
+	unsigned long *val2; /* Array of engine busyness data2, relative to previous scan. */
 	uint64_t *last; /* Array of engine busyness data as parsed from fdinfo. */
+	uint64_t *last2; /* Array of engine busyness data2 as parsed from fdinfo. */
 	struct drm_client_meminfo *memory; /* Array of region memory utilisation as parsed from fdinfo. */
 };
 
-- 
2.44.0