Changeset b06b894

Timestamp:

06/28/18 11:55:57 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

cachetimestamps, develop, master, rc-4.0.4, ringdecrementfix, ringperformance

Children:

a0f031b

Parents:

1ed69dc (diff), 055a2c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Shane Alcock <salcock@…> (06/28/18 11:55:57)

git-committer:

GitHub <noreply@…> (06/28/18 11:55:57)

Message:

Merge pull request #73 from LibtraceTeam?/fix_no_wandder

Fix for building without WANDDER

Files:

• configure.in (modified) (3 diffs)
• lib/format_dpdk.c (modified) (3 diffs)
• libpacketdump/Makefile.am (modified) (2 diffs)

configure.in

@@ -489 +489 @@
         with_numa=yes
 else
-        AC_DEFINE(HAVE_LIBNUMA, 0, [Set to 1 if libnuma is supported])
         with_numa=no
 fi
@@ -498 +497 @@
         wandder_avail=yes
 else
-        AC_DEFINE(HAVE_WANDDER, 0, [Set to 1 if libwandder is available])
         wandder_avail=no
 fi
@@ -549 +547 @@
         with_clock_gettime=yes
 else
-        AC_DEFINE(HAVE_CLOCK_GETTIME, 0, [Set to 1 if clock_gettime is supported])
         with_clock_gettime=no
 fi

lib/format_dpdk.c

@@ -57 +57 @@
 #include <math.h>
 
-#if HAVE_LIBNUMA
+#ifdef HAVE_LIBNUMA
 #include <numa.h>
 #endif
@@ -460 +460 @@
         }
 
-#if HAVE_LIBNUMA
+#ifdef HAVE_LIBNUMA
         format_data->nic_numa_node = pci_to_numa(&use_addr);
         if (my_cpu < 0) {
@@ -891 +891 @@
          * these to any particular physical core */
         if (real) {
-#if HAVE_LIBNUMA
+#ifdef HAVE_LIBNUMA
                 for (i = 0; i < RTE_MAX_LCORE; ++i) {
                         if (!rte_lcore_is_enabled(i) && numa_node_of_cpu(i) == socket) {

libpacketdump/Makefile.am

@@ -62 +62 @@
 
 # 22: ETSI LI
+if HAVE_WANDDER
 BIN_PROTOCOLS+=link_22.la
+endif
 
 # Decoders for various ethertypes (in decimal)
@@ -138 +140 @@
 link_11_la_LDFLAGS=$(modflags)
 link_15_la_LDFLAGS=$(modflags) 
+if HAVE_WANDDER
 link_22_la_LDFLAGS=$(modflags) 
+endif
 eth_0_la_LDFLAGS=$(modflags)
 eth_2048_la_LDFLAGS=$(modflags)