Changeset 5097267

Timestamp:

12/07/18 13:52:59 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

9c46b65

Parents:

c79c7fd (diff), 5964f52 (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.

Message:

Merge branch 'fix86' into develop

Location:

lib

Files:

• Makefile.am (modified) (2 diffs)
• format_dpdk.c (modified) (1 diff)

lib/Makefile.am

@@ -43 +43 @@
 export SAVED_CFLAGS:=$(CFLAGS)
 export SAVED_CXXFLAGS:=$(CXXFLAGS)
+export SAVED_CPPFLAGS:=$(CPPFLAGS)
+export SAVED_LDFLAGS:=$(LDFLAGS)
 include $(RTE_SDK)/mk/rte.vars.mk
 # We need to add -Wl before the linker otherwise this breaks our build
@@ -50 +52 @@
 export CFLAGS += $(SAVED_CFLAGS)
 export CXXFLAGS += $(SAVED_CXXFLAGS)
+export CPPFLAGS:=$(SAVED_CPPFLAGS)
+export LDFLAGS += $(SAVED_LDFLAGS)
 endif
 

lib/format_dpdk.c

@@ -2153 +2153 @@
                                 /* The packet should always be finished */
                                 if (packet->buf_control != TRACE_CTRL_PACKET) {
-                                        trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Expected packet "
+                                        trace_set_err(trace, TRACE_ERR_BAD_PACKET, "Expected packet "
                                                 "buffer to be empty in dpdk_trace_event()\n");
-                                        return -1;
+                                        event.type = TRACE_EVENT_TERMINATE;
+                                        return event;
                                 }
                                 free(packet->buffer);