flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-25 16:56:35 +00:00
Code Issues Releases Wiki Activity

tools/decode: retain the ring name

Browse Source 
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2011-10-11 13:14:02 +02:00
parent 1c6511f7fb
commit 73c2104070
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/intel_error_decode.c
View File

@ -261,6 +261,7 @@ read_data_file (FILE *file)
uint32_t offset, value; uint32_t offset, value;
uint32_t gtt_offset = 0, new_gtt_offset; uint32_t gtt_offset = 0, new_gtt_offset;
char *buffer_type[2] = { "ringbuffer", "batchbuffer" }; char *buffer_type[2] = { "ringbuffer", "batchbuffer" };
char *ring_name = NULL;
int is_batch = 1; int is_batch = 1;
while (getline (&line, &line_size, file) > 0) { while (getline (&line, &line_size, file) > 0) {
@ -269,17 +270,25 @@ read_data_file (FILE *file)
dashes = strstr(line, "---"); dashes = strstr(line, "---");
if (dashes) { if (dashes) {
char *new_ring_name = malloc(dashes - line);
strncpy(new_ring_name, line, dashes - line);
new_ring_name[dashes - line - 1] = '\0';
matched = sscanf (dashes, "--- gtt_offset = 0x%08x\n", matched = sscanf (dashes, "--- gtt_offset = 0x%08x\n",
&new_gtt_offset); &new_gtt_offset);
if (matched == 1) { if (matched == 1) {
if (count) { if (count) {
printf("%s at 0x%08x:\n", printf("%s (%s) at 0x%08x:\n",
buffer_type[is_batch], gtt_offset); buffer_type[is_batch],
ring_name,
gtt_offset);
intel_decode (data, count, gtt_offset, devid, 0); intel_decode (data, count, gtt_offset, devid, 0);
count = 0; count = 0;
} }
gtt_offset = new_gtt_offset; gtt_offset = new_gtt_offset;
is_batch = 1; is_batch = 1;
free(ring_name);
ring_name = new_ring_name;
continue; continue;
} }
@ -287,13 +296,17 @@ read_data_file (FILE *file)
&new_gtt_offset); &new_gtt_offset);
if (matched == 1) { if (matched == 1) {
if (count) { if (count) {
printf("%s at 0x%08x:\n", printf("%s (%s) at 0x%08x:\n",
buffer_type[is_batch], gtt_offset); buffer_type[is_batch],
ring_name,
gtt_offset);
intel_decode (data, count, gtt_offset, devid, 0); intel_decode (data, count, gtt_offset, devid, 0);
count = 0; count = 0;
} }
gtt_offset = new_gtt_offset; gtt_offset = new_gtt_offset;
is_batch = 0; is_batch = 0;
free(ring_name);
ring_name = new_ring_name;
continue; continue;
} }
} }
@ -360,6 +373,7 @@ read_data_file (FILE *file)
free (data); free (data);
free (line); free (line);
free (ring_name);
} }
int int