Changeset 59c31da for lib/trace.c

Timestamp:

10/26/04 07:57:30 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

a22c979

Parents:

7e55902

Message:

fixes in trace.c for DAG support.
New dagapi / dagopts.c. Still need to find way to build these outside the source

File:

• lib/trace.c (modified) (5 diffs)

lib/trace.c

@@ -139 +139 @@
         double start_ts;
 };
+
+#define RP_BUFSIZE 65536
 
 #define URI_PROTO_LINE 16
@@ -446 +448 @@
 static int trace_read(struct libtrace_t *libtrace, void *buffer, size_t len) {
         int numbytes;
-        static unsigned bottom = 0, top, diff, curr, scan;
+        static unsigned bottom = 0, top, diff, curr = 0, scan;
         static short lctr = 0;
         struct dag_record_t *recptr = 0;
@@ -477 +479 @@
                                 switch(libtrace->format) {
                                         case DAG:
+                                                
                                                 top = dag_offset(libtrace->input.fd,
                                                                 &bottom,
                                                                 0);
                                                 diff = top - bottom;
-                                                errno = 0;
-                                                curr = 0;
                                                 
-                                                recptr = (dag_record_t *) ((void *)libtrace->buf + (bottom + curr));
-
-                                                memcpy(buffer,libtrace->buf + (bottom + curr),diff);
+                                                //recptr = (dag_record_t *) ((void *)libtrace->buf + (bottom + curr));
+                                                //rlen = ntohs(recptr->rlen);
+
+                                                
+                                                memcpy(buffer,(void *)(libtrace->buf + (bottom + curr)),diff);
                                                 
                                                 //buffer=libtrace->buf + (bottom + curr);
 
                                                 numbytes=diff;
-                                                
+                                                bottom=top;
                                                 
                                                 break;
@@ -524 +527 @@
  *
  */
-#define RP_BUFSIZE 65536
 int trace_read_packet(struct libtrace_t *libtrace, struct libtrace_packet_t *packet) {
         int numbytes;
@@ -593 +595 @@
                                 return numbytes; 
                         }
+                        assert(libtrace->fifo);
                         fifo_write(libtrace->fifo,buf,numbytes);