Changeset ba91618 for tools/tracemerge

Timestamp:

04/23/10 11:34:08 (11 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:

83a1f4e

Parents:

db9fa93

Message:

• Updated manpages for traceanon and tracemerge to reflect new -Z option.
• Attempted to add some consistency in the naming of long options for -z and -Z across tools

Location:

tools/tracemerge

Files:

• tracemerge.1 (modified) (2 diffs)
• tracemerge.c (modified) (2 diffs)

tools/tracemerge/tracemerge.1

@@ -5 +5 @@
 .B tracemerge 
 [ \-i [ interfaces_per_input ] | \-\^\-set-interface [ interfaces_per_input ] ]
-[ \-u | \-\^\-unique-packets ]
+[ \-u | \-\^\-unique-packets ] [ \-z | \-\^\-compress-level <level> ] 
+[ \-Z | \-\^\-compress-type <method> ]
 outputuri inputuri...
 .SH DESCRPTION
@@ -37 +38 @@
 .TP
 .PD 0
-.BI \-z [ compression_level ]
+.BI \-z level
 .TP
 .PD
-.BI \-\^\-compression [ compression_level ]
-Sets the amount of compression performed on the output file.  Currently libtrace will always write
-out compressed files, even when -z0 is given.
+.BI \-\^\-compress-level level
+Sets the amount of compression performed on the output file. This value can
+range from 0 (no compression) to 9 (maximum compression). Higher compression
+levels require more CPU to compress data. Defaults to 0.
+
+.TP
+.PD 0
+.BI \-Z method 
+.TP
+.PD
+.BI \-\^\-compress-type method 
+Describes the compression algorithm to be used when writing the output trace.
+Possible methods are "gzip", "bzip2", "lzo" and "none". Defaults to "none".
+
 
 .SH LINKS

tools/tracemerge/tracemerge.c

@@ -16 +16 @@
         "                       read from the original traces, if appropriate\n"
         "-u --unique-packets    Discard duplicate packets\n"
-        "-z level --compression level\n"
+        "-z level --compress-level level\n"
         "                       Compression level\n"
-        "-Z method --compression-type method\n"
+        "-Z method --compress-type method\n"
         "                       Compression method\n"
         "-H --libtrace-help     Print libtrace runtime documentation\n"
@@ -54 +54 @@
                         { "unique-packets",     0, 0, 'u' },
                         { "libtrace-help",      0, 0, 'H' },
-                        { "compression",        1, 0, 'z' },
-                        { "compression-type",   1, 0, 'Z' },
+                        { "compress-level",     1, 0, 'z' },
+                        { "compress-type",      1, 0, 'Z' },
                         { NULL,                 0, 0, 0   },
                 };