Changeset b4c3f61 for lib

Timestamp:

12/04/12 15:52:01 (9 years ago)

Author:

Shane Alcock <salcock@…>

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:

a464de7

Parents:

528eb6e

Message:

• Removed erroneous '_' in all the #ifdefs I just added to format_linux.c :/
• Removed silly testing output from format_linux.c
• Simplified queue increment in the ring output code so that it doesn't produce warnings

File:

• lib/format_linux.c (modified) (11 diffs)

lib/format_linux.c

@@ -60 +60 @@
 #endif 
 
-#ifdef HAVE_NETPACKET_PACKET_H_
+#ifdef HAVE_NETPACKET_PACKET_H
 
 #include <sys/socket.h>
@@ -129 +129 @@
 
 
-#endif /* HAVE_NETPACKET_PACKET_H_ */
+#endif /* HAVE_NETPACKET_PACKET_H */
 
 struct tpacket_stats {
@@ -272 +272 @@
 
 
-#ifdef HAVE_NETPACKET_PACKET_H_
+#ifdef HAVE_NETPACKET_PACKET_H
 
 /*
@@ -780 +780 @@
         return -1;
 }
-#endif /* HAVE_NETPACKET_PACKET_H_ */
+#endif /* HAVE_NETPACKET_PACKET_H */
 
 static int linuxnative_prepare_packet(libtrace_t *libtrace UNUSED, 
@@ -852 +852 @@
 #define CMSG_BUF_SIZE 128
 
-#ifdef HAVE_NETPACKET_PACKET_H_
+#ifdef HAVE_NETPACKET_PACKET_H
 static int linuxnative_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) 
 {
@@ -1017 +1017 @@
          */
         while (!(header->tp_status & TP_STATUS_USER)) {
-                printf("I shouldn't run if event handler\n");
                 pollset.fd = FORMAT(libtrace->format_data)->fd;
                 pollset.events = POLLIN;
@@ -1155 +1154 @@
 
         /* Notify kernel there are frames to send */
-        DATAOUT(trace)->queue = (++DATAOUT(trace)->queue) % TX_MAX_QUEUE;
+        DATAOUT(trace)->queue ++;
+        DATAOUT(trace)->queue %= TX_MAX_QUEUE;
         if(DATAOUT(trace)->queue == 0){
                 sendto(DATAOUT(trace)->fd, 
@@ -1167 +1167 @@
 
 }
-#endif /* HAVE_NETPACKET_PACKET_H_ */
+#endif /* HAVE_NETPACKET_PACKET_H */
 
 static inline libtrace_linktype_t get_libtrace_link_type(uint16_t linktype){
@@ -1400 +1400 @@
         }
 
-#ifdef HAVE_NETPACKET_PACKET_H_ 
+#ifdef HAVE_NETPACKET_PACKET_H  
         if ((FORMAT(trace->format_data)->stats_valid & 1) 
                         || FORMAT(trace->format_data)->stats_valid == 0) {
@@ -1430 +1430 @@
         }
         
-#ifdef HAVE_NETPACKET_PACKET_H_ 
+#ifdef HAVE_NETPACKET_PACKET_H  
         if ((FORMAT(trace->format_data)->stats_valid & 2)
                         || (FORMAT(trace->format_data)->stats_valid==0)) {
@@ -1448 +1448 @@
 }
 
-#ifdef HAVE_NETPACKET_PACKET_H_
+#ifdef HAVE_NETPACKET_PACKET_H
 static void linuxnative_help(void) {
         printf("linuxnative format module: $Revision$\n");