Changeset 92a37b0 for lib

Timestamp:

12/15/06 10:13:09 (15 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:

eb27e8e

Parents:

fab1d42

Message:

DAG 2.5 includes a function for getting the next record so let's use that instead of doing a lot of arithmetic with various offsets.
Fixed bug where trace_event_dag was returning an incorrect event type in certain situations.
We now only call one of dag_detach_stream and dag_stop_stream to prevent memory corruption.

File:

• lib/format_erf.c (modified) (9 diffs)

lib/format_erf.c

@@ -408 +408 @@
                 return -1;
         }
+        /*
         if (dag_detach_stream(INPUT.fd, DAG.dagstream) < 0) {
                 trace_set_err(libtrace, errno, "Could not detach DAG stream");
                 return -1;
         }
+        */
 #endif
         return 0; /* success */
@@ -543 +545 @@
         struct timeval tv;
         dag_record_t *erfptr;
+        char *next_record = NULL;       
 
         if (DUCK.last_pkt - DUCK.last_duck > DUCK.duck_freq && 
@@ -562 +565 @@
         
         packet->type = TRACE_RT_DATA_ERF;
-        
+#ifdef DAG_VERSION_2_4
         if ((numbytes = dag_read(libtrace,0)) < 0) 
                 return numbytes;
@@ -570 +573 @@
         erfptr = (dag_record_t *) ((char *)DAG.buf + 
                         (DAG.bottom + DAG.offset));
+#else
+        next_record = (char *)dag_rx_stream_next_record(INPUT.fd, 0);
+        erfptr = (dag_record_t *)next_record;
+#endif
         size = ntohs(erfptr->rlen);
-
         assert( size >= dag_record_size );
         assert( size < LIBTRACE_PACKET_BUFSIZE);
@@ -587 +593 @@
         }
 
+#ifdef DAG_VERSION_2_4
         DAG.offset += size;
         DAG.diff -= size;
-
+#endif
         tv = trace_get_timeval(packet);
         DUCK.last_pkt = tv.tv_sec;
@@ -595 +602 @@
         return packet->payload ? size : erf_get_framing_length(packet);
 }
-
+        
 static int dag_start_input(libtrace_t *libtrace) {
 #ifdef DAG_VERSION_2_4
@@ -617 +624 @@
          * happen.  flush the memory hole 
          */
-        while(dag_read(libtrace,1)!=0)
+        while(dag_read(libtrace,DAGF_NONBLOCK)!=0)
                 DAG.diff=0;
         return 0;
@@ -900 +907 @@
         if (data > 0) {
                 event.size = dag_read_packet(trace,packet);
+                DATA(trace)->dag.diff -= event.size;
                 if (trace->filter) {
                         if (trace_apply_filter(trace->filter, packet)) {
@@ -908 +916 @@
                                 return event;
                         }
-                }       
+                } else {
+                        event.type = TRACE_EVENT_PACKET;
+                }
                 if (trace->snaplen > 0) {
                         trace_set_capture_length(packet, trace->snaplen);