Changeset 4ba74cc

Timestamp:

10/28/08 12:51:53 (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:

37f2a9b

Parents:

530cef6

Message:

Add the ability to specify compression levels

File:

• tools/tracemerge/tracemerge.c (modified) (5 diffs)

tools/tracemerge/tracemerge.c

@@ -12 +12 @@
         "%s flags outputuri traceuri [traceuri...]\n"
         "-i [interfaces_per_input] --set-interface [interfaces_per_input]\n"
-        "                       Each trace is allocated an interface. Default leaves this flag as read from the original traces, if appropriate\n"
+        "                       Each trace is allocated an interface. Default leaves this flag as\n"
+        "                       read from the original traces, if appropriate\n"
         "-u --unique-packets    Discard duplicate packets\n"
+        "-z [level] --compression [level]\n"
+        "                       Compression level\n"
         "-H --libtrace-help     Print libtrace runtime documentation\n"
         ,argv0);
@@ -38 +41 @@
         uint64_t last_ts=0;
         struct sigaction sigact;
+        int compression=6;
 
         while (1) {
@@ -45 +49 @@
                         { "unique-packets",     0, 0, 'u' },
                         { "libtrace-help",      0, 0, 'H' },
+                        { "compression",        2, 0, 'z' },
                         { NULL,                 0, 0, 0   },
                 };
 
-                int c=getopt_long(argc, argv, "i::uH",
+                int c=getopt_long(argc, argv, "i::uHz::",
                                 long_options, &option_index);
 
@@ -66 +71 @@
                                   exit(1);
                                   break;
+                        case 'z':
+                                if (optarg)
+                                        compression = atoi(optarg);
+                                else
+                                        compression = 6;
+                                if (compression<0 || compression>9) {
+                                        fprintf(stderr,"Compression level must be between 0 and 9\n");
+                                        usage(argv[0]);
+                                }
+                                break;
                         default:
                                 fprintf(stderr,"unknown option: %c\n",c);
@@ -82 +97 @@
                 return 1;
         }
+
+        if (trace_config_output(output, TRACE_OPTION_OUTPUT_COMPRESS, &compression) == -1) {
+                trace_perror_output(output,"Unable to set compression level");
+        }
+
         if (trace_start_output(output)==-1) {
                 trace_perror_output(output,"trace_start_output");