*
* Authors:
* Sebastian Harl <sh at tokkee.org>
+ * Pavel Rochnyak <pavel2000 ngs.ru>
**/
/*
assert (NULL != perl_threads);
PERL_SET_CONTEXT (aTHX);
+ /* Mark as running to avoid deadlock:
+ c_ithread_destroy -> log_debug -> perl_log()
+ */
+ ithread->running = 1;
log_debug ("Shutting down Perl interpreter %p...", aTHX);
#if COLLECT_DEBUG
{
int ret = 0;
user_data_t userdata;
- char cb_name[DATA_MAX_NAME_LEN];
+ char *pluginname;
dXSARGS;
XSRETURN_EMPTY;
}
+ /* Use pluginname as-is to allow flush a single perl plugin */
+ pluginname = SvPV_nolen (ST (0));
+
log_debug ("Collectd::plugin_register_%s: "
"plugin = \"%s\", sub = \"%s\"",
- desc, SvPV_nolen (ST (0)), SvPV_nolen (ST (1)));
+ desc, pluginname, SvPV_nolen (ST (1)));
- ssnprintf (cb_name, sizeof (cb_name), "perl/%s", SvPV_nolen (ST (0)));
memset(&userdata, 0, sizeof(userdata));
userdata.data = strdup(SvPV_nolen (ST (1)));
userdata.free_func = free;
if (PLUGIN_READ == type) {
ret = plugin_register_complex_read(
"perl", /* group */
- cb_name,
+ pluginname,
perl_read,
plugin_get_interval(), /* Default interval */
&userdata);
}
else if (PLUGIN_WRITE == type) {
- ret = plugin_register_write(cb_name, perl_write, &userdata);
+ ret = plugin_register_write(pluginname, perl_write, &userdata);
}
else if (PLUGIN_LOG == type) {
- ret = plugin_register_log(cb_name, perl_log, &userdata);
+ ret = plugin_register_log(pluginname, perl_log, &userdata);
}
else if (PLUGIN_NOTIF == type) {
- ret = plugin_register_notification(cb_name, perl_notify, &userdata);
+ ret = plugin_register_notification(pluginname, perl_notify, &userdata);
}
else if (PLUGIN_FLUSH == type) {
- ret = plugin_register_flush(cb_name, perl_flush, &userdata);
+ ret = plugin_register_flush(pluginname, perl_flush, &userdata);
}
else {
ret = -1;
static void _plugin_unregister_generic (pTHX,
perl_unregister_function_t *unreg, const char *desc)
{
- char cb_name[DATA_MAX_NAME_LEN];
-
dXSARGS;
if (1 != items) {
log_debug ("Collectd::plugin_unregister_%s: plugin = \"%s\"",
desc, SvPV_nolen (ST (0)));
- ssnprintf (cb_name, sizeof (cb_name), "perl/%s", SvPV_nolen (ST (0)));
-
- unreg(cb_name);
+ unreg(SvPV_nolen (ST (0)));
XSRETURN_EMPTY;
pthread_kill (thr->pthread, SIGTERM);
ERROR ("perl shutdown: Thread hangs inside Perl. Thread killed.");
}
- /* Mark as running to avoid deadlock:
- c_ithread_destroy -> log_debug -> perl_log()
- */
- thr->running = 1;
c_ithread_destroy (thr);
}