Changeset 91b72d3 for lib/format_legacy.c

Timestamp:

01/05/09 11:29:11 (12 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

ad36006

Parents:

9d0049cf

Message:

Try to autoguess the tracetype if the format uri specify is not present

File:

• lib/format_legacy.c (modified) (9 diffs)

lib/format_legacy.c

@@ -62 +62 @@
 
 #define DATA(x) ((struct legacy_format_data_t *)x->format_data)
-#define INPUT DATA(libtrace)->input
 
 struct legacy_format_data_t {
-        union {
-                int fd;
-                io_t *file;
-        } input;
         time_t starttime;       /* Used for legacy_nzix */
         uint64_t ts_high;       /* Used for legacy_nzix */
@@ -77 +72 @@
         libtrace->format_data = malloc(sizeof(struct legacy_format_data_t));
         
-        DATA(libtrace)->input.file = NULL;
         DATA(libtrace)->ts_high = 0;
         DATA(libtrace)->ts_old = 0;
@@ -164 +158 @@
 static int erf_start_input(libtrace_t *libtrace)
 {
-        if (DATA(libtrace)->input.file)
+        if (libtrace->io)
+                return 0; /* Already open */
+
+        libtrace->io = trace_open_file(libtrace);
+
+        if (libtrace->io)
                 return 0;
 
-        DATA(libtrace)->input.file = trace_open_file(libtrace);
-
-        if (DATA(libtrace)->input.file)
-                return 0;
-
         return -1;
 }
 
 static int erf_fin_input(libtrace_t *libtrace) {
-        wandio_destroy(INPUT.file);
+        wandio_destroy(libtrace->io);
         free(libtrace->format_data);
         return 0;
@@ -238 +232 @@
         while (1) {
         
-                if ((numbytes=wandio_read(INPUT.file,
+                if ((numbytes=wandio_read(libtrace->io,
                                                 buffer,
                                                 (size_t)64)) != 64) {
@@ -280 +274 @@
         
         while (1) {
-                if ((numbytes = wandio_read(INPUT.file, buffer,
+                if ((numbytes = wandio_read(libtrace->io, buffer,
                                                 (size_t)68)) != 68) {
                         if (numbytes < 0) {
@@ -466 +460 @@
         "$Id$",
         TRACE_FORMAT_LEGACY_ATM,
+        NULL,                           /* probe filename */
+        NULL,                           /* probe magic */
         erf_init_input,                 /* init_input */        
         NULL,                           /* config_input */
@@ -506 +502 @@
         "$Id$",
         TRACE_FORMAT_LEGACY_ETH,
+        NULL,                           /* probe filename */
+        NULL,                           /* probe magic */
         erf_init_input,                 /* init_input */        
         NULL,                           /* config_input */
@@ -546 +544 @@
         "$Id$",
         TRACE_FORMAT_LEGACY_POS,
+        NULL,                           /* probe filename */
+        NULL,                           /* probe magic */
         erf_init_input,                 /* init_input */        
         NULL,                           /* config_input */
@@ -586 +586 @@
         "$Id$",
         TRACE_FORMAT_LEGACY_NZIX,
+        NULL,                           /* probe filename */
+        NULL,                           /* probe magic */
         legacynzix_init_input,          /* init_input */        
         NULL,                           /* config_input */