[Mesa-dev] [PATCH 2/3] aubinator: extract aubinator_init() out of the header handler function

[Scott D Phillips]

A later patch will use the aubinator_init() function from the
memtrace aub header handler.
---
 src/intel/tools/aubinator.c | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/intel/tools/aubinator.c b/src/intel/tools/aubinator.c
index f1ad3a948b..671296c0c2 100644
--- a/src/intel/tools/aubinator.c
+++ b/src/intel/tools/aubinator.c
@@ -822,20 +822,8 @@ handle_trace_block(uint32_t *p)
 }
 
 static void
-handle_trace_header(uint32_t *p)
+aubinator_init(uint16_t aub_pci_id, const char *app_name)
 {
-   /* The intel_aubdump tool from IGT is kind enough to put a PCI-ID= tag in
-    * the AUB header comment.  If the user hasn't specified a hardware
-    * generation, try to use the one from the AUB file.
-    */
-   uint32_t *end = p + (p[0] & 0xffff) + 2;
-   int aub_pci_id = 0;
-   if (end > &p[12] && p[12] > 0)
-      sscanf((char *)&p[13], "PCI-ID=%i", &aub_pci_id);
-
-   if (pci_id == 0)
-      pci_id = aub_pci_id;
-
    struct gen_device_info devinfo;
    char *color = GREEN_HEADER, *reset_color = NORMAL;
 
@@ -865,9 +853,6 @@ handle_trace_header(uint32_t *p)
    if (aub_pci_id)
       fprintf(outfile, "PCI ID:           0x%x\n", aub_pci_id);
 
-   char app_name[33];
-   strncpy(app_name, (char *)&p[2], 32);
-   app_name[32] = 0;
    fprintf(outfile, "Application name: %s\n", app_name);
 
    fprintf(outfile, "Decoding as:      %s\n", gen_get_device_name(pci_id));
@@ -876,6 +861,28 @@ handle_trace_header(uint32_t *p)
    fprintf(outfile, "\n");
 }
 
+static void
+handle_trace_header(uint32_t *p)
+{
+   /* The intel_aubdump tool from IGT is kind enough to put a PCI-ID= tag in
+    * the AUB header comment.  If the user hasn't specified a hardware
+    * generation, try to use the one from the AUB file.
+    */
+   uint32_t *end = p + (p[0] & 0xffff) + 2;
+   int aub_pci_id = 0;
+   if (end > &p[12] && p[12] > 0)
+      sscanf((char *)&p[13], "PCI-ID=%i", &aub_pci_id);
+
+   if (pci_id == 0)
+      pci_id = aub_pci_id;
+
+   char app_name[33];
+   strncpy(app_name, (char *)&p[2], 32);
+   app_name[32] = 0;
+
+   aubinator_init(aub_pci_id, app_name);
+}
+
 struct aub_file {
    FILE *stream;
 
-- 
2.14.3