Changeset a114d8b5

Timestamp:

08/08/05 15:18:27 (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:

8184acc

Parents:

f99a183

Message:

trace_perror created

Location:

lib

Files:

• libtrace.h (modified) (2 diffs)
• trace.c (modified) (14 diffs)

lib/libtrace.h

@@ -75 +75 @@
 #define COLLECTOR_PORT 3435
 
+        
 /** Opaque structure holding information about an output trace */
 struct libtrace_out_t;
@@ -194 +195 @@
 void trace_help();
 
+void trace_perror();
 
 /** Create a trace file from a URI

lib/trace.c

@@ -157 +157 @@
 #endif
 
+// Error codes
+enum {E_NOERROR, E_BAD_FORMAT, E_NO_INIT, E_NO_INIT_OUT, E_URI_LONG, E_URI_NOCOLON };
+
+static struct {
+        int err_num;    // error code
+        char *problem;  // the format, uri etc that caused the error for reporting purposes
+} trace_err;
+
 struct libtrace_format_t **format_list = 0;
 int format_size = 0;
@@ -190 +198 @@
 }
 
+void trace_perror(char *caller) {
+        switch (trace_err.err_num) {
+                case E_BAD_FORMAT:
+                        fprintf(stderr, "%s: No support for format (%s)\n", caller, trace_err.problem);
+                        break;
+                case E_NO_INIT:
+                        fprintf(stderr, "%s: Format (%s) does not have an init_trace function defined\n", caller, trace_err.problem);
+                        break;
+                case E_NO_INIT_OUT:
+                        fprintf(stderr, "%s: Format (%s) does not have an init_output function defined\n", caller, trace_err.problem);
+                        break;
+                case E_URI_LONG:
+                        fprintf(stderr, "%s: uri is too long\n", caller);
+                        break;
+                case E_URI_NOCOLON:
+                        fprintf(stderr, "%s: A uri must contain at least one colon e.g. format:destination\n", caller);
+                        break;
+                default:
+                        
+        }
+        trace_err.err_num = E_NOERROR;
+}
 
 #define RP_BUFSIZE 65536
 #define URI_PROTO_LINE 16
+
 
 
@@ -228 +259 @@
         int i = 0;
         struct stat buf;
+        
+        trace_err.err_num = E_NOERROR;
         
+        
         // parse the URI to determine what sort of event we are dealing with
        
@@ -235 +269 @@
         if((uridata = strchr(uri,':')) == NULL) {
                 // badly formed URI - needs a :
+                trace_err.err_num = E_URI_NOCOLON;
                 return 0;
         }
@@ -240 +275 @@
         if ((*uridata - *uri) > URI_PROTO_LINE) {
                 // badly formed URI - uri type is too long
+                trace_err.err_num = E_URI_LONG;
                 return 0;
         }
@@ -258 +294 @@
         }
         if (libtrace->format == 0) {
-                fprintf(stderr,
-                        "libtrace has no support for this format (%s)\n",scan);
+                trace_err.err_num = E_BAD_FORMAT;
+                trace_err.problem = scan;
                 return 0;
         }
@@ -273 +309 @@
                 libtrace->format->init_input( libtrace);
         } else {
-                fprintf(stderr,
-                        "No init function for format %s\n",scan);
+                trace_err.err_num = E_NO_INIT;
+                trace_err.problem = scan;
                 return 0;
         }
@@ -299 +335 @@
         int i;
 
+        trace_err.err_num = E_NOERROR;
         // parse the URI to determine what sort of event we are dealing with
 
@@ -305 +342 @@
         if((uridata = strchr(uri,':')) == NULL) {
                 // badly formed URI - needs a :
+                trace_err.err_num = E_URI_NOCOLON;
                 return 0;
         }
@@ -310 +348 @@
         if ((*uridata - *uri) > URI_PROTO_LINE) {
                 // badly formed URI - uri type is too long
+                trace_err.err_num = E_URI_LONG;
                 return 0;
         }
@@ -326 +365 @@
         }
         if (libtrace->format == 0) {
-                fprintf(stderr,
-                        "libtrace has no support for this format (%s)\n",scan);
+                trace_err.err_num = E_BAD_FORMAT;
+                trace_err.problem = scan;       
                 return 0;
         }
@@ -342 +381 @@
                 libtrace->format->init_output( libtrace);
         } else {
-                fprintf(stderr,
-                        "No init_output function for format %s\n",scan);
+                trace_err.err_num = E_NO_INIT_OUT;
+                trace_err.problem = scan;
                 return 0;
         }
@@ -389 +428 @@
         libtrace->format->fin_input(libtrace);
         // need to free things!
-        destroy_fifo(libtrace->fifo);
+        free(libtrace->uridata);
+        destroy_fifo(libtrace->fifo);
         free(libtrace);
 }
@@ -402 +442 @@
         assert(libtrace);
         libtrace->format->fin_output(libtrace);
+        free(libtrace->uridata);
         destroy_fifo(libtrace->fifo);
         free(libtrace);