Merge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugi...

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index cffb7ad..5c8de4f 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -306,6 +306,20 @@ Sets the Time-To-Live of generated ICMP packets.
 
 =back
 
+=head2 Plugin C<rrdtool>
+
+=over 4
+
+=item B<CacheTimeout> I<Seconds>
+
+If this option is set to a value greater than zero, the C<rrdtool>-plugin will
+write values every I<Seconds> seconds to the RRD-files. Writing multiple values
+at once reduces IO-operations and thus lessens the load produced by updating
+the files. The tradeoff is that the graphs kind of "drag behind" and that more
+memory is used.
+
+=back
+
 =head2 Plugin C<sensors>
 
 =over 4

diff --git a/src/network.c b/src/network.c
index 33f581d..11c9718 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -865,7 +865,7 @@ int network_receive (void)
 
 static void *receive_thread (void *arg)
 {
-       return ((void *) network_receive ());
+       return (network_receive () ? (void *) 1 : (void *) 0);
 } /* void *receive_thread */
 
 #if 0