Changeset 10553bf
- Timestamp:
- 09/25/15 14:31:28 (5 years ago)
- 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
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
examples/parallel/network_capture.c
r624c2da r10553bf 17 17 #include <inttypes.h> 18 18 #include <signal.h> 19 #include <malloc.h>20 19 #include <getopt.h> 21 20 #include <stdlib.h> -
lib/data-struct/sliding_window.c
r5ba34eb r10553bf 58 58 } 59 59 60 /* 60 61 static inline uint64_t libtrace_slidingwindow_get_min_number(libtrace_slidingwindow_t *sw) { 61 62 return sw->start_number; 62 63 } 64 */ 63 65 64 66 uint64_t libtrace_slidingwindow_read_ready(libtrace_slidingwindow_t *sw) { -
lib/format_bpf.c
r5478d3d r10553bf 371 371 case TRACE_OPTION_EVENT_REALTIME: 372 372 /* Captures are always realtime */ 373 break; 374 case TRACE_OPTION_HASHER: 375 /* TODO investigate hashing in BSD? */ 373 376 break; 374 377 -
lib/pthread_spinlock.c
rac6ac7f r10553bf 70 70 return EINVAL; 71 71 *lock = OS_SPINLOCK_INIT; 72 (void)pshared; 72 73 return 0; 73 74 } -
lib/trace_parallel.c
r389dd77 r10553bf 82 82 #include "libtrace_parallel.h" 83 83 84 #ifdef HAVE_ PCAP_BPF_H85 # include < pcap-bpf.h>84 #ifdef HAVE_NET_BPF_H 85 # include <net/bpf.h> 86 86 #else 87 # ifdef HAVE_ NET_BPF_H88 # include < net/bpf.h>87 # ifdef HAVE_PCAP_BPF_H 88 # include <pcap-bpf.h> 89 89 # endif 90 90 #endif … … 602 602 libtrace_t *trace = (libtrace_t *)data; 603 603 libtrace_thread_t *t; 604 libtrace_message_t message = {0 };604 libtrace_message_t message = {0, {.uint64=0}, NULL}; 605 605 libtrace_packet_t *packets[trace->config.burst_size]; 606 606 size_t i; … … 761 761 int i; 762 762 libtrace_packet_t * packet; 763 libtrace_message_t message = {0 };763 libtrace_message_t message = {0, {.uint64=0}, NULL}; 764 764 int pkt_skipped = 0; 765 765 … … 987 987 { 988 988 if (!t->recorded_first) { 989 libtrace_message_t mesg = {0 };989 libtrace_message_t mesg = {0, {.uint64=0}, NULL}; 990 990 struct timeval tv; 991 991 libtrace_packet_t * dup; … … 1084 1084 /** Similar to delay_tracetime but send messages to all threads periodically */ 1085 1085 static void* reporter_entry(void *data) { 1086 libtrace_message_t message = {0 };1086 libtrace_message_t message = {0, {.uint64=0}, NULL}; 1087 1087 libtrace_t *trace = (libtrace_t *)data; 1088 1088 libtrace_thread_t *t = &trace->reporter_thread; … … 1146 1146 static void* keepalive_entry(void *data) { 1147 1147 struct timeval prev, next; 1148 libtrace_message_t message = {0 };1148 libtrace_message_t message = {0, {.uint64=0}, NULL}; 1149 1149 libtrace_t *trace = (libtrace_t *)data; 1150 1150 uint64_t next_release; … … 1514 1514 pthread_attr_t attrib; 1515 1515 cpu_set_t cpus; 1516 int i; 1516 1517 #endif 1517 int ret , i;1518 int ret; 1518 1519 assert(t->type == THREAD_EMPTY); 1519 1520 t->trace = trace; … … 1522 1523 t->type = type; 1523 1524 t->state = THREAD_RUNNING; 1525 1526 assert(name); 1524 1527 1525 1528 #ifdef __linux__ … … 1969 1972 if (libtrace->config.debug_state) 1970 1973 fprintf(stderr, "Hasher thread is running, asking it to pause ..."); 1971 libtrace_message_t message = {0 };1974 libtrace_message_t message = {0, {.uint64=0}, NULL}; 1972 1975 message.code = MESSAGE_DO_PAUSE; 1973 1976 trace_message_thread(libtrace, &libtrace->hasher_thread, &message); … … 1987 1990 for (i = 0; i < libtrace->perpkt_thread_count; i++) { 1988 1991 if (&libtrace->perpkt_threads[i] != t) { 1989 libtrace_message_t message = {0 };1992 libtrace_message_t message = {0, {.uint64=0}, NULL}; 1990 1993 message.code = MESSAGE_DO_PAUSE; 1991 1994 ASSERT_RET(trace_message_thread(libtrace, &libtrace->perpkt_threads[i], &message), != -1); … … 2030 2033 2031 2034 } else { 2032 libtrace_message_t message = {0};2035 libtrace_message_t message = {0, {.uint64=0}, NULL}; 2033 2036 message.code = MESSAGE_DO_PAUSE; 2034 2037 trace_message_thread(libtrace, &libtrace->reporter_thread, &message); … … 2077 2080 { 2078 2081 int i, err; 2079 libtrace_message_t message = {0 };2082 libtrace_message_t message = {0, {.uint64=0}, NULL}; 2080 2083 assert(libtrace); 2081 2084 … … 2203 2206 // Wait for the tick (keepalive) thread if it has been started 2204 2207 if (libtrace->keepalive_thread.type == THREAD_KEEPALIVE) { 2205 libtrace_message_t msg = {0 };2208 libtrace_message_t msg = {0, {.uint64=0}, NULL}; 2206 2209 msg.code = MESSAGE_DO_STOP; 2207 2210 trace_message_thread(libtrace, &libtrace->keepalive_thread, &msg); … … 2274 2277 DLLEXPORT int trace_post_reporter(libtrace_t *libtrace) 2275 2278 { 2276 libtrace_message_t message = {0 };2279 libtrace_message_t message = {0, {.uint64=0}, NULL}; 2277 2280 message.code = MESSAGE_POST_REPORTER; 2278 2281 return trace_message_reporter(libtrace, (void *) &message); -
tools/traceanon/Makefile.am
rebb54a5 r10553bf 8 8 traceanon_SOURCES = traceanon.cc Anon.cc Anon.h 9 9 10 traceanon_CPPFLAGS = $(AM_CPPFLAGS) 10 # Stupid Apple decided to deprecate the low-level OpenSSL EVP functions 11 traceanon_CPPFLAGS = $(AM_CPPFLAGS) -Wno-deprecated-declarations
Note: See TracChangeset
for help on using the changeset viewer.