Changeset 34d1d98 for tools/tracesplit/tracesplit.c

Timestamp:

05/05/08 10:13:17 (14 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:

89404f5

Parents:

0bfd4a0

Message:

• Create a .gz extension only if we're compressing files
• Add extensions if we build up the uri ourselves

File:

• tools/tracesplit/tracesplit.c (modified) (9 diffs)

tools/tracesplit/tracesplit.c

@@ -40 +40 @@
         "-S --snaplen           Snap packets at the specified length\n"
         "-v --verbose           Output statistics\n"
+        "-z --compress          Set compression level\n"
         ,argv0);
         exit(1);
@@ -72 +73 @@
         uint16_t snaplen = 0;
         int verbose=0;
+        int compress_level=-1;
         
         if (argc<2) {
@@ -92 +94 @@
                         { "snaplen",       1, 0, 'S' },
                         { "verbose",       0, 0, 'v' },
+                        { "compress",      1, 0, 'z' },
                         { NULL,            0, 0, 0   },
                 };
 
-                int c=getopt_long(argc, argv, "f:c:b:s:e:i:m:S:Hv",
+                int c=getopt_long(argc, argv, "f:c:b:s:e:i:m:S:Hvz:",
                                 long_options, &option_index);
 
@@ -124 +127 @@
                         case 'v':
                                   verbose++;
+                                  break;
+                        case 'z':
+                                  compress_level=atoi(optarg);
+                                  if (compress_level<0 || compress_level>9) {
+                                        usage(argv[0]);
+                                        exit(1);
+                                  }
                                   break;
                         default:
@@ -204 +214 @@
                 if (!output) {
                         char *buffer;
+                        bool need_ext=false;
                         if (maxfiles <= filescreated) {
                                 break;
@@ -211 +222 @@
                                 buffer=strdupcat(buffer,"-");
                                 buffer=strdupcati(buffer,(uint64_t)firsttime);
+                                need_ext=true;
                         }
                         if (count!=UINT64_MAX && maxfiles>1) {
                                 buffer=strdupcat(buffer,"-");
                                 buffer=strdupcati(buffer,(uint64_t)pktcount);
+                                need_ext=true;
                         }
                         if (bytes!=UINT64_MAX && maxfiles>1) {
@@ -220 +233 @@
                                 buffer=strdupcat(buffer,"-");
                                 buffer=strdupcati(buffer,(uint64_t)++filenum);
+                                need_ext=true;
+                        }
+                        if (need_ext) {
+                                if (compress_level!=0)
+                                        buffer=strdupcat(buffer,".gz");
                         }
                         output=trace_create_output(buffer);
@@ -227 +245 @@
                                 break;
                         }
+                        if (compress_level!=-1) {
+                                if (trace_config_output(output,
+                                        TRACE_OPTION_OUTPUT_COMPRESS,
+                                        &compress_level)==-1) {
+                                        trace_perror_output(output,"Unable to set compression");
+                                }
+                        }
                         trace_start_output(output);
                         if (trace_is_err_output(output)) {
@@ -232 +257 @@
                                 free(buffer);
                                 break;
+                        }
+                        if (verbose) {
+                                fprintf(stderr,"%s\n",buffer);
                         }
                         free(buffer);