Changeset 91ebc50 for lib/format_erf.c

Timestamp:

08/03/05 14:24:59 (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:

283acce

Parents:

1f2220f

Message:

config option support added + zlib compression level

File:

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

lib/format_erf.c

@@ -32 +32 @@
 #include "format.h"
 #include "rtserver.h"
+#include "parse_cmd.h"
 
 #ifdef HAVE_INTTYPES_H
@@ -54 +55 @@
 #include <netdb.h>
 #include <fcntl.h>
+#include <getopt.h>
 
 /* Catch undefined O_LARGEFILE on *BSD etc */
@@ -199 +201 @@
 
 static int erf_init_output(struct libtrace_out_t *libtrace) {
-        struct stat buf;
-
-        if (!strncmp(libtrace->conn_info.path,"-",1)) {
+        char *filemode = 0;
+
+        libtrace->options.erf.level = 1;
+        asprintf(&filemode,"wb%d",libtrace->options.erf.level);
+
+        if (!strncmp(libtrace->uridata,"-",1)) {
                 // STDOUT
 #if HAVE_ZLIB
-                libtrace->output.file = gzdopen(dup(1), "w");
+                libtrace->output.file = gzdopen(dup(1), filemode);
 #else
                 libtrace->output.file = stdout;
@@ -216 +221 @@
                 // we lose any error checking on "open"
                 libtrace->output.file =  gzdopen(open(
-                                        libtrace->conn_info.path,
+                                        libtrace->uridata,
+                                        O_CREAT | O_LARGEFILE | O_WRONLY, 
+                                        S_IRUSR | S_IWUSR), filemode);
+#else
+                libtrace->output.file =  fdopen(open(
+                                        libtrace->uridata,
                                         O_CREAT | O_LARGEFILE | O_WRONLY, 
                                         S_IRUSR | S_IWUSR), "w");
-#else
-                libtrace->output.file =  fdopen(open(
-                                        libtrace->conn_info.path,
-                                        O_CREAT | O_LARGEFILE | O_WRONLY, 
-                                        S_IRUSR | S_IWUSR), "w");
-#endif
-        }
+#endif
+        }
+        
 
 }
 
 static int rtclient_init_output(struct libtrace_out_t *libtrace) {
-        char * uridata = libtrace->conn_info.path;
+        char * uridata = libtrace->uridata;
         char * scan;
         // extract conn_info from uridata
@@ -258 +264 @@
                 return 0;
         
+}
+
+static int erf_config_output(struct libtrace_out_t *libtrace, int argc, char *argv[]) {
+        int opt;
+        int level = libtrace->options.erf.level;
+        optind = 1;
+
+        while ((opt = getopt(argc, argv, "z:")) != EOF) {
+                switch (opt) {
+                        case 'z':
+                                level = atoi(optarg);
+                                break;
+                        default:
+                                printf("Bad argument to erf: %s\n", opt);
+                                // maybe spit out some help here
+                                return -1;
+                }
+        }
+        if (level != libtrace->options.erf.level) {
+                if (level > 9 || level < 0) {
+                        // retarded level choice
+                        printf("Compression level must be between 0 and 9 inclusive - you selected %i \n", level);
+                        
+                } else {
+                        libtrace->options.erf.level = level;
+                        return gzsetparams(libtrace->output.file, level, Z_DEFAULT_STRATEGY);
+                }
+        }
+        return 0;
+
+}
+
+static int rtclient_config_output(struct libtrace_out_t *libtrace, int argc, char *argv[]) {
+        return 0;
 }
 
@@ -534 +574 @@
 
                 fifo_out_update(libtrace->fifo, size);
-                // Need an ack to come back
-                // TODO: Obviously this is a little unfinished
-                if ("ACK_ARRIVES") {
-                        fifo_ack_update(libtrace->fifo, size);
-                        return numbytes;
-                } else {
-                        fifo_out_reset(libtrace->fifo);
-                }
+                fifo_ack_update(libtrace->fifo, size);
         } while(1);
 }
@@ -618 +651 @@
         erf_init_input,                 /* init_input */        
         erf_init_output,                /* init_output */
+        erf_config_output,              /* config_output */
         erf_fin_input,                  /* fin_input */
         erf_fin_output,                 /* fin_output */
@@ -640 +674 @@
         dag_init_input,                 /* init_input */        
         NULL,                           /* init_output */
+        NULL,                           /* config_output */
         dag_fin_input,                  /* fin_input */
         NULL,                           /* fin_output */
@@ -662 +697 @@
         rtclient_init_input,            /* init_input */        
         rtclient_init_output,           /* init_output */
+        rtclient_config_output,         /* config_output */
         rtclient_fin_input,             /* fin_input */
         rtclient_fin_output,            /* fin_output */