[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta2-151-g7450f32

[noreply at openinfosecfoundation.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".

The branch, master has been updated
       via  7450f32351ab408878b022189736544bcdd613d8 (commit)
       via  84696ebe2a67339f654c21a0e8564b03590aef14 (commit)
       via  fe1c4951f9ee3c9857143a33731792ff2ba1d643 (commit)
       via  b5f8f386a37f61ae0c1c874b82f978f34394fb91 (commit)
      from  b27d03e2f91864f7677fc5b29d28901b0410e699 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7450f32351ab408878b022189736544bcdd613d8
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 28 23:00:28 2014 +0100

    stream: add performance output for stream pools
    
    Add info messages at shutdown that give an indication of pool use
    for the various segment and chunk pools.

commit 84696ebe2a67339f654c21a0e8564b03590aef14
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 28 17:13:05 2014 +0100

    stream: configurable stream chunk prealloc
    
    The stream chunk pool contains preallocating stream chunks (StreamMsg).
    These are used for raw reassembly, used in raw content inspection by
    the detection engine. The default setting so far has been 250, which
    was hardcoded. This meant that in setups that needed more, allocs and
    frees would be happen constantly.
    
    This patch introduces a yaml option to set the 'prealloc' value in the
    pool. The default is still 250.
    
    stream.reassembly.chunk-prealloc
    
    Related to feature #1093.

commit fe1c4951f9ee3c9857143a33731792ff2ba1d643
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 28 17:12:38 2014 +0100

    stream: silence stream.reassembly.raw message

commit b5f8f386a37f61ae0c1c874b82f978f34394fb91
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 28 13:48:26 2014 +0100

    stream: configurable segment pools
    
    The stream reassembly engine uses a set of pools in which preallocated
    segments are stored. There are various pools each with different packet
    sizes. The goal is to lower memory presure. Until now, these pools were
    hardcoded.
    
    This patch introduces the ability to configure them fully from the yaml.
    There can be at max 256 of these pools.
    
    Yaml layout is as follows:
    
    stream:
      reassemble:
        segments:
          - size: 2048
            prealloc: 3000
          - size: 4
            prealloc: 1000
          - size: 1024
            prealloc: 2000
    
    The size is the packet size. The prealloc value indicates how many
    segments are set up at startup.
    
    The pools have no limit wrt how many segments can be used of a certain
    size. If the engine needs more than the prealloc size, segments are
    malloc'd and free'd. The only limit here is the stream.reassemble.memcap.
    
    If the yaml part if omitted, the default values are the same as before.
    
    Feature #1093

-----------------------------------------------------------------------

Summary of changes:
 src/stream-tcp-reassemble.c |  234 ++++++++++++++++++++++++++++++++++++-------
 src/stream-tcp.c            |    3 +-
 src/stream.c                |   13 ++-
 src/stream.h                |    2 +-
 4 files changed, 211 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
OISF