Changeset 4aa4615 for lib

Timestamp:

02/28/06 15:51:37 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

6c248a9

Parents:

9fae46b

Message:

Don't be so verbose about little warnings by default
Fix some bugs in format_erf
Be more verbose about errors

Location:

lib

Files:

• format_erf.c (modified) (1 diff)
• format_wag.c (modified) (1 diff)
• trace.c (modified) (6 diffs)

lib/format_erf.c

@@ -917 +917 @@
         erf_get_framing_length,         /* get_framing_length */
         erf_set_capture_length,         /* set_capture_length */
-        erf_get_fd,                     /* get_fd */
+        NULL,                           /* get_fd */
         trace_event_trace,              /* trace_event */
         erf_help                        /* help */

lib/format_wag.c

@@ -511 +511 @@
         wag_get_framing_length,         /* get_framing_length */
         NULL,                           /* set_capture_length */
-        wag_get_fd,                     /* get_fd */
+        NULL,                           /* get_fd */
         trace_event_trace,              /* trace_event */
         wtf_help                        /* help */

lib/trace.c

@@ -159 +159 @@
         format_list[nformats] = f;
         /* Now, verify things */
+#if 0
         if (format_list[nformats]->init_input) {
 #define REQUIRE(x) \
@@ -179 +180 @@
 "get_erf_timestamp, get_seconds or trace_timeval\n",format_list[nformats]->name);
                 }
+                if (format_list[nformats]->trace_event==trace_event_device) {
+                        REQUIRE(get_fd);
+                }
+                else {
+                        if (format_list[nformats]->get_fd) {
+                                fprintf(stderr,"%s: Unnecessary get_fd\n",
+                                                format_list[nformats]->name);
+                        }
+                }
 #undef REQUIRE
         }
@@ -194 +204 @@
                 REQUIRE(get_framing_length);
                 REQUIRE(trace_event);
+                REQUIRE(get_seconds);
+                REQUIRE(get_timeval);
+                REQUIRE(get_erf_timestamp);
 #undef REQUIRE
         }
@@ -216 +229 @@
 #undef REQUIRE
         }
+#endif
         nformats++;
 }
@@ -285 +299 @@
         /* parse the URI to determine what sort of event we are dealing with */
         if ((uridata = trace_parse_uri(uri, &scan)) == 0) {
-                trace_set_err(libtrace,TRACE_ERR_BAD_FORMAT,"Bad uri format");
+                trace_set_err(libtrace,TRACE_ERR_BAD_FORMAT,"Bad uri format (%s)",uri);
                 return libtrace;
         }
@@ -406 +420 @@
 
         if ((uridata = trace_parse_uri(uri, &scan)) == 0) {
-                trace_set_err_out(libtrace,TRACE_ERR_BAD_FORMAT,"Bad uri format");
+                trace_set_err_out(libtrace,TRACE_ERR_BAD_FORMAT,"Bad uri format (%s)",uri);
                 return libtrace;
         }