X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=bindings%2Fperl%2Flib%2FCollectd.pm;h=7e89e45f5d05c60c4de44275757dbe9884c52332;hb=f374b72032a227a75b6bc9ae574cd28abbc16f24;hp=ca3b5d2349805a505ae22df4faad8c7b9feda529;hpb=b4c8f3f762d666742c774ab3b45815e5a416e5da;p=collectd.git

diff --git a/bindings/perl/lib/Collectd.pm b/bindings/perl/lib/Collectd.pm
index ca3b5d23..7e89e45f 100644
--- a/bindings/perl/lib/Collectd.pm
+++ b/bindings/perl/lib/Collectd.pm
@@ -42,6 +42,7 @@ our %EXPORT_TAGS = (
 			plugin_register
 			plugin_unregister
 			plugin_dispatch_values
+			plugin_get_interval
 			plugin_write
 			plugin_flush
 			plugin_flush_one
@@ -179,13 +180,13 @@ sub plugin_call_all {
 	}
 
 	if (TYPE_LOG != $type) {
-		DEBUG ("Collectd::plugin_call: type = \"$type\" ("
+		DEBUG ("Collectd::plugin_call_all: type = \"$type\" ("
 			. $types{$type} . "), args=\""
 			. join(', ', map { defined($_) ? $_ : '<undef>' } @_) . "\"");
 	}
 
 	if (! defined $plugins[$type]) {
-		ERROR ("Collectd::plugin_call: unknown type \"$type\"");
+		ERROR ("Collectd::plugin_call_all: unknown type \"$type\"");
 		return;
 	}
 
@@ -195,18 +196,8 @@ sub plugin_call_all {
 	}
 
 	foreach my $plugin (keys %plugins) {
-		my $p = $plugins{$plugin};
-
-		my $status = 0;
-
-		if ($p->{'wait_left'} > 0) {
-			$p->{'wait_left'} -= $interval_g;
-		}
-
-		next if ($p->{'wait_left'} > 0);
-
-		$cb_name = $p->{'cb_name'};
-		$status = call_by_name (@_);
+		$cb_name = $plugins{$plugin};
+		my $status = call_by_name (@_);
 
 		if (! $status) {
 			my $err = undef;
@@ -226,23 +217,7 @@ sub plugin_call_all {
 		}
 
 		if ($status) {
-			$p->{'wait_left'} = 0;
-			$p->{'wait_time'} = $interval_g;
-		}
-		elsif (TYPE_READ == $type) {
-			if ($p->{'wait_time'} < $interval_g) {
-				$p->{'wait_time'} = $interval_g;
-			}
-
-			$p->{'wait_left'} = $p->{'wait_time'};
-			$p->{'wait_time'} *= 2;
-
-			if ($p->{'wait_time'} > 86400) {
-				$p->{'wait_time'} = 86400;
-			}
-
-			WARNING ("${plugin}->read() failed with status $status. "
-				. "Will suspend it for $p->{'wait_left'} seconds.");
+			#NOOP
 		}
 		elsif (TYPE_INIT == $type) {
 			ERROR ("${plugin}->init() failed with status $status. "
@@ -305,21 +280,29 @@ sub plugin_register {
 	}
 	elsif ((TYPE_DATASET != $type) && (! ref $data)) {
 		my $pkg = scalar caller;
-
-		my %p : shared;
-
 		if ($data !~ m/^$pkg\:\:/) {
 			$data = $pkg . "::" . $data;
 		}
-
-		%p = (
-			wait_time => $interval_g,
-			wait_left => 0,
-			cb_name   => $data,
-		);
-
+		if (TYPE_READ == $type) {
+			return plugin_register_read($name, $data);
+		}
+		if (TYPE_WRITE == $type) {
+			return plugin_register_write($name, $data);
+		}
+		if (TYPE_LOG == $type) {
+			return plugin_register_log($name, $data);
+		}
+		if (TYPE_NOTIF == $type) {
+			return plugin_register_notification($name, $data);
+		}
+		if (TYPE_FLUSH == $type) {
+			#For collectd-5.6 only
+			lock %{$plugins[$type]};
+			$plugins[$type]->{$name} = $data;
+			return plugin_register_flush($name, $data);
+		}
 		lock %{$plugins[$type]};
-		$plugins[$type]->{$name} = \%p;
+		$plugins[$type]->{$name} = $data;
 	}
 	else {
 		ERROR ("Collectd::plugin_register: Invalid data.");
@@ -347,6 +330,21 @@ sub plugin_unregister {
 		lock %cf_callbacks;
 		delete $cf_callbacks{$name};
 	}
+	elsif (TYPE_READ == $type) {
+		return plugin_unregister_read ($name);
+	}
+	elsif (TYPE_WRITE == $type) {
+		return plugin_unregister_write($name);
+	}
+	elsif (TYPE_LOG == $type) {
+		return plugin_unregister_log ($name);
+	}
+	elsif (TYPE_NOTIF == $type) {
+		return plugin_unregister_notification($name);
+	}
+	elsif (TYPE_FLUSH == $type) {
+		return plugin_unregister_flush($name);
+	}
 	elsif (defined $plugins[$type]) {
 		lock %{$plugins[$type]};
 		delete $plugins[$type]->{$name};