Changeset d8642f4 for lib/trace.c

Timestamp:

11/11/04 17:02:04 (18 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:

35902e3

Parents:

3ee7864

Message:

better compile time checks for DAG code - remove DAG path if not needed

File:

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

lib/trace.c

@@ -176 +176 @@
         } else if (!strncasecmp(scan,"pcap",4)) {
                 (*libtrace)->format=PCAP;
-        } else if (!strncasecmp(scan,"dag",3)) {
+#ifdef DAGDEVICE
+        } else if (!strncasecmp(scan,"dag",3)) {
                 (*libtrace)->format=DAG;
+#else 
+        } else if (!strncasecmp(scan,"dag",3)) {
+                fprintf(stderr,"This version of libtrace has been compiled without DAG support\n");
+                return 0;
+#endif
         } else if (!strncasecmp(scan,"rtclient",7)) {
                 (*libtrace)->format=RTCLIENT;
@@ -235 +241 @@
                         break;
                 case DAG:
+#ifdef DAGDEVICE
                         /* 
                          * Can have uridata of the following format:
@@ -250 +257 @@
                         }
                         (*libtrace)->conn_info.path = strdup(uridata);
-
+#endif
                         break;
 
@@ -484 +491 @@
                         case DEVICE:
                                 switch(libtrace->format) {
+#ifdef DAGDEVICE
                                         case DAG:
 
@@ -498 +506 @@
                                                 
                                                 break;
+#endif
                                         default:
                                                 if ((numbytes=read(libtrace->input.fd, 
@@ -595 +604 @@
         }
 
+#ifdef DAGDEVICE
         if (libtrace->format == DAG) {
                 if (libtrace->dag.diff == 0) {
@@ -620 +630 @@
                 //assert(libtrace->dag.offset <= libtrace->dag.top);
                 return (size);
-                        
-        }
+                
+        }
+#endif
         do {
                 if (fifo_out_available(libtrace->fifo) == 0 || read_required) {