Changeset faf16af for tools/tracemerge


Ignore:
Timestamp:
07/07/14 14:25:36 (7 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:
262a093, ce7153d, ea602cd
Parents:
1ca603b (diff), 17f954f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'develop'

Location:
tools/tracemerge
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tools/tracemerge/tracemerge.1

    rd6dc0f6 r17f954f  
    5353.BI \-\^\-compress-type method
    5454Describes the compression algorithm to be used when writing the output trace.
    55 Possible methods are "gzip", "bzip2", "lzo" and "none". Defaults to "none".
     55Possible methods are "gzip", "bzip2", "lzo", "xz" and "none". Defaults to
     56"none".
    5657
    5758
  • tools/tracemerge/tracemerge.c

    rc0ccccd r17f954f  
    120120        } else if (strncmp(compress_type_str, "lzo", 3) == 0) {
    121121                compress_type = TRACE_OPTION_COMPRESSTYPE_LZO;
     122        } else if (strncmp(compress_type_str, "xz", 2) == 0) {
     123                compress_type = TRACE_OPTION_COMPRESSTYPE_LZMA;
    122124        } else if (strncmp(compress_type_str, "no", 2) == 0) {
    123125                compress_type = TRACE_OPTION_COMPRESSTYPE_NONE;
Note: See TracChangeset for help on using the changeset viewer.