flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-07-23 09:56:02 +00:00
Code Issues Releases Wiki Activity

overlay: simplify types for object counts for 32/64bit porting

Browse Source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-08-24 12:37:59 +01:00
parent 68c63ddd36
commit a932c73ab7
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
overlay/gem-objects.c
View File

@ -119,11 +119,11 @@ int gem_objects_update(struct gem_objects *obj)
b = buf; b = buf;
sscanf(b, "%d objects, %ld bytes", sscanf(b, "%lu objects, %lu bytes",
&obj->total_count, &obj->total_bytes); &obj->total_count, &obj->total_bytes);
b = strchr(b, '\n'); b = strchr(b, '\n');
sscanf(b, "%*d [%*d] objects, %ld [%ld] bytes in gtt", sscanf(b, "%*d [%*d] objects, %lu [%lu] bytes in gtt",
&obj->total_gtt, &obj->total_aperture); &obj->total_gtt, &obj->total_aperture);
ret = 0; ret = 0;
@ -144,7 +144,7 @@ int gem_objects_update(struct gem_objects *obj)
break; break;
/* Xorg: 35 objects, 16347136 bytes (0 active, 12103680 inactive, 0 unbound) */ /* Xorg: 35 objects, 16347136 bytes (0 active, 12103680 inactive, 0 unbound) */
sscanf(++b, "%256s %u objects, %lu bytes", sscanf(++b, "%256s %lu objects, %lu bytes",
comm->name, &comm->count, &comm->bytes); comm->name, &comm->count, &comm->bytes);
insert_sorted(obj, comm); insert_sorted(obj, comm);

11
overlay/gem-objects.h
View File

@ -28,15 +28,14 @@
#include <stdint.h> #include <stdint.h>
struct gem_objects { struct gem_objects {
uint64_t total_bytes; long unsigned total_bytes, total_count;
uint32_t total_count; long unsigned total_gtt, total_aperture;
uint64_t total_gtt, total_aperture; long unsigned max_gtt, max_aperture;
uint64_t max_gtt, max_aperture;
struct gem_objects_comm { struct gem_objects_comm {
struct gem_objects_comm *next; struct gem_objects_comm *next;
char name[256]; char name[256];
uint64_t bytes; long unsigned bytes;
uint32_t count; long unsigned count;
} *comm; } *comm;
}; };

4
overlay/overlay.c
View File

@ -681,7 +681,7 @@ static void show_gem_objects(struct overlay_context *ctx, struct overlay_gem_obj
cairo_pattern_destroy(linear); cairo_pattern_destroy(linear);
cairo_fill(ctx->cr); cairo_fill(ctx->cr);
sprintf(buf, "Total: %ldMB, %d objects", sprintf(buf, "Total: %ldMB, %ld objects",
go->gem_objects.total_bytes >> 20, go->gem_objects.total_count); go->gem_objects.total_bytes >> 20, go->gem_objects.total_count);
cairo_set_source_rgba(ctx->cr, 1, 1, 1, 1); cairo_set_source_rgba(ctx->cr, 1, 1, 1, 1);
cairo_move_to(ctx->cr, x, y); cairo_move_to(ctx->cr, x, y);
@ -692,7 +692,7 @@ static void show_gem_objects(struct overlay_context *ctx, struct overlay_gem_obj
if ((comm->bytes >> 20) == 0) if ((comm->bytes >> 20) == 0)
break; break;
sprintf(buf, " %s %ldMB, %d objects", sprintf(buf, " %s %ldMB, %ld objects",
comm->name, comm->bytes >> 20, comm->count); comm->name, comm->bytes >> 20, comm->count);
cairo_set_source_rgba(ctx->cr, 1, 1, 1, 1); cairo_set_source_rgba(ctx->cr, 1, 1, 1, 1);
cairo_move_to(ctx->cr, x, y); cairo_move_to(ctx->cr, x, y);