Changeset 4eac98f

Timestamp:

02/10/12 10:09:41 (9 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, 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:

9902272

Parents:

66e6d16

Message:

• Fixed bug where filters were not being applied to rt inputs that were using the event API (thanks Nevil for reporting this)

File:

• lib/format_rt.c (modified) (1 diff)

lib/format_rt.c

@@ -720 +720 @@
         }
 
-        /* Attempt to read a packet in a non-blocking fashion */
-        event.size = rt_read_packet_versatile(trace, packet, 0);
-        if (event.size == -1) {
-                read_err = trace_get_err(trace);
-                if (read_err.err_num == EAGAIN) {
-                        /* No data available - do an IOWAIT */
-                        event.type = TRACE_EVENT_IOWAIT;
-                }
+        do {
+
+                event.size = rt_read_packet_versatile(trace, packet, 0);
+                if (event.size == -1) {
+                        read_err = trace_get_err(trace);
+                        if (read_err.err_num == EAGAIN) {
+                                /* No data available - do an IOWAIT */
+                                event.type = TRACE_EVENT_IOWAIT;
+                        }
+                        else {
+                                event.type = TRACE_EVENT_PACKET;
+                                break;
+                        }
+                } else if (event.size == 0) {
+                        /* RT gives us a specific indicator that there will be 
+                         * no more packets. */
+                        if (packet->type == TRACE_RT_END_DATA)
+                                event.type = TRACE_EVENT_TERMINATE;
+                        else
+                                /* Since several RT messages can have zero-byte
+                                 * length (once the framing is removed), an 
+                                 * event size of zero can still indicate a 
+                                 * PACKET event */
+                                event.type = TRACE_EVENT_PACKET;
+
+                }       
                 else {
                         event.type = TRACE_EVENT_PACKET;
                 }
-        } else if (event.size == 0) {
-                /* RT gives us a specific indicator that there will be no
-                 * more packets. */
-                if (packet->type == TRACE_RT_END_DATA)
-                        event.type = TRACE_EVENT_TERMINATE;
-                else
-                        /* Since several RT messages can have zero-byte
-                         * length (once the framing is removed), an event size
-                         * of zero can still indicate a PACKET event */
-                        event.type = TRACE_EVENT_PACKET;
-                
-        }       
-        else {
-                event.type = TRACE_EVENT_PACKET;
-        }
-
-        
+
+                if (trace->filter && event.type == TRACE_EVENT_PACKET) {
+                        if (!trace_apply_filter(trace->filter, packet)) {
+                                trace_clear_cache(packet);
+                                continue;
+                        }
+                }
+
+                break;  
+        } while (1);
+
         return event;
 }