Changeset a79eb196

Timestamp:

10/25/04 21:29:18 (16 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:

7e55902

Parents:

24b42dd

Message:

testing DAG case

File:

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

lib/trace.c

@@ -399 +399 @@
                                 case DAG:
                                         if((libtrace->input.fd = dag_open(libtrace->conn_info.path)) < 0) {
-                                                fprintf(stderr,"Cannot open DAG %s: %m", libtrace->conn_info.path,errno);
+                                                fprintf(stderr,"Cannot open DAG %s: %m\n", libtrace->conn_info.path,errno);
                                                 exit(0);
                                         }
                                         if((libtrace->buf = dag_mmap(libtrace->input.fd)) == MAP_FAILED) {
-                                                fprintf(stderr,"Cannot mmap DAG %s: %m", libtrace->conn_info.path,errno);
+                                                fprintf(stderr,"Cannot mmap DAG %s: %m\n", libtrace->conn_info.path,errno);
                                                 exit(0);
                                         }
                                         if(dag_start(libtrace->input.fd) < 0) {
-                                                fprintf(stderr,"Cannot start DAG %s: %m", libtrace->conn_info.path,errno);
+                                                fprintf(stderr,"Cannot start DAG %s: %m\n", libtrace->conn_info.path,errno);
                                                 exit(0);
                                         }
@@ -432 +432 @@
         } else if (libtrace->sourcetype == SOCKET || libtrace->sourcetype == RT) {
                 close(libtrace->input.fd);
+        } else if (libtrace->format == DAG) {
+                dag_stop(libtrace->input.fd);
+                
         } else {
                 gzclose(libtrace->input.file);
@@ -481 +484 @@
                                                 
                                                 recptr = (dag_record_t *) ((void *)libtrace->buf + (bottom + curr));
+
+                                                memcpy(buffer,libtrace->buf + (bottom + curr),diff);
                                                 
-                                                buffer=libtrace->buf + (bottom + curr);
+                                                //buffer=libtrace->buf + (bottom + curr);
 
                                                 numbytes=diff;