Changeset 17c5749 for tools/traceanon


Ignore:
Timestamp:
07/22/14 12:57:50 (7 years ago)
Author:
Richard Sanger <rsangerarj@…>
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:
41148f2
Parents:
54834a1 (diff), a6c77b0 (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 remote-tracking branch 'upsteam/develop' into FixingDPDK

Conflicts:

README
lib/format_linux.c
test/Makefile

Location:
tools/traceanon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tools/traceanon/traceanon.1

    rd6dc0f6 r17f954f  
    8686.BI \-\^\-compress-type=method
    8787compress the output trace using the compression algorithm "method". Possible
    88 algorithms are "gzip", "bzip2", "lzo" and "none". Default is "none".
     88algorithms are "gzip", "bzip2", "lzo", "xz" and "none". Default is "none".
    8989
    9090.SH EXAMPLES
  • tools/traceanon/traceanon.c

    rf5b5cca r17f954f  
    219219        } else if (strncmp(compress_type_str, "lzo", 3) == 0) {
    220220                compress_type = TRACE_OPTION_COMPRESSTYPE_LZO;
     221        } else if (strncmp(compress_type_str, "xz", 2) == 0) {
     222                compress_type = TRACE_OPTION_COMPRESSTYPE_LZMA;
    221223        } else if (strncmp(compress_type_str, "no", 2) == 0) {
    222224                compress_type = TRACE_OPTION_COMPRESSTYPE_NONE;
Note: See TracChangeset for help on using the changeset viewer.