Changeset f99a183

Timestamp:

08/05/05 14:41:47 (15 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:

a114d8b5

Parents:

df2dff9

Message:

Minor fixes - removed init_output and added some doc to libtrace.h

Location:

lib

Files:

• libtrace.h (modified) (1 diff)
• trace.c (modified) (1 diff)

lib/libtrace.h

@@ -237 +237 @@
 struct libtrace_out_t *trace_output_create(char *uri);
 
+/** Configures a trace output file as specified by an option string in getopt() format 
+ *
+ * @param libtrace      the output trace file to be configured
+ * @param options       the string containing the configuration options
+ * @returns -1 if configuration fails, 0 if successful
+ */
 int trace_output_config(struct libtrace_out_t *libtrace, char *options);
 

lib/trace.c

@@ -194 +194 @@
 #define URI_PROTO_LINE 16
 
-/** Initialises the data contained within the libtrace_out_t structure, based on the provided uri.
- *
- * @param libtrace      the libtrace_out_t structure to initialise
- * @param uri           the uri defining the output type and destination
- * @returns             1 if initialised successfully, 0 otherwise
- *
- * @author Shane Alcock
- * */
-static int init_output(struct libtrace_out_t **libtrace, char *uri) {
-        char *scan = calloc(sizeof(char),URI_PROTO_LINE);
-        char *uridata = 0;
-        int i;
-        
-        // parse the URI to determine what sort of event we are dealing with
-
-        // want snippet before the : to get the uri base type.
-        
-        if((uridata = strchr(uri,':')) == NULL) {
-                // badly formed URI - needs a :
-                return 0;
-        }
-
-        if ((*uridata - *uri) > URI_PROTO_LINE) {
-                // badly formed URI - uri type is too long
-                return 0;
-        }
-        
-        strncpy(scan,uri, (uridata - uri));
-        
-        (*libtrace)->format = 0;
-        for (i = 0; i < nformats; i++) {
-                if (strlen(scan) == strlen(format_list[i]->name) &&
-                                !strncasecmp(scan,
-                                        format_list[i]->name,
-                                        strlen(scan))) {
-                                (*libtrace)->format=format_list[i];
-                                break;
-                                }
-        }
-        if ((*libtrace)->format == 0) {
-                fprintf(stderr,
-                        "libtrace has no support for this format (%s)\n",scan);
-                return 0;
-        }
-        
-        // push uridata past the delimiter
-        uridata++;
-        (*libtrace)->uridata = strdup(uridata);
-        
-        
-        // libtrace->format now contains the type of uri
-        // libtrace->uridata contains the appropriate data for this
-
-        if ((*libtrace)->format->init_output) {
-                (*libtrace)->format->init_output( (*libtrace));
-        } else {
-                fprintf(stderr,
-                        "No init_output function for format %s\n",scan);
-                return 0;
-        }
-
-        
-        (*libtrace)->fifo = create_fifo(1048576);
-        assert( (*libtrace)->fifo);
-        return 1;
-} 
 
 /** Create a trace file from a URI