Changeset 10553bf

Timestamp:

09/25/15 14:31:28 (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:

26c2d4c

Parents:

6fac5db

Message:

Fix various build errors and warnings on OS X

Files:

• examples/parallel/network_capture.c (modified) (1 diff)
• lib/data-struct/sliding_window.c (modified) (1 diff)
• lib/format_bpf.c (modified) (1 diff)
• lib/pthread_spinlock.c (modified) (1 diff)
• lib/trace_parallel.c (modified) (14 diffs)
• tools/traceanon/Makefile.am (modified) (1 diff)

examples/parallel/network_capture.c

@@ -17 +17 @@
 #include <inttypes.h>
 #include <signal.h>
-#include <malloc.h>
 #include <getopt.h>
 #include <stdlib.h>

lib/data-struct/sliding_window.c

@@ -58 +58 @@
 }
 
+/* 
 static inline uint64_t libtrace_slidingwindow_get_min_number(libtrace_slidingwindow_t *sw) {
         return sw->start_number;
 }
+*/
 
 uint64_t libtrace_slidingwindow_read_ready(libtrace_slidingwindow_t *sw) {

lib/format_bpf.c

@@ -371 +371 @@
                 case TRACE_OPTION_EVENT_REALTIME:
                         /* Captures are always realtime */
+                        break;
+                case TRACE_OPTION_HASHER:
+                        /* TODO investigate hashing in BSD? */
                         break;
 

lib/pthread_spinlock.c

@@ -70 +70 @@
                 return EINVAL;
         *lock = OS_SPINLOCK_INIT;
+        (void)pshared;
         return 0;
 }

lib/trace_parallel.c

@@ -82 +82 @@
 #include "libtrace_parallel.h"
 
-#ifdef HAVE_PCAP_BPF_H
-#  include <pcap-bpf.h>
+#ifdef HAVE_NET_BPF_H
+#  include <net/bpf.h>
 #else
-#  ifdef HAVE_NET_BPF_H
-#    include <net/bpf.h>
+#  ifdef HAVE_PCAP_BPF_H
+#    include <pcap-bpf.h>
 #  endif
 #endif
@@ -602 +602 @@
         libtrace_t *trace = (libtrace_t *)data;
         libtrace_thread_t *t;
-        libtrace_message_t message = {0};
+        libtrace_message_t message = {0, {.uint64=0}, NULL};
         libtrace_packet_t *packets[trace->config.burst_size];
         size_t i;
@@ -761 +761 @@
         int i;
         libtrace_packet_t * packet;
-        libtrace_message_t message = {0};
+        libtrace_message_t message = {0, {.uint64=0}, NULL};
         int pkt_skipped = 0;
 
@@ -987 +987 @@
 {
         if (!t->recorded_first) {
-                libtrace_message_t mesg = {0};
+                libtrace_message_t mesg = {0, {.uint64=0}, NULL};
                 struct timeval tv;
                 libtrace_packet_t * dup;
@@ -1084 +1084 @@
 /** Similar to delay_tracetime but send messages to all threads periodically */
 static void* reporter_entry(void *data) {
-        libtrace_message_t message = {0};
+        libtrace_message_t message = {0, {.uint64=0}, NULL};
         libtrace_t *trace = (libtrace_t *)data;
         libtrace_thread_t *t = &trace->reporter_thread;
@@ -1146 +1146 @@
 static void* keepalive_entry(void *data) {
         struct timeval prev, next;
-        libtrace_message_t message = {0};
+        libtrace_message_t message = {0, {.uint64=0}, NULL};
         libtrace_t *trace = (libtrace_t *)data;
         uint64_t next_release;
@@ -1514 +1514 @@
         pthread_attr_t attrib;
         cpu_set_t cpus;
+        int i;
 #endif
-        int ret, i;
+        int ret;
         assert(t->type == THREAD_EMPTY);
         t->trace = trace;
@@ -1522 +1523 @@
         t->type = type;
         t->state = THREAD_RUNNING;
+
+        assert(name);
 
 #ifdef __linux__
@@ -1969 +1972 @@
                 if (libtrace->config.debug_state)
                         fprintf(stderr, "Hasher thread is running, asking it to pause ...");
-                libtrace_message_t message = {0};
+                libtrace_message_t message = {0, {.uint64=0}, NULL};
                 message.code = MESSAGE_DO_PAUSE;
                 trace_message_thread(libtrace, &libtrace->hasher_thread, &message);
@@ -1987 +1990 @@
         for (i = 0; i < libtrace->perpkt_thread_count; i++) {
                 if (&libtrace->perpkt_threads[i] != t) {
-                        libtrace_message_t message = {0};
+                        libtrace_message_t message = {0, {.uint64=0}, NULL};
                         message.code = MESSAGE_DO_PAUSE;
                         ASSERT_RET(trace_message_thread(libtrace, &libtrace->perpkt_threads[i], &message), != -1);
@@ -2030 +2033 @@
                 
                 } else {
-                        libtrace_message_t message = {0};
+                        libtrace_message_t message = {0, {.uint64=0}, NULL};
                         message.code = MESSAGE_DO_PAUSE;
                         trace_message_thread(libtrace, &libtrace->reporter_thread, &message);
@@ -2077 +2080 @@
 {
         int i, err;
-        libtrace_message_t message = {0};
+        libtrace_message_t message = {0, {.uint64=0}, NULL};
         assert(libtrace);
 
@@ -2203 +2206 @@
         // Wait for the tick (keepalive) thread if it has been started
         if (libtrace->keepalive_thread.type == THREAD_KEEPALIVE) {
-                libtrace_message_t msg = {0};
+                libtrace_message_t msg = {0, {.uint64=0}, NULL};
                 msg.code = MESSAGE_DO_STOP;
                 trace_message_thread(libtrace, &libtrace->keepalive_thread, &msg);
@@ -2274 +2277 @@
 DLLEXPORT int trace_post_reporter(libtrace_t *libtrace)
 {
-        libtrace_message_t message = {0};
+        libtrace_message_t message = {0, {.uint64=0}, NULL};
         message.code = MESSAGE_POST_REPORTER;
         return trace_message_reporter(libtrace, (void *) &message);

tools/traceanon/Makefile.am

@@ -8 +8 @@
 traceanon_SOURCES = traceanon.cc Anon.cc Anon.h
 
-traceanon_CPPFLAGS = $(AM_CPPFLAGS)
+# Stupid Apple decided to deprecate the low-level OpenSSL EVP functions
+traceanon_CPPFLAGS = $(AM_CPPFLAGS) -Wno-deprecated-declarations