Changeset 063c879

Timestamp:

10/11/04 14:48:11 (16 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

be78902

Parents:

886c3d9

Message:

more fixesin trace_event

Files:

• config.h (modified) (2 diffs)
• config.h.in (modified) (1 diff)
• lib/libtrace.h (modified) (2 diffs)
• lib/trace.c (modified) (1 diff)

config.h

@@ -15 +15 @@
 
 /* Define to 1 if you have the <net/bpf.h> header file. */
-/* #undef HAVE_NET_BPF_H */
+#define HAVE_NET_BPF_H 1
 
 /* Define to 1 if you have the <pcap-bpf.h> header file. */
-#define HAVE_PCAP_BPF_H 1
+/* #undef HAVE_PCAP_BPF_H */
 
 /* Define to 1 if you have the <pcap.h> header file. */
@@ -99 +99 @@
 /* #undef const */
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
 /* #undef inline */
-#endif
 
 /* Define to `unsigned' if <sys/types.h> does not define. */

config.h.in

@@ -98 +98 @@
 #undef const
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
 #undef inline
-#endif
 
 /* Define to `unsigned' if <sys/types.h> does not define. */

lib/libtrace.h

@@ -358 +358 @@
         TRACE_EVENT_SLEEP,
         TRACE_EVENT_PACKET
-} libtrace_event_t;
-
-typedef struct libtrace_eventobj {
-        libtrace_event_t type;
+} libtrace_eventtype_t;
+
+struct libtrace_event_t {
+        libtrace_eventtype_t type;
         int fd;
         double seconds;
-} libtrace_eventobj_t;
+};
 
 /** process a libtrace event
@@ -379 +379 @@
  *  TRACE_EVENT_PACKET  Packet arrived in <buffer> with size <size>
  */
-libtrace_eventobj_t trace_event(struct libtrace_t *trace,
+struct libtrace_event_t trace_event(struct libtrace_t *trace,
                 struct libtrace_packet_t *packet);
 

lib/trace.c

@@ -1045 +1045 @@
  * @author Perry Lorier
  */
-libtrace_eventobj_t libtrace_event(struct libtrace_t *trace, 
+struct libtrace_event_t libtrace_event(struct libtrace_t *trace, 
                 struct libtrace_packet_t *packet) {
-        libtrace_eventobj_t event;
+        struct libtrace_event_t event;
         /* Is there a packet ready? */
         switch (trace->sourcetype) {