Changeset babeb70

Timestamp:

08/31/15 13:50:39 (5 years ago)

Author:

Shane Alcock <salcock@…>

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:

87cba74

Parents:

f45ff19

Message:

Detect whether PACKET_FANOUT is available.

If not, int: and ring: will fallback to single-threaded input if
trace_pstart() is called on them.

Files:

• configure.in (modified) (1 diff)
• lib/format_linux_int.c (modified) (2 diffs)
• lib/format_linux_ring.c (modified) (2 diffs)

configure.in

@@ -412 +412 @@
 fi
 
+# Check for PACKET_FANOUT (borrowed from Suricata)
+AC_CHECK_DECL([PACKET_FANOUT_QM],
+        AC_DEFINE([HAVE_PACKET_FANOUT],[1],
+        [Recent packet fanout support is available]),
+        [],
+        [[#include <linux/if_packet.h>]])
+
 # If we use DPDK we might be able to use libnuma
 AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0)

lib/format_linux_int.c

@@ -505 +505 @@
         linuxnative_help,               /* help */
         NULL,                           /* next pointer */
+#ifdef HAVE_PACKET_FANOUT
         {true, -1},                     /* Live, no thread limit */
         linuxnative_pstart_input,       /* pstart_input */
@@ -513 +514 @@
         NULL,                           /* unregister thread */
         NULL                            /* get thread stats */
+#else
+        NON_PARALLEL(true)
+#endif
 };
 #else

lib/format_linux_ring.c

@@ -752 +752 @@
         linuxring_help,                 /* help */
         NULL,                           /* next pointer */
+#ifdef HAVE_PACKET_FANOUT
         {true, -1},                     /* Live, no thread limit */
         linuxring_pstart_input,         /* pstart_input */
@@ -760 +761 @@
         NULL,                           /* unregister thread */
         NULL                            /* get thread stats */
+#else
+        NON_PARALLEL(true)
+#endif
 };
 #else /* HAVE_NETPACKET_PACKET_H */