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

tools/intel_gpu_dump: Replace asprintf with snprintf

Browse Source 
The maximum filename is limited so we can simply use a large buffer
rather than fail to check the error return from asprintf.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-02-10 10:54:39 +00:00
parent 2c9b293927
commit c407041ebb
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/intel_gpu_dump.c
View File

@ -247,6 +247,7 @@ parse_ringbuffer_info(const char *filename,
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
char filename[4096];
const char *path; const char *path;
struct stat st; struct stat st;
int err; int err;
@ -302,10 +303,10 @@ main (int argc, char *argv[])
} }
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
char *filename;
uint32_t ring_head, ring_tail, acthd; uint32_t ring_head, ring_tail, acthd;
asprintf(&filename, "%s/i915_ringbuffer_info", path); snprintf(filename, sizeof(filename),
"%s/i915_ringbuffer_info", path);
err = stat(filename, &st); err = stat(filename, &st);
if (err != 0) { if (err != 0) {
@ -320,7 +321,6 @@ main (int argc, char *argv[])
} }
parse_ringbuffer_info(filename, &ring_head, &ring_tail, &acthd); parse_ringbuffer_info(filename, &ring_head, &ring_tail, &acthd);
free (filename);
printf("ACTHD: 0x%08x\n", acthd); printf("ACTHD: 0x%08x\n", acthd);
printf("EIR: 0x%08x\n", INREG(EIR)); printf("EIR: 0x%08x\n", INREG(EIR));
@ -354,42 +354,40 @@ main (int argc, char *argv[])
print_instdone (instdone, instdone1); print_instdone (instdone, instdone1);
asprintf (&filename, "%s/i915_batchbuffers", path); snprintf(filename, sizeof(filename), "%s/i915_batchbuffers", path);
intel_decode_context_set_head_tail(acthd, 0xffffffff); intel_decode_context_set_head_tail(acthd, 0xffffffff);
read_data_file (devid, filename, 1); read_data_file (devid, filename, 1);
free (filename);
asprintf (&filename, "%s/i915_ringbuffer_data", path); snprintf(filename, sizeof(filename), "%s/i915_ringbuffer_data", path);
intel_decode_context_set_head_tail(ring_head, ring_tail); intel_decode_context_set_head_tail(ring_head, ring_tail);
printf("Ringbuffer: "); printf("Ringbuffer: ");
printf("Reminder: head pointer is GPU read, tail pointer is CPU " printf("Reminder: head pointer is GPU read, tail pointer is CPU "
"write\n"); "write\n");
read_data_file (devid, filename, 0); read_data_file (devid, filename, 0);
free (filename);
asprintf(&filename, "%s/i915_blt_ringbuffer_info", path); snprintf(filename, sizeof(filename),
"%s/i915_blt_ringbuffer_info", path);
if (stat(filename, &st) == 0) { if (stat(filename, &st) == 0) {
parse_ringbuffer_info(filename, &ring_head, &ring_tail, &acthd); parse_ringbuffer_info(filename, &ring_head, &ring_tail, &acthd);
free(filename);
asprintf (&filename, "%s/i915_blt_ringbuffer_data", path); snprintf(filename, sizeof(filename),
"%s/i915_blt_ringbuffer_data", path);
intel_decode_context_set_head_tail(ring_head, ring_tail); intel_decode_context_set_head_tail(ring_head, ring_tail);
printf("BLT Ringbuffer: "); printf("BLT Ringbuffer: ");
read_data_file (devid, filename, 0); read_data_file (devid, filename, 0);
} }
free (filename);
asprintf(&filename, "%s/i915_bsd_ringbuffer_info", path); snprintf(filename, sizeof(filename),
"%s/i915_bsd_ringbuffer_info", path);
if (stat(filename, &st) == 0) { if (stat(filename, &st) == 0) {
parse_ringbuffer_info(filename, &ring_head, &ring_tail, &acthd); parse_ringbuffer_info(filename, &ring_head, &ring_tail, &acthd);
free(filename);
asprintf (&filename, "%s/i915_bsd_ringbuffer_data", path); snprintf(filename, sizeof(filename),
"%s/i915_bsd_ringbuffer_data", path);
intel_decode_context_set_head_tail(ring_head, ring_tail); intel_decode_context_set_head_tail(ring_head, ring_tail);
printf("BSD Ringbuffer: "); printf("BSD Ringbuffer: ");
read_data_file (devid, filename, 0); read_data_file (devid, filename, 0);
} }
free (filename);
} else { } else {
read_data_file (devid, path, 1); read_data_file (devid, path, 1);
} }