X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fperl.c;h=4a76c0aa6f636d9075057c83e39b8d6b6b5c060d;hb=ef7fec0c4e0bbbabb356e6a570ac6297ee06eb80;hp=a08cced1d3776453c50524d521004f0546e5e5b4;hpb=d98487a27d294e31f483b9d43e0d6c02717d248c;p=collectd.git diff --git a/src/perl.c b/src/perl.c index a08cced1..4a76c0aa 100644 --- a/src/perl.c +++ b/src/perl.c @@ -27,13 +27,19 @@ /* do not automatically get the thread specific perl interpreter */ #define PERL_NO_GET_CONTEXT +#define DONT_POISON_SPRINTF_YET 1 #include "collectd.h" +#undef DONT_POISON_SPRINTF_YET #include "configfile.h" #include #include +#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__ +# pragma GCC poison sprintf +#endif + #include /* Some versions of Perl define their own version of DEBUG... :-/ */ @@ -61,9 +67,11 @@ #define PLUGIN_SHUTDOWN 3 #define PLUGIN_LOG 4 #define PLUGIN_NOTIF 5 +#define PLUGIN_FLUSH 6 -#define PLUGIN_TYPES 6 +#define PLUGIN_TYPES 7 +#define PLUGIN_CONFIG 254 #define PLUGIN_DATASET 255 #define log_debug(...) DEBUG ("perl: " __VA_ARGS__) @@ -77,6 +85,7 @@ void boot_DynaLoader (PerlInterpreter *, CV *); static XS (Collectd_plugin_register_ds); static XS (Collectd_plugin_unregister_ds); static XS (Collectd_plugin_dispatch_values); +static XS (Collectd__plugin_flush); static XS (Collectd_plugin_dispatch_notification); static XS (Collectd_plugin_log); static XS (Collectd_call_by_name); @@ -130,6 +139,7 @@ static struct { { "Collectd::plugin_register_data_set", Collectd_plugin_register_ds }, { "Collectd::plugin_unregister_data_set", Collectd_plugin_unregister_ds }, { "Collectd::plugin_dispatch_values", Collectd_plugin_dispatch_values }, + { "Collectd::_plugin_flush", Collectd__plugin_flush }, { "Collectd::plugin_dispatch_notification", Collectd_plugin_dispatch_notification }, { "Collectd::plugin_log", Collectd_plugin_log }, @@ -148,6 +158,8 @@ struct { { "Collectd::TYPE_SHUTDOWN", PLUGIN_SHUTDOWN }, { "Collectd::TYPE_LOG", PLUGIN_LOG }, { "Collectd::TYPE_NOTIF", PLUGIN_NOTIF }, + { "Collectd::TYPE_FLUSH", PLUGIN_FLUSH }, + { "Collectd::TYPE_CONFIG", PLUGIN_CONFIG }, { "Collectd::TYPE_DATASET", PLUGIN_DATASET }, { "Collectd::DS_TYPE_COUNTER", DS_TYPE_COUNTER }, { "Collectd::DS_TYPE_GAUGE", DS_TYPE_GAUGE }, @@ -414,6 +426,81 @@ static int notification2hv (pTHX_ notification_t *n, HV *hash) return 0; } /* static int notification2hv (notification_t *, HV *) */ +static int oconfig_item2hv (pTHX_ oconfig_item_t *ci, HV *hash) +{ + int i; + + AV *values; + AV *children; + + if (NULL == hv_store (hash, "key", 3, newSVpv (ci->key, 0), 0)) + return -1; + + values = newAV (); + if (0 < ci->values_num) + av_extend (values, ci->values_num); + + if (NULL == hv_store (hash, "values", 6, newRV_noinc ((SV *)values), 0)) { + av_clear (values); + av_undef (values); + return -1; + } + + for (i = 0; i < ci->values_num; ++i) { + SV *value; + + switch (ci->values[i].type) { + case OCONFIG_TYPE_STRING: + value = newSVpv (ci->values[i].value.string, 0); + break; + case OCONFIG_TYPE_NUMBER: + value = newSVnv ((NV)ci->values[i].value.number); + break; + case OCONFIG_TYPE_BOOLEAN: + value = ci->values[i].value.boolean ? &PL_sv_yes : &PL_sv_no; + break; + default: + log_err ("oconfig_item2hv: Invalid value type %i.", + ci->values[i].type); + value = &PL_sv_undef; + } + + if (NULL == av_store (values, i, value)) { + sv_free (value); + return -1; + } + } + + /* ignoring 'parent' member which is uninteresting in this case */ + + children = newAV (); + if (0 < ci->children_num) + av_extend (children, ci->children_num); + + if (NULL == hv_store (hash, "children", 8, newRV_noinc ((SV *)children), 0)) { + av_clear (children); + av_undef (children); + return -1; + } + + for (i = 0; i < ci->children_num; ++i) { + HV *child = newHV (); + + if (0 != oconfig_item2hv (aTHX_ ci->children + i, child)) { + hv_clear (child); + hv_undef (child); + return -1; + } + + if (NULL == av_store (children, i, newRV_noinc ((SV *)child))) { + hv_clear (child); + hv_undef (child); + return -1; + } + } + return 0; +} /* static int oconfig_item2hv (pTHX_ oconfig_item_t *, HV *) */ + /* * Internal functions. */ @@ -561,7 +648,7 @@ static int pplugin_dispatch_values (pTHX_ HV *values) sstrncpy (list.host, SvPV_nolen (*tmp), sizeof (list.host)); } else { - strcpy (list.host, hostname_g); + sstrncpy (list.host, hostname_g, sizeof (list.host)); } if (NULL != (tmp = hv_fetch (values, "plugin", 6, 0))) @@ -754,6 +841,14 @@ static int pplugin_call_all (pTHX_ int type, ...) XPUSHs (sv_2mortal (newRV_noinc ((SV *)notif))); } + else if (PLUGIN_FLUSH == type) { + /* + * $_[0] = $timeout; + * $_[1] = $identifier; + */ + XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); + XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); + } PUTBACK; @@ -900,6 +995,49 @@ static XS (Collectd_plugin_dispatch_values) } /* static XS (Collectd_plugin_dispatch_values) */ /* + * Collectd::_plugin_flush (plugin, timeout, identifier). + * + * plugin: + * name of the plugin to flush + * + * timeout: + * timeout to use when flushing the data + * + * identifier: + * data-set identifier to flush + */ +static XS (Collectd__plugin_flush) +{ + char *plugin = NULL; + int timeout = -1; + char *id = NULL; + + dXSARGS; + + if (3 != items) { + log_err ("Usage: Collectd::_plugin_flush(plugin, timeout, id)"); + XSRETURN_EMPTY; + } + + if (SvOK (ST (0))) + plugin = SvPV_nolen (ST (0)); + + if (SvOK (ST (1))) + timeout = (int)SvIV (ST (1)); + + if (SvOK (ST (2))) + id = SvPV_nolen (ST (2)); + + log_debug ("Collectd::_plugin_flush: plugin = \"%s\", timeout = %i, " + "id = \"%s\"", plugin, timeout, id); + + if (0 == plugin_flush (plugin, timeout, id)) + XSRETURN_YES; + else + XSRETURN_EMPTY; +} /* static XS (Collectd__plugin_flush) */ + +/* * Collectd::plugin_dispatch_notification (notif). * * notif: @@ -954,7 +1092,7 @@ static XS (Collectd_plugin_log) XSRETURN_EMPTY; } - plugin_log (SvIV (ST (0)), SvPV_nolen (ST (1))); + plugin_log (SvIV (ST (0)), "%s", SvPV_nolen (ST (1))); XSRETURN_YES; } /* static XS (Collectd_plugin_log) */ @@ -1067,7 +1205,7 @@ static c_ithread_t *c_ithread_create (PerlInterpreter *base) aTHX = t->interp; - if (NULL != base) { + if ((NULL != base) && (NULL != PL_endav)) { av_clear (PL_endav); av_undef (PL_endav); PL_endav = Nullav; @@ -1204,6 +1342,25 @@ static int perl_notify (const notification_t *notif) return pplugin_call_all (aTHX_ PLUGIN_NOTIF, notif); } /* static int perl_notify (const notification_t *) */ +static int perl_flush (int timeout, const char *identifier) +{ + dTHX; + + if (NULL == perl_threads) + return 0; + + if (NULL == aTHX) { + c_ithread_t *t = NULL; + + pthread_mutex_lock (&perl_threads->mutex); + t = c_ithread_create (perl_threads->head->interp); + pthread_mutex_unlock (&perl_threads->mutex); + + aTHX = t->interp; + } + return pplugin_call_all (aTHX_ PLUGIN_FLUSH, timeout, identifier); +} /* static int perl_flush (const int) */ + static int perl_shutdown (void) { c_ithread_t *t = NULL; @@ -1235,6 +1392,7 @@ static int perl_shutdown (void) plugin_unregister_init ("perl"); plugin_unregister_read ("perl"); plugin_unregister_write ("perl"); + plugin_unregister_flush ("perl"); ret = pplugin_call_all (aTHX_ PLUGIN_SHUTDOWN); @@ -1369,9 +1527,14 @@ static int init_pi (int argc, char **argv) log_err ("init_pi: pthread_key_create failed"); /* this must not happen - cowardly giving up if it does */ - exit (1); + return -1; } +#ifdef __FreeBSD__ + /* On FreeBSD, PERL_SYS_INIT3 expands to some expression which + * triggers a "value computed is not used" warning by gcc. */ + (void) +#endif PERL_SYS_INIT3 (&argc, &argv, &environ); perl_threads = (c_ithread_list_t *)smalloc (sizeof (c_ithread_list_t)); @@ -1398,8 +1561,16 @@ static int init_pi (int argc, char **argv) PL_exit_flags |= PERL_EXIT_DESTRUCT_END; if (0 != perl_parse (aTHX_ xs_init, argc, argv, NULL)) { - log_err ("init_pi: Unable to bootstrap Collectd."); - exit (1); + SV *err = get_sv ("@", 1); + log_err ("init_pi: Unable to bootstrap Collectd: %s", + SvPV_nolen (err)); + + perl_destruct (perl_threads->head->interp); + perl_free (perl_threads->head->interp); + sfree (perl_threads); + + pthread_key_delete (perl_thr_key); + return -1; } /* Set $0 to "collectd" because perl_parse() has to set it to "-e". */ @@ -1414,6 +1585,7 @@ static int init_pi (int argc, char **argv) plugin_register_read ("perl", perl_read); plugin_register_write ("perl", perl_write); + plugin_register_flush ("perl", perl_flush); plugin_register_shutdown ("perl", perl_shutdown); return 0; } /* static int init_pi (const char **, const int) */ @@ -1440,7 +1612,9 @@ static int perl_config_loadplugin (pTHX_ oconfig_item_t *ci) return (1); } - init_pi (perl_argc, perl_argv); + if (0 != init_pi (perl_argc, perl_argv)) + return -1; + assert (NULL != perl_threads); assert (NULL != perl_threads->head); @@ -1551,32 +1725,102 @@ static int perl_config_includedir (pTHX_ oconfig_item_t *ci) return 0; } /* static int perl_config_includedir (oconfig_item_it *) */ +/* + * block + */ +static int perl_config_plugin (pTHX_ oconfig_item_t *ci) +{ + int retvals = 0; + int ret = 0; + + char *plugin; + HV *config; + + dSP; + + if ((1 != ci->values_num) || (OCONFIG_TYPE_STRING != ci->values[0].type)) { + log_err ("LoadPlugin expects a single string argument."); + return 1; + } + + plugin = ci->values[0].value.string; + config = newHV (); + + if (0 != oconfig_item2hv (aTHX_ ci, config)) { + hv_clear (config); + hv_undef (config); + + log_err ("Unable to convert configuration to a Perl hash value."); + config = Nullhv; + } + + ENTER; + SAVETMPS; + + PUSHMARK (SP); + + XPUSHs (sv_2mortal (newSVpv (plugin, 0))); + XPUSHs (sv_2mortal (newRV_noinc ((SV *)config))); + + PUTBACK; + + retvals = call_pv ("Collectd::_plugin_dispatch_config", G_SCALAR); + + SPAGAIN; + if (0 < retvals) { + SV *tmp = POPs; + if (! SvTRUE (tmp)) + ret = 1; + } + else + ret = 1; + + PUTBACK; + FREETMPS; + LEAVE; + return ret; +} /* static int perl_config_plugin (oconfig_item_it *) */ + static int perl_config (oconfig_item_t *ci) { + int status = 0; int i = 0; - dTHX; - - /* dTHX does not get any valid values in case Perl - * has not been initialized */ - if (NULL == perl_threads) - aTHX = NULL; + dTHXa (NULL); for (i = 0; i < ci->children_num; ++i) { oconfig_item_t *c = ci->children + i; + int current_status = 0; + + if (NULL != perl_threads) + aTHX = PERL_GET_CONTEXT; if (0 == strcasecmp (c->key, "LoadPlugin")) - perl_config_loadplugin (aTHX_ c); + current_status = perl_config_loadplugin (aTHX_ c); else if (0 == strcasecmp (c->key, "BaseName")) - perl_config_basename (aTHX_ c); + current_status = perl_config_basename (aTHX_ c); else if (0 == strcasecmp (c->key, "EnableDebugger")) - perl_config_enabledebugger (aTHX_ c); + current_status = perl_config_enabledebugger (aTHX_ c); else if (0 == strcasecmp (c->key, "IncludeDir")) - perl_config_includedir (aTHX_ c); + current_status = perl_config_includedir (aTHX_ c); + else if (0 == strcasecmp (c->key, "Plugin")) + current_status = perl_config_plugin (aTHX_ c); else + { log_warn ("Ignoring unknown config key \"%s\".", c->key); + current_status = 0; + } + + /* fatal error - it's up to perl_config_* to clean up */ + if (0 > current_status) { + log_err ("Configuration failed with a fatal error - " + "plugin disabled!"); + return current_status; + } + + status += current_status; } - return 0; + return status; } /* static int perl_config (oconfig_item_t *) */ void module_register (void)