Changeset 5478d3d for lib

Timestamp:

09/15/15 17:16:51 (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:

8decff7

Parents:

624c2da

Message:

Fix all outstanding warnings

Implemented trace_get_statistics for formats that were missing it, so
we no longer need to use the deprecated trace_get_dropped_packets anywhere
within libtrace.

Location:

lib

Files:

• format_bpf.c (modified) (2 diffs)
• format_dag25.c (modified) (2 diffs)
• format_erf.c (modified) (3 diffs)
• format_linux_int.c (modified) (1 diff)
• format_pcap.c (modified) (2 diffs)
• format_rt.c (modified) (1 diff)
• libtrace.h.in (modified) (1 diff)
• libtrace_parallel.h (modified) (1 diff)
• trace.c (modified) (3 diffs)
• trace_parallel.c (modified) (2 diffs)

lib/format_bpf.c

@@ -314 +314 @@
 
         return FORMATIN(trace)->stats.bs_drop;
+}
+
+static void bpf_get_statistics(libtrace_t *trace, libtrace_stat_t *stat) {
+        uint64_t dropped = bpf_get_dropped_packets(trace);
+        uint64_t received = bpf_get_received_packets(trace);
+
+        if (dropped != (uint64_t)-1) {
+                stat->dropped_valid = 1;
+                stat->dropped = dropped;
+        }
+
+        if (received != (uint64_t) -1) {
+                stat->received_valid = 1;
+                stat->received = received;
+        }
+
 }
 
@@ -607 +623 @@
         bpf_get_framing_length, /* get_framing_length */
         NULL,                   /* set_capture_length */
-        bpf_get_received_packets,/* get_received_packets */
+        NULL,                   /* get_received_packets */
         NULL,                   /* get_filtered_packets */
-        bpf_get_dropped_packets,/* get_dropped_packets */
-        NULL,                   /* get_statistics */
+        NULL,                   /* get_dropped_packets */
+        bpf_get_statistics,     /* get_statistics */
         bpf_get_fd,             /* get_fd */
         trace_event_device,     /* trace_event */

lib/format_dag25.c

@@ -1460 +1460 @@
 }
 
-static void dag_get_thread_statisitics(libtrace_t *libtrace, libtrace_thread_t *t,
+static void dag_get_thread_statistics(libtrace_t *libtrace, libtrace_thread_t *t,
                                        libtrace_stat_t *stat) {
         struct dag_per_stream_t *stream_data = t->format_data;
@@ -1566 +1566 @@
         dag_pregister_thread,
         NULL,
-        dag_get_thread_statisitics      /* get thread stats */
+        dag_get_thread_statistics       /* get thread stats */
 };
 

lib/format_erf.c

@@ -802 +802 @@
 }
 
-static uint64_t erf_get_dropped_packets(libtrace_t *trace)
-{
-        if (trace->format_data == NULL)
-                return (uint64_t)-1;
-        return DATA(trace)->drops;
+static void erf_get_statistics(libtrace_t *trace, libtrace_stat_t *stat) {
+
+        if (trace->format_data) {
+                stat->dropped_valid = 1;
+                stat->dropped = DATA(trace)->drops;
+        }
 }
 
@@ -865 +866 @@
         NULL,                           /* get_received_packets */
         NULL,                           /* get_filtered_packets */
-        erf_get_dropped_packets,        /* get_dropped_packets */
-        NULL,                           /* get_statistics */
+        NULL,                           /* get_dropped_packets */
+        erf_get_statistics,             /* get_statistics */
         NULL,                           /* get_fd */
         erf_event,                      /* trace_event */
@@ -909 +910 @@
         NULL,                           /* get_received_packets */
         NULL,                           /* get_filtered_packets */
-        erf_get_dropped_packets,        /* get_dropped_packets */
-        NULL,                           /* get_statistics */
+        NULL,                           /* get_dropped_packets */
+        erf_get_statistics,             /* get_statistics */
         NULL,                           /* get_fd */
         erf_event,                      /* trace_event */

lib/format_linux_int.c

@@ -191 +191 @@
         if ((int) hdr->wirelen == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
                 /* Do message queue check or select */
-                int message_fd;
+                int message_fd = 0;
                 int largestfd = stream->fd;
 

lib/format_pcap.c

@@ -755 +755 @@
 }
 
-static uint64_t pcap_get_dropped_packets(libtrace_t *trace)
-{
-        struct pcap_stat stats;
-        if (pcap_stats(DATA(trace)->input.pcap,&stats)==-1) {
+static void pcap_get_statistics(libtrace_t *trace, libtrace_stat_t *stat) {
+
+        struct pcap_stat pcapstats;
+        if (pcap_stats(DATA(trace)->input.pcap,&pcapstats)==-1) {
                 char *errmsg = pcap_geterr(DATA(trace)->input.pcap);
                 trace_set_err(trace,TRACE_ERR_UNSUPPORTED,
-                                "Failed to retreive stats: %s\n",
+                                "Failed to retrieve stats: %s\n",
                                 errmsg ? errmsg : "Unknown pcap error");
-                return ~0;
-        }
-
-        return stats.ps_drop;
+                return;
+        }
+
+        stat->dropped_valid = 1;
+        stat->dropped = pcapstats.ps_drop;
 }
 
@@ -873 +874 @@
         NULL,                           /* get_received_packets */
         NULL,                           /* get_filtered_packets */
-        pcap_get_dropped_packets,       /* get_dropped_packets */
-        NULL,                           /* get_statistics */
+        NULL,                           /* get_dropped_packets */
+        pcap_get_statistics,            /* get_statistics */
         pcap_get_fd,                    /* get_fd */
         trace_event_device,             /* trace_event */

lib/format_rt.c

@@ -628 +628 @@
         rt_header_t hdr;
         rt_header_t *pkt_hdr = NULL;
-        void *void_hdr;
         libtrace_rt_types_t switch_type;
         

lib/libtrace.h.in

@@ -1483 +1483 @@
 DLLEXPORT void trace_destroy_output(libtrace_out_t *trace);
 
-/** Create a callback set that can be used to define callbacks for parallel
-  * libtrace threads.
-  *
-  * @return A pointer to a freshly allocated callback set.
-  */
-DLLEXPORT libtrace_callback_set_t *trace_create_callback_set();
-
-/** Destroys a callback set, freeing up an resources it was using.
- *
- * @param cbset         The callback set to be destroyed.
- */
-DLLEXPORT void trace_destroy_callback_set(libtrace_callback_set_t *cbset);
-
-
 /** Check (and clear) the current error state of an input trace
  * @param trace         The input trace to check the error state on

lib/libtrace_parallel.h

@@ -608 +608 @@
 DLLEXPORT int trace_set_user_message_cb(libtrace_callback_set_t *cbset,
                 fn_cb_usermessage handler);
+
+/** Create a callback set that can be used to define callbacks for parallel
+  * libtrace threads.
+  *
+  * @return A pointer to a freshly allocated callback set.
+  */
+DLLEXPORT libtrace_callback_set_t *trace_create_callback_set(void);
+
+/** Destroys a callback set, freeing up an resources it was using.
+ *
+ * @param cbset         The callback set to be destroyed.
+ */
+DLLEXPORT void trace_destroy_callback_set(libtrace_callback_set_t *cbset);
+
 
 /** Pauses a trace previously started with trace_pstart()

lib/trace.c

@@ -2102 +2102 @@
 libtrace_stat_t *trace_get_statistics(libtrace_t *trace, libtrace_stat_t *stat)
 {
-        uint64_t ret;
+        uint64_t ret = 0;
         int i;
         assert(trace);
@@ -2129 +2129 @@
 #undef X
         /* Both accepted and filtered are stored against in the library */
-        ret = trace_get_accepted_packets(trace);
-        if (ret != UINT64_MAX) {
-                stat->accepted_valid = 1;
-                stat->accepted = ret;
-        }
+
+        /* We always add to a thread's accepted count before dispatching the
+         * packet to the user. However if the underlying trace is single
+         * threaded it will also be increasing the global count. So if we
+         * find perpkt ignore the global count.
+         */
+        for (i = 0; i < trace->perpkt_thread_count; i++) {
+                ret += trace->perpkt_threads[i].accepted_packets;
+        }
+
+        stat->accepted_valid = 1;
+        stat->accepted = ret ? ret : trace->accepted_packets;
 
         stat->filtered_valid = 1;
@@ -2143 +2150 @@
         if (trace->format->get_statistics) {
                 trace->format->get_statistics(trace, stat);
-        } else {
-                /* Fallback to the old way */
-                ret = trace_get_received_packets(trace);
-                if (ret != UINT64_MAX) {
-                        stat->received_valid = 1;
-                        stat->received = ret;
-                }
-                ret = trace_get_dropped_packets(trace);
-                if (ret != UINT64_MAX) {
-                        stat->dropped_valid = 1;
-                        stat->dropped = ret;
-                }
         }
         return stat;

lib/trace_parallel.c

@@ -252 +252 @@
 }
 
+DLLEXPORT void trace_destroy_callback_set(libtrace_callback_set_t *cbset) {
+        free(cbset);
+}
+
 DLLEXPORT libtrace_callback_set_t *trace_create_callback_set() {
         libtrace_callback_set_t *cbset;
@@ -258 +262 @@
         memset(cbset, 0, sizeof(libtrace_callback_set_t));
         return cbset;
-}
-
-DLLEXPORT void trace_destroy_callback_set(libtrace_callback_set_t *cbset) {
-        free(cbset);
 }