vppinfra: minor tweaks for cgo interoperation

'type' is a keyword in golang, so s/type/event_type/ in elog.h and
elsewhere.

Add vec_len_not_inline(...), elog_write_file_not_inline(...) and
elog_read_file_not_inline(...) since the inline forms aren't usable.

More such tweaks may follow.

Type: improvement
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I9a80a6afa635f5cdedee554ee9abe400fafc1cb6

2 files changed, 11 insertions, 11 deletions

diff --git a/src/tools/g2/clib.c b/src/tools/g2/clib.c
index da9fd52c2d0..3cfc2637673 100644
--- a/src/tools/g2/clib.c
+++ b/src/tools/g2/clib.c
@@ -141,7 +141,7 @@ int read_clib_file(char *clib_file)
 
         delta = ep->time - starttime;
 
-        add_clib_event (delta, ep->track, ep->type + 1, i);
+        add_clib_event (delta, ep->track, ep->event_type + 1, i);
     }
 
     cpel_event_finalize();
diff --git a/src/tools/perftool/c2cpel.c b/src/tools/perftool/c2cpel.c
index 35885debef8..72049054ae1 100644
--- a/src/tools/perftool/c2cpel.c
+++ b/src/tools/perftool/c2cpel.c
@@ -1,4 +1,4 @@
-/* 
+/*
  *------------------------------------------------------------------
  * Copyright (c) 2006-2016 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -72,7 +72,7 @@ void convert_clib_file(char *clib_file)
 
         /* Seconds since start of log */
         delta = e->time - starttime;
-        
+
         /* u64 nanoseconds since start of log */
         timestamp = delta * 1e9;
 
@@ -81,11 +81,11 @@ void convert_clib_file(char *clib_file)
         /* allocate an event instance */
         vec_add2(the_events, ep, 1);
         ep->timestamp = timestamp;
-        
+
         /* convert string event code to a real number */
-        t = vec_elt_at_index (em->event_types, e->type);
+        t = vec_elt_at_index (em->event_types, e->event_type);
 
-        /* 
+        /*
          * Construct a reasonable event name.
          * Truncate the format string at the first whitespace break
          * or printf format character.
@@ -189,14 +189,14 @@ int main (int argc, char **argv)
         continue;
 
     usage:
-        fformat(stderr, 
+        fformat(stderr,
                 "c2cpel [--input-file] <filename> --output-file <filename>\n");
         exit(1);
     }
 
     if (vec_len(inputfiles) == 0 || outputfile == 0)
         goto usage;
-        
+
     if (vec_len(inputfiles) > 1)
         goto usage;
 
@@ -211,12 +211,12 @@ int main (int argc, char **argv)
         clib_unix_warning ("couldn't create %s", outputfile);
         exit (1);
     }
-    
+
     alpha_sort_tracks();
     fixup_event_tracks();
 
     /*
-     * Four sections: string-table, event definitions, track defs, events. 
+     * Four sections: string-table, event definitions, track defs, events.
      */
     if (!write_cpel_header(ofp, 4)) {
         clib_warning ("Error writing cpel header to %s...\n", outputfile);
@@ -246,7 +246,7 @@ int main (int argc, char **argv)
         clib_warning ("Error writing events to %s...\n", outputfile);
         unlink(outputfile);
         exit(1);
-        
+
     }
     fclose(ofp);
     exit (0);