Changeset 5df059b for lib

Timestamp:

02/20/15 17:41:55 (7 years ago)

Author:

Richard Sanger <rsangerarj@…>

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:

10c47a0

Parents:

e8c0a9c

git-author:

Richard Sanger <rsangerarj@…> (02/20/15 17:36:30)

git-committer:

Richard Sanger <rsangerarj@…> (02/20/15 17:41:55)

Message:

Update DAG25 to the new statisitic counters
Improve error handling of an incorrect parallel stream configuration.

File:

• lib/format_dag25.c (modified) (7 diffs)

lib/format_dag25.c

@@ -1215 +1215 @@
  * If DUCK reporting is enabled, the packet returned may be a DUCK update
  */
-static int dag_read_packet_real(libtrace_t *libtrace,
+static int dag_read_packet_stream(libtrace_t *libtrace,
                                 struct dag_per_stream_t *stream_data,
                                 libtrace_thread_t *t, /* Optional */
@@ -1285 +1285 @@
 static int dag_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet)
 {
-        return dag_read_packet_real(libtrace, FORMAT_DATA_FIRST, NULL, packet);
+        return dag_read_packet_stream(libtrace, FORMAT_DATA_FIRST, NULL, packet);
 }
 
@@ -1300 +1300 @@
         /* Read as many packets as we can, but read atleast one packet */
         do {
-                ret = dag_read_packet_real(libtrace, stream_data, t,
+                ret = dag_read_packet_stream(libtrace, stream_data, t,
                                            packets[read_packets]);
                 if (ret < 0)
@@ -1427 +1427 @@
 }
 
-/* Gets the number of dropped packets */
-static uint64_t dag_get_dropped_packets(libtrace_t *libtrace)
-{
-        uint64_t sum = 0;
-        libtrace_list_node_t *tmp = FORMAT_DATA_HEAD;
-
-        /* Sum the drop counter for all the packets */
+static void dag_get_statistics(libtrace_t *libtrace, libtrace_stat_t *stat)
+{
+        libtrace_list_node_t *tmp;
+        assert(stat && libtrace);
+        tmp = FORMAT_DATA_HEAD;
+
+        /* We don't filter packets on the card itself */
+        stat->filtered_valid = 1;
+        stat->filtered = 0;
+
+        /* Dropped, filtered the  */
+        stat->dropped_valid = 1;
+        stat->dropped = 0;
         while (tmp != NULL) {
-                sum += STREAM_DATA(tmp)->drops;
+                stat->dropped += STREAM_DATA(tmp)->drops;
                 tmp = tmp->next;
         }
 
-        return sum;
+}
+
+static void dag_get_thread_statisitics(libtrace_t *libtrace, libtrace_thread_t *t,
+                                       libtrace_stat_t *stat) {
+        struct dag_per_stream_t *stream_data = t->format_data;
+        assert(stat && libtrace);
+
+        stat->dropped_valid = 1;
+        stat->dropped = stream_data->drops;
+
+        stat->filtered_valid = 1;
+        stat->filtered = 0;
 }
 
@@ -1479 +1496 @@
 {
         struct dag_per_stream_t *stream_data;
+        libtrace_list_node_t *node;
 
         if (reader) {
                 if (t->type == THREAD_PERPKT) {
-                        stream_data =
-                                (struct dag_per_stream_t *)
-                                libtrace_list_get_index(FORMAT_DATA->per_stream,
-                                                        t->perpkt_num)->data;
+
+                        node = libtrace_list_get_index(FORMAT_DATA->per_stream,
+                                                        t->perpkt_num);
+                        if (node == NULL) {
+                                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED,
+                                              "Too few streams supplied for the"
+                                              " number of threads lanuched");
+                                return -1;
+                        }
+                        stream_data = node->data;
 
                         /* Pass the per thread data to the thread */
@@ -1542 +1566 @@
         NULL,                           /* get_received_packets */
         NULL,                           /* get_filtered_packets */
-        dag_get_dropped_packets,        /* get_dropped_packets */
-        NULL,                           /* get_statistics */
+        NULL,                           /* get_dropped_packets */
+        dag_get_statistics,             /* get_statistics */
         NULL,                           /* get_fd */
         trace_event_dag,                /* trace_event */
@@ -1556 +1580 @@
         dag_pregister_thread,
         NULL,
-        NULL                            /* get thread stats */
+        dag_get_thread_statisitics      /* get thread stats */
 };