Changeset f9a70ca

Timestamp:

08/04/14 17:44:53 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

7e4e9b8, f051c1b

Parents:

be3f75b

Message:

Fix an off by one error with the accepted packets counter.
Fix stats counts returned by the linux formats to return totals.

Location:

lib

Files:

• format_linux.c (modified) (6 diffs)
• trace.c (modified) (1 diff)

lib/format_linux.c

@@ -167 +167 @@
 // Something to do with fragmented packets and hashing problems !! TODO figure out if this needs to be on
 #define PACKET_FANOUT_FLAG_DEFRAG       0x8000
-/* Included but unused by libtrace since 3.10 */
+/* Included but unused by libtrace since Linux 3.10 */
 // if one socket if full roll over to the next
 #define PACKET_FANOUT_ROLLOVER          3
 // This flag makes any other system roll over
 #define PACKET_FANOUT_FLAG_ROLLOVER     0x1000
-/* Included but unused by libtrace since 3.12 */
+/* Included but unused by libtrace since Linux 3.12 */
 // schedule random
 #define PACKET_FANOUT_RND               4
@@ -1360 +1360 @@
 
 static int linuxring_pread_packet(libtrace_t *libtrace, libtrace_thread_t *t, libtrace_packet_t *packet) {
-        fprintf(stderr, "Thread number is #%d\n", t->perpkt_num);
+        //fprintf(stderr, "Thread number is #%d\n", t->perpkt_num);
         int fd = PERPKT_FORMAT(t)->fd;
         int *rxring_offset = &PERPKT_FORMAT(t)->rxring_offset;
@@ -1735 +1735 @@
 /* Number of packets that passed filtering */
 static uint64_t linuxnative_get_captured_packets(libtrace_t *trace) {
+        struct tpacket_stats stats;
+
         if (trace->format_data == NULL)
                 return UINT64_MAX;
@@ -1743 +1745 @@
         }
 
-#ifdef HAVE_NETPACKET_PACKET_H  
-        if ((FORMAT(trace->format_data)->stats_valid & 1) 
-                        || FORMAT(trace->format_data)->stats_valid == 0) {
-                socklen_t len = sizeof(FORMAT(trace->format_data)->stats);
-                getsockopt(FORMAT(trace->format_data)->fd, 
-                                SOL_PACKET,
-                                PACKET_STATISTICS,
-                                &FORMAT(trace->format_data)->stats,
-                                &len);
-                FORMAT(trace->format_data)->stats_valid |= 1;
+#ifdef HAVE_NETPACKET_PACKET_H
+
+        if ((FORMAT(trace->format_data)->stats_valid & 1)
+                || FORMAT(trace->format_data)->stats_valid == 0) {
+                if (FORMAT(trace->format_data)->per_thread) {
+                        size_t i;
+                        FORMAT(trace->format_data)->stats.tp_drops = 0;
+                        FORMAT(trace->format_data)->stats.tp_packets = 0;
+                        for (i = 0; i < trace->perpkt_thread_count; ++i) {
+                                socklen_t len = sizeof(stats);
+                                getsockopt(FORMAT(trace->format_data)->per_thread[i].fd,
+                                           SOL_PACKET,
+                                           PACKET_STATISTICS,
+                                           &stats,
+                                           &len);
+                                FORMAT(trace->format_data)->stats.tp_drops += stats.tp_drops;
+                                FORMAT(trace->format_data)->stats.tp_packets += stats.tp_packets;
+                        }
+                        FORMAT(trace->format_data)->stats_valid |= 1;
+                } else {
+                        socklen_t len = sizeof(FORMAT(trace->format_data)->stats);
+                        getsockopt(FORMAT(trace->format_data)->fd,
+                                   SOL_PACKET,
+                                   PACKET_STATISTICS,
+                                   &FORMAT(trace->format_data)->stats,
+                                   &len);
+                        FORMAT(trace->format_data)->stats_valid |= 1;
+                }
         }
 
@@ -1765 +1785 @@
  */
 static uint64_t linuxnative_get_dropped_packets(libtrace_t *trace) {
+        struct tpacket_stats stats;
         if (trace->format_data == NULL)
                 return UINT64_MAX;
@@ -1772 +1793 @@
                 return UINT64_MAX;
         }
-        
+
 #ifdef HAVE_NETPACKET_PACKET_H  
         if ((FORMAT(trace->format_data)->stats_valid & 2)
-                        || (FORMAT(trace->format_data)->stats_valid==0)) {
-                socklen_t len = sizeof(FORMAT(trace->format_data)->stats);
-                getsockopt(FORMAT(trace->format_data)->fd, 
-                                SOL_PACKET,
-                                PACKET_STATISTICS,
-                                &FORMAT(trace->format_data)->stats,
-                                &len);
-                FORMAT(trace->format_data)->stats_valid |= 2;
+                || (FORMAT(trace->format_data)->stats_valid==0)) {
+                if (FORMAT(trace->format_data)->per_thread) {
+                        size_t i;
+                        FORMAT(trace->format_data)->stats.tp_drops = 0;
+                        FORMAT(trace->format_data)->stats.tp_packets = 0;
+                        for (i = 0; i < trace->perpkt_thread_count; ++i) {
+                                socklen_t len = sizeof(stats);
+                                getsockopt(FORMAT(trace->format_data)->per_thread[i].fd,
+                                           SOL_PACKET,
+                                           PACKET_STATISTICS,
+                                           &stats,
+                                           &len);
+                                FORMAT(trace->format_data)->stats.tp_drops += stats.tp_drops;
+                                FORMAT(trace->format_data)->stats.tp_packets += stats.tp_packets;
+                        }
+                        FORMAT(trace->format_data)->stats_valid |= 2;
+                } else {
+                        socklen_t len = sizeof(FORMAT(trace->format_data)->stats);
+                        getsockopt(FORMAT(trace->format_data)->fd,
+                                   SOL_PACKET,
+                                   PACKET_STATISTICS,
+                                   &FORMAT(trace->format_data)->stats,
+                                   &len);
+                        FORMAT(trace->format_data)->stats_valid |= 2;
+                }
         }
 

lib/trace.c

@@ -287 +287 @@
         libtrace->first_packets.packets = NULL;
         libtrace->dropped_packets = UINT64_MAX;
-        libtrace->accepted_packets = UINT64_MAX;
 
         /* Parse the URI to determine what sort of trace we are dealing with */