Changeset dd2eaee

Timestamp:

04/21/06 23:06:02 (15 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:

088533a

Parents:

0c222cc

Message:

Add new pcapfile: uri for natively reading pcap files (without libpcap)
Add initialiser so we don't need to rely on gccisms for initialisation

Location:

lib

Files:

• Makefile.am (modified) (2 diffs)
• format_erf.c (modified) (1 diff)
• format_legacy.c (modified) (1 diff)
• format_linux.c (modified) (1 diff)
• format_pcap.c (modified) (1 diff)
• format_pcapfile.c (added)
• libtrace.h (modified) (1 diff)
• trace.c (modified) (5 diffs)

lib/Makefile.am

@@ -4 +4 @@
 extra_DIST = format_template.c
 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h \
-                format_erf.c format_pcap.c format_wag.c format_legacy.c format_rt.c\
-                format_helper.c format_helper.h format_linux.c \
+                format_erf.c format_pcap.c format_wag.c format_legacy.c \
+                format_rt.c format_helper.c format_helper.h format_linux.c \
+                format_pcapfile.c \
                 parse_cmd.c parse_cmd.h libtrace_int.h lt_inttypes.h \
                 linktypes.c protocols.c 
@@ -13 +14 @@
 libtrace_la_SOURCES+=libtraceio-stdio.c
 endif
+#libtrace_la_SOURCES+=libtraceio-bzlib.c
 
 if DAG2_4

lib/format_erf.c

@@ -539 +539 @@
         }
         if (numbytes == 0) {
-                printf("eof\n");
                 return 0;
         }

lib/format_legacy.c

@@ -327 +327 @@
 
         
-static void CONSTRUCTOR legacy_constructor() {
+void CONSTRUCTOR legacy_constructor() {
         register_format(&legacypos);
         register_format(&legacyeth);

lib/format_linux.c

@@ -227 +227 @@
 };
 
-void __attribute__((constructor)) linuxnative_constructor() {
+void CONSTRUCTOR linuxnative_constructor() {
         register_format(&linuxnative);
 }

lib/format_pcap.c

@@ -531 +531 @@
 };
 
-void __attribute__((constructor)) pcap_constructor() {
+void CONSTRUCTOR pcap_constructor() {
         register_format(&pcap);
         register_format(&pcapint);

lib/libtrace.h

@@ -1204 +1204 @@
         TRACE_FORMAT_ERF          =1,
         TRACE_FORMAT_PCAP         =2,
-        TRACE_FORMAT_WAG          =3,
-        TRACE_FORMAT_RT           =4,
-        TRACE_FORMAT_LEGACY_ATM   =5,
-        TRACE_FORMAT_LEGACY_POS   =6,
-        TRACE_FORMAT_LEGACY_ETH   =7,
-        TRACE_FORMAT_LINUX_NATIVE =8
+        TRACE_FORMAT_PCAPFILE     =3,
+        TRACE_FORMAT_WAG          =4,
+        TRACE_FORMAT_RT           =5,
+        TRACE_FORMAT_LEGACY_ATM   =6,
+        TRACE_FORMAT_LEGACY_POS   =7,
+        TRACE_FORMAT_LEGACY_ETH   =8,
+        TRACE_FORMAT_LINUX_NATIVE =9
 };
 

lib/trace.c

@@ -198 +198 @@
 }
 
+void erf_constructor();
+void legacy_constructor();
+void linuxnative_constructor();
+void pcap_constructor();
+void pcapfile_constructor();
+void rt_constructor();
+void wag_constructor();
+
+/* call all the constructors if they haven't yet all been called */
+void trace_init(void)
+{
+        if (!formats_list) {
+                erf_constructor();
+                legacy_constructor();
+                linuxnative_constructor();
+#ifdef HAVE_PCAP
+                pcap_constructor();
+#endif
+                pcapfile_constructor();
+                rt_constructor();
+                wag_constructor();
+        }
+}
+
 /* Prints help information for libtrace 
  *
@@ -205 +229 @@
 DLLEXPORT void trace_help() {
         struct libtrace_format_t *tmp;
+        trace_init();
         printf("libtrace %s\n",PACKAGE_VERSION);
         for(tmp=formats_list;tmp;tmp=tmp->next) {
@@ -227 +252 @@
         return format;
 }
+
 
 /* Create a trace file from a URI
@@ -259 +285 @@
         struct libtrace_format_t *tmp;
 
+        trace_init();
+
         assert(uri && "Passing NULL to trace_create makes me a very sad program");
         
@@ -384 +412 @@
         const char *uridata = 0;
         struct libtrace_format_t *tmp;
+
+        trace_init();
 
         libtrace->err.err_num = TRACE_ERR_NOERROR;