Changeset 0e9b9f8 for lib

Timestamp:

05/23/06 17:13:39 (16 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:

64444f9

Parents:

d8d1ff7

Message:

DAG 2.5 deprecated a few functions so decided to explicitly call the stream functions.

File:

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

lib/format_erf.c

@@ -115 +115 @@
                 unsigned curr;
                 unsigned offset;
+                unsigned int dagstream;
         } dag;
 #endif
@@ -165 +166 @@
                 return -1;
         } 
+
+        DAG.dagstream = 0;
+        
         if (S_ISCHR(buf.st_mode)) {
                 /* DEVICE */
@@ -452 +456 @@
 #ifdef HAVE_DAG
 static int dag_pause_input(libtrace_t *libtrace) {
+#if DAG_VERSION_2_4
         dag_stop(INPUT.fd);
+#else
+        if (dag_stop_stream(INPUT.fd, DAG.dagstream) < 0) {
+                trace_set_err(libtrace, errno, "Could not stop DAG stream");
+                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 */
 }
@@ -458 +473 @@
 static int dag_fin_input(libtrace_t *libtrace) {
         /* dag pause input implicitly called to cleanup before this */
+        
         dag_close(INPUT.fd);
         if (DUCK.dummy_duck)
@@ -642 +658 @@
 
 static int dag_start_input(libtrace_t *libtrace) {
+#if DAG_VERSION_2_4
         if(dag_start(INPUT.fd) < 0) {
                 trace_set_err(libtrace,errno,"Cannot start DAG %s",
@@ -647 +664 @@
                 return -1;
         }
+#else
+        if (dag_attach_stream(INPUT.fd, DAG.dagstream, 0, 0) < 0) {
+                trace_set_err(libtrace, errno, "Cannot attach DAG stream");
+                return -1;
+        }
+        if (dag_start_stream(INPUT.fd, DAG.dagstream) < 0) {
+                trace_set_err(libtrace, errno, "Cannot start DAG stream");
+                return -1;
+        }
+#endif
         /* dags appear to have a bug where if you call dag_start after
          * calling dag_stop, and at least one packet has arrived, bad things