[collectd-changes] collectd, the system statistics collection daemon: Changes to 'collectd-5.4'

[Florian Forster]

 src/cgroups.c     |   19 ++++++++++++-------
 src/utils_mount.c |    3 ---
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 9875cce31c8aee20cae090d319f9885334bcf237
Merge: 57bd4c5 c94e448
Author: Florian Forster <octo at collectd.org>
Date:   Wed Aug 28 15:22:37 2013 +0200

    Merge remote-tracking branch 'github/pr/413' into collectd-5.4

commit 57bd4c578e337319d4a190311bb08ef98d0d7358
Author: Florian Forster <octo at collectd.org>
Date:   Wed Aug 28 15:19:48 2013 +0200

    cgroups plugin: Use cu_mount_checkoption().
    
    cu_mount_checkoption() behaves a bit like strstr() in that it returns a pointer
    into the buffer. cu_mount_getoptionvalue() allocated memory that was never
    freed, slowly leaking memory (although very little).
    
    Github: #412

commit 3dcfbf12d5ec0b62bc540ac59944ddf50c37c1f2
Author: Florian Forster <octo at collectd.org>
Date:   Wed Aug 28 15:18:11 2013 +0200

    src/utils_mount.c: Fix wrong behavior in cu_mount_getoptionvalue().
    
    Github: #412

commit c94e448d41d1852c2dd6ca4dc402ca6e225b5f37
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Aug 21 16:54:10 2013 +0200

    correct typo

commit 4b4eee900b167cfdf17528e70c9c0659eb0329b0
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Aug 21 16:22:32 2013 +0200

    cgroups: don't fail parsing when colon not found
    
    The format of cpuacct.stat seems to not always have a colon as separator.
    
    It appears to *not* have the colon at least on debian's kernel 3.2.41 and
    3.2.35, as well as on RHEL6 with 2.6.32. All of them have decent support for
    cgroups/lxc, and the cgroups plugin fails to work with them without this patch.
    
    Also, looking at other implementations shows that they *don't* expect a colon:
    https://bitbucket.org/dotcloud/liblxcstats/src/2558b4fbbf589c609895b0badbfc7d413466d716/probes/cpuacct.c?at=default#cl-71
    https://github.com/BrightcoveOS/Diamond/blob/master/src/collectors/cpuacct_cgroup/cpuacct_cgroup.py#L55