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

[Florian Forster]

 README                |    2 +-
 src/collectd.conf.in  |   47 +++++++++++++++++++++--------------------------
 src/owniptc/libiptc.c |    4 ++++
 src/plugin.c          |    5 +++++
 src/processes.c       |    5 ++++-
 src/types.db          |    8 ++++++--
 src/unixsock.c        |   34 ++++++++++++++++++++++++----------
 7 files changed, 65 insertions(+), 40 deletions(-)

New commits:
commit 7936f094388707ee066b2e9f3fc75659e1715181
Merge: e28686b873599cc18c5e0985cf41589a9aa2b4c6 6c134837a38a566a6ad78225ef5e5c3cc9b7d832
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Oct 1 21:34:21 2009 +0200

    Merge branch 'collectd-4.8'
    
    Conflicts:
    	src/types.db

commit 6c134837a38a566a6ad78225ef5e5c3cc9b7d832
Merge: d828ed0a50f5a094f9ea5a699e6b2bfd4acbce16 5b5fff5bbdc5515d7f4c2a01df47373f4ac44847
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Oct 1 21:33:37 2009 +0200

    Merge branch 'collectd-4.7' into collectd-4.8

commit d828ed0a50f5a094f9ea5a699e6b2bfd4acbce16
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Oct 1 21:30:53 2009 +0200

    src/types.db: Replace spaces with tabs.

commit e28686b873599cc18c5e0985cf41589a9aa2b4c6
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Oct 1 21:30:53 2009 +0200

    src/types.db: Replace spaces with tabs.

commit 8d2f2ffd15ac83343aae58c82577b929e2e5f4ab
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Oct 1 21:27:40 2009 +0200

    src/plugin.c: plugin_log: Print to stderr if no log plugin has been loaded.

commit 8d3fe5fb26cb6de1ee58cba572cb38ac93e906b2
Merge: 98b20a22c116c099f199616d690761262347f81a 902f7621661d97dac0c7bc83f39acbf76a3b947b
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Thu Oct 1 13:25:17 2009 +0200

    Merge commit 'octo/master'

commit 98b20a22c116c099f199616d690761262347f81a
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Thu Oct 1 13:24:20 2009 +0200

    Added new netapp data types to types.db.

commit 5b5fff5bbdc5515d7f4c2a01df47373f4ac44847
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Sep 30 22:49:16 2009 +0200

    unixsock plugin: Fix a (well hidden) race condition.
    
    Within the client handling thread, fdopen is called twice on the file
    descriptor passed to the thread. Later those file handles are closed like:
    
      fclose (fhin);
      fclose (fhout);
    
    This is a race condition, because the first call to fclose will close the file
    descriptor. The second call to fclose will try the same. Usually, it would fail
    silently and all is well. On a busy machine, however, another thread may just
    have opened a file or accepted a socket. In that case an arbitrary file
    descriptor is closed. If the file descriptor is opened yet again fast enough,
    data may even end up in a totally wrong location.
    
    As a work-around the file descriptor is not dup'ed so each fdopen operates on
    its own file descriptor. As an alternative the "r+" mode and a single file
    handle may be suitable, too.
    
    Many thanks to Sven Trenkel for pointing me into the right directioin :)

commit fdba679afa5681557916095e393adcbecacbdc61
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 26 10:48:50 2009 +0200

    libiptc: Comment out two unused static functions.
    
    Thanks to Sven Trenkel for noticing.

commit ee2eb978bf084a3610e69576e39c245ac0a880a1
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 19 10:16:41 2009 +0200

    README: Update the URL for libyajl.

commit e75f137bdc3f6a002a8b31d822f7732e191c0f2b
Author: Andrés J. Díaz <ajdiaz at connectical.com>
Date:   Sat Sep 19 08:45:49 2009 +0200

    processes plugin: Fix handling of Linux 2.4.
    
    Hi Florian et al
    
    Thanks for the reply, but we detect a minor bug in the previous patch
    due to kernel 2.4
    
    The correct patch is attached. The bug is related with kernels 2.4,
    where task/ directory do not exists and ps_read_task return -1, which is
    catched and raise an error (breaking the ps_read_process function), so a
    NaN is dispatched istead of values (number of process:1, number of
    threads :1).
    
    Sorry for the inconvenience :(
    
    Regards,
      Andres
    
    Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>

commit 5295a87c87e28797a1bd32f7d401194d7d4a9644
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 19 08:07:28 2009 +0200

    src/collectd.conf.in: Fix some inconsistencies.
    
    Mostly left-overs from renaming plugins. Thanks to Mirko Buffoni for
    noticing :)