The list of plugins has to be common to all threads to be able to (un)register
callbacks after initialization. As threads::shared is not able to share
references to subroutines the callbacks now have to be identified by their
name. Collectd::call_by_name() is used to execute the callbacks.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
+use threads;
+use threads::shared;
+
BEGIN {
if (! $Config{'useithreads'}) {
die "Perl does not support ithreads!";
BEGIN {
if (! $Config{'useithreads'}) {
die "Perl does not support ithreads!";
Exporter::export_ok_tags ('all');
Exporter::export_ok_tags ('all');
+my @plugins : shared = ();
my %types = (
TYPE_INIT, "init",
my %types = (
TYPE_INIT, "init",
);
foreach my $type (keys %types) {
);
foreach my $type (keys %types) {
+ $plugins[$type] = &share ({});
sub plugin_call_all {
my $type = shift;
sub plugin_call_all {
my $type = shift;
+ our $cb_name = undef;
+
if (! defined $type) {
return;
}
if (! defined $type) {
return;
}
foreach my $plugin (keys %{$plugins[$type]}) {
my $p = $plugins[$type]->{$plugin};
foreach my $plugin (keys %{$plugins[$type]}) {
my $p = $plugins[$type]->{$plugin};
if ($p->{'wait_left'} > 0) {
# TODO: use interval_g
$p->{'wait_left'} -= 10;
if ($p->{'wait_left'} > 0) {
# TODO: use interval_g
$p->{'wait_left'} -= 10;
next if ($p->{'wait_left'} > 0);
next if ($p->{'wait_left'} > 0);
- if (my $status = $p->{'code'}->(@_)) {
+ $cb_name = $p->{'cb_name'};
+ $status = call_by_name (@_);
+
+ if (! defined $status) {
+ if (TYPE_LOG != $type) {
+ ERROR ("Could not execute callback \"$cb_name\": $@");
+ }
+
+ next;
+ }
+
+ if ($status) {
$p->{'wait_left'} = 0;
$p->{'wait_time'} = 10;
}
$p->{'wait_left'} = 0;
$p->{'wait_time'} = 10;
}
if ((TYPE_DATASET == $type) && ("ARRAY" eq ref $data)) {
return plugin_register_data_set ($name, $data);
}
if ((TYPE_DATASET == $type) && ("ARRAY" eq ref $data)) {
return plugin_register_data_set ($name, $data);
}
- elsif ("CODE" eq ref $data) {
+ elsif ((TYPE_DATASET != $type) && (! ref $data)) {
+ my $pkg = scalar caller;
+
+ my %p : shared;
+
+ if ($data !~ m/^$pkg/) {
+ $data = $pkg . "::" . $data;
+ }
+
# TODO: make interval_g available at configuration time
# TODO: make interval_g available at configuration time
- $plugins[$type]->{$name} = {
- wait_time => 10,
- wait_left => 0,
- code => $data,
- };
+ %p = (
+ wait_time => 10,
+ wait_left => 0,
+ cb_name => $data,
+ );
+
+ lock @plugins;
+ $plugins[$type]->{$name} = \%p;
}
else {
ERROR ("Collectd::plugin_register: Invalid data.");
}
else {
ERROR ("Collectd::plugin_register: Invalid data.");
return plugin_unregister_data_set ($name);
}
elsif (defined $plugins[$type]) {
return plugin_unregister_data_set ($name);
}
elsif (defined $plugins[$type]) {
delete $plugins[$type]->{$name};
}
else {
delete $plugins[$type]->{$name};
}
else {