Changeset fdf1f7b for lib

Timestamp:

06/23/17 14:25:59 (4 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

4578626

Parents:

633339d (diff), 1105ce0 (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 remote-tracking branch 'origin/develop' into pcapng-reader

Location:

lib

Files:

• format_linux_common.c (modified) (4 diffs)
• format_pcap.c (modified) (6 diffs)
• trace.c (modified) (5 diffs)
• trace_parallel.c (modified) (3 diffs)

lib/format_linux_common.c

@@ -61 +61 @@
 static int linuxnative_configure_bpf(libtrace_t *libtrace,
                 libtrace_filter_t *filter) {
-#ifdef HAVE_LIBPCAP
+#if defined(HAVE_LIBPCAP) && defined(HAVE_BPF)
         struct ifreq ifr;
         unsigned int arphrd;
@@ -125 +125 @@
         return 0;
 #else
-        return -1
+        return -1;
 #endif
 }
@@ -404 +404 @@
          * pre-compiled.
          */
+#ifdef HAVE_BPF
         if (filter != NULL) {
                 /* Check if the filter was successfully compiled. If not,
@@ -424 +425 @@
                 }
         }
+#endif
 
         /* Consume any buffered packets that were received before the socket

lib/format_pcap.c

@@ -128 +128 @@
 
         /* If a filter has been configured, compile and apply it */
+#ifdef HAVE_BPF
         if (DATA(libtrace)->filter) {
                 if (DATA(libtrace)->filter->flag == 0) {
@@ -143 +144 @@
                 }
         }
+#endif
         return 0;
 }
@@ -152 +154 @@
         switch(option) {
                 case TRACE_OPTION_FILTER:
+#ifdef HAVE_BPF
                         DATA(libtrace)->filter=data;
                         return 0;
+#else
+                        return -1;
+#endif
                 case TRACE_OPTION_SNAPLEN:
                         /* Snapping isn't supported directly, so fall thru
@@ -211 +217 @@
         switch(option) {
                 case TRACE_OPTION_FILTER:
+#ifdef HAVE_BPF
                         DATA(libtrace)->filter=(libtrace_filter_t*)data;
                         return 0;
+#else
+                        return -1;
+#endif
                 case TRACE_OPTION_SNAPLEN:
                         DATA(libtrace)->snaplen=*(int*)data;
@@ -298 +308 @@
 #endif
         /* Set a filter if one is defined */
+#ifdef HAVE_BPF
         if (DATA(libtrace)->filter) {
                 struct pcap_pkthdr *pcap_hdr = NULL;
@@ -342 +353 @@
                         return -1;
         }
+#endif
         return 0; /* success */
 }

lib/trace.c

@@ -1350 +1350 @@
 trace_create_filter_from_bytecode(void *bf_insns, unsigned int bf_len)
 {
-#ifndef HAVE_BPF_FILTER
+#ifndef HAVE_BPF
         fprintf(stderr, "This version of libtrace does not have BPF support\n");
         return NULL;
@@ -1377 +1377 @@
  */
 DLLEXPORT libtrace_filter_t *trace_create_filter(const char *filterstring) {
-#ifdef HAVE_BPF_FILTER
+#ifdef HAVE_BPF
         libtrace_filter_t *filter = (libtrace_filter_t*)
                                 malloc(sizeof(libtrace_filter_t));
@@ -1392 +1392 @@
 DLLEXPORT void trace_destroy_filter(libtrace_filter_t *filter)
 {
-#ifdef HAVE_BPF_FILTER
+#ifdef HAVE_BPF
         free(filter->filterstring);
         if (filter->flag)
@@ -1417 +1417 @@
                 void *linkptr,
                 libtrace_linktype_t linktype    ) {
-#ifdef HAVE_BPF_FILTER
+#ifdef HAVE_BPF
         /* It just so happens that the underlying libs used by pthread arn't
          * thread safe, namely lex/flex thingys, so single threaded compile
@@ -1481 +1481 @@
 DLLEXPORT int trace_apply_filter(libtrace_filter_t *filter,
                         const libtrace_packet_t *packet) {
-#ifdef HAVE_BPF_FILTER
+#ifdef HAVE_BPF
         void *linkptr = 0;
         uint32_t clen = 0;

lib/trace_parallel.c

@@ -805 +805 @@
                                         break;
                                 case MESSAGE_DO_STOP:
+                                        /* Either FINISHED or FINISHING */
                                         assert(trace->started == false);
-                                        assert(trace->state == STATE_FINISHED);
                                         /* Mark the current packet as EOF */
                                         packet->error = 0;
-                                        break;
+                                        goto hasher_eof;
                                 default:
                                         fprintf(stderr, "Hasher thread didn't expect message code=%d\n", message.code);
@@ -850 +850 @@
                 }
         }
-
+hasher_eof:
         /* Broadcast our last failed read to all threads */
         for (i = 0; i < trace->perpkt_thread_count; i++) {
@@ -862 +862 @@
                 ASSERT_RET(pthread_mutex_lock(&trace->libtrace_lock), == 0);
                 if (trace->perpkt_threads[i].state != THREAD_FINISHED) {
-                        // Unlock early otherwise we could deadlock
                         libtrace_ringbuffer_write(&trace->perpkt_threads[i].rbuffer, bcast);
+                } else {
+                        libtrace_ocache_free(&trace->packet_freelist, (void **) &bcast, 1, 1);
                 }
                 ASSERT_RET(pthread_mutex_unlock(&trace->libtrace_lock), == 0);