From: Sebastian Harl <sh@tokkee.org>
Date: Tue, 18 Mar 2008 11:34:17 +0000 (+0100)
Subject: perl plugin: Fixed the "EnableDebugger after LoadPlugin" warning.
X-Git-Tag: collectd-4.3.2~11
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=53f5cd2cb13cc23d348efb41dba8be25af415a59;p=collectd.git

perl plugin: Fixed the "EnableDebugger after LoadPlugin" warning.

For some strange reason my original patch (perl plugin: Warn if
"EnableDebugger" has been used after "LoadPlugin".) has been applied at the
wrong position (it has been applied to perl_config_includedir() instead of
perl_config_enabledebugger() - I have absolutely no clue why though).

Also, the check for the precondition of this warning has been fixed. In some
cases aTHX does not seem to be set, even though the Perl interpreter has
already been initialized. Now, perl_threads is used to check for that
condition.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
---

diff --git a/src/perl.c b/src/perl.c
index 6d3326fa..d17551ee 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -1478,6 +1478,11 @@ static int perl_config_enabledebugger (pTHX_ oconfig_item_t *ci)
 		return 1;
 	}
 
+	if (NULL != perl_threads) {
+		log_warn ("EnableDebugger has no effects if used after LoadPlugin.");
+		return 1;
+	}
+
 	value = ci->values[0].value.string;
 
 	perl_argv = (char **)realloc (perl_argv,
@@ -1514,11 +1519,6 @@ static int perl_config_includedir (pTHX_ oconfig_item_t *ci)
 		return 1;
 	}
 
-	if (NULL == aTHX) {
-		log_warn ("EnableDebugger has no effects if used after LoadPlugin.");
-		return 1;
-	}
-
 	value = ci->values[0].value.string;
 
 	if (NULL == aTHX) {