From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 24 Mar 2008 12:36:05 +0000 (+0100)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.2~2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3bb58d8d87a0db2b3177cbc52c2078c5543e7944;hp=-c;p=collectd.git

Merge branch 'collectd-4.2' into collectd-4.3
---

3bb58d8d87a0db2b3177cbc52c2078c5543e7944
diff --combined configure.in
index 460b9316,17462a12..952f5c5d
--- a/configure.in
+++ b/configure.in
@@@ -17,7 -17,6 +17,7 @@@ AC_PROG_CP
  AC_PROG_INSTALL
  AC_PROG_LN_S
  AC_PROG_MAKE_SET
 +AM_PROG_CC_C_O
  AM_CONDITIONAL(COMPILER_IS_GCC, test "x$GCC" = "xyes")
  
  dnl configure libtool
@@@ -311,7 -310,7 +311,7 @@@ AC_CHECK_HEADERS(linux/un.h, [], []
  #endif
  ])
  
 -AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h sys/quota.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h kvm.h)
 +AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h sys/quota.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h kvm.h wordexp.h)
  
  # For the dns plugin
  AC_CHECK_HEADERS(arpa/nameser.h)
@@@ -819,20 -818,6 +819,20 @@@ AC_CHECK_LIB(resolv, res_search
  [with_libresolv="no"])
  AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes")
  
 +dnl Check for HAL (hardware abstraction library)
 +with_libhal="yes"
 +AC_CHECK_LIB(hal,libhal_device_property_exists,
 +	     [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])],
 +	     [with_libhal="no"])
 +if test "x$with_libhal" = "xyes"; then
 +	PKG_PROG_PKG_CONFIG
 +	if test "x$PKG_CONFIG" != "x"; then
 +		BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
 +		BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
 +		AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
 +		AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
 +	fi
 +fi
  
  m4_divert_once([HELP_WITH], [
  collectd additional packages:])
@@@ -847,8 -832,6 +847,8 @@@ AC_ARG_WITH(rrdtool, [AS_HELP_STRING([-
  		librrd_cflags="-I$withval/include"
  		librrd_ldflags="-L$withval/lib"
  		with_rrdtool="yes"
 +	else
 +		with_rrdtool="$withval"
  	fi
  ], [with_rrdtool="yes"])
  if test "x$with_rrdtool" = "xyes"
@@@ -1034,7 -1017,7 +1034,7 @@@ AC_CHECK_LIB(IOKit, IOServiceGetMatchin
  [
  	with_libiokit="yes"
  	collectd_libiokit=1
 -], 
 +],
  [
  	with_libiokit="no"
  	collectd_libiokit=0
@@@ -1042,8 -1025,6 +1042,6 @@@
  AC_DEFINE_UNQUOTED(COLLECT_LIBIOKIT, [$collect_libiokit], [Wether or not to use the IOKit library])
  AM_CONDITIONAL(BUILD_WITH_LIBIOKIT, test "x$with_libiokit" = "xyes")
  
- with_libstatgrab="yes"
- with_libdevstat="no"
  AC_ARG_WITH(libstatgrab, [AS_HELP_STRING([--with-libstatgrab@<:@=PREFIX@:>@], [Path to libstatgrab.])],
  [
  	if test "x$withval" != "xno" -a "x$withval" != "xyes"
@@@ -1051,8 -1032,6 +1049,8 @@@
  		LDFLAGS="$LDFLAGS -L$withval/lib"
  		CPPFLAGS="$CPPFLAGS -I$withval/include"
  		with_libstatgrab="yes"
 +	else
 +		with_libstatgrab="$withval"
  	fi
  ],
  [
@@@ -1291,12 -1270,10 +1289,12 @@@ AC_ARG_WITH(liboping, [AS_HELP_STRING([
  	then
  		with_liboping="no"
  		with_own_liboping="no"
 -	fi
 +	else if test "x$withval" = "xyes"
 +	then
 +		with_liboping="yes"
 +	fi; fi
  ],
  [
 - 	#753
  	with_liboping="yes"
  ])
  
@@@ -1328,8 -1305,6 +1326,8 @@@ AC_ARG_WITH(libpcap, [AS_HELP_STRING([-
  		LDFLAGS="$LDFLAGS -L$withval/lib"
  		CPPFLAGS="$CPPFLAGS -I$withval/include"
  		with_libpcap="yes"
 +	else
 +		with_libpcap="$withval"
  	fi
  ],
  [
@@@ -1368,8 -1343,6 +1366,8 @@@ AC_ARG_WITH(libperl, [AS_HELP_STRING([-
  		CPPFLAGS="$CPPFLAGS -I$withval/include"
  		perl_interpreter="$withval/bin/perl"
  		with_libperl="yes"
 +	else
 +		with_libperl="$withval"
  	fi
  ],
  [
@@@ -1421,41 -1394,6 +1419,41 @@@ the
  fi
  AM_CONDITIONAL(BUILD_WITH_LIBPERL, test "x$with_libperl" = "xyes")
  
 +if test "x$with_libperl" = "xyes"
 +then
 +	SAVE_CFLAGS=$CFLAGS
 +	SAVE_LDFLAGS=$LDFLAGS
 +	CFLAGS="$CFLAGS $PERL_CFLAGS"
 +	LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
 +
 +	AC_CACHE_CHECK([if perl supports ithreads],
 +		[have_perl_ithreads],
 +		AC_LINK_IFELSE(
 +			AC_LANG_PROGRAM(
 +			[[
 +#include <EXTERN.h>
 +#include <perl.h>
 +#include <XSUB.h>
 +
 +#if !defined(USE_ITHREADS)
 +# error "Perl does not support ithreads!"
 +#endif /* !defined(USE_ITHREADS) */
 +			]],
 +			[[ ]]),
 +			[have_perl_ithreads="yes"],
 +			[have_perl_ithreads="no"]
 +		)
 +	)
 +
 +	if test "x$have_perl_ithreads" = "xyes"
 +	then
 +		AC_DEFINE(HAVE_PERL_ITHREADS, 1, [Define if Perl supports ithreads.])
 +	fi
 +
 +	CFLAGS=$SAVE_CFLAGS
 +	LDFLAGS=$SAVE_LDFLAGS
 +fi
 +
  AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
  [
  	if test "x$withval" != "xno" && test "x$withval" != "xyes"
@@@ -1463,12 -1401,10 +1461,12 @@@
  		LDFLAGS="$LDFLAGS -L$withval/lib"
  		CPPFLAGS="$CPPFLAGS -I$withval/include"
  		with_libiptc="yes"
 +	else
 +		with_libiptc="$withval"
  	fi
  ],
  [
 - 	if test "x$ac_system" = "xLinux"
 +	if test "x$ac_system" = "xLinux"
  	then
  		with_libiptc="yes"
  	else
@@@ -1502,14 -1438,14 +1500,14 @@@ with_snmp_cflags="
  with_snmp_libs=""
  AC_ARG_WITH(libnetsnmp, [AS_HELP_STRING([--with-libnetsnmp@<:@=PREFIX@:>@], [Path to the Net-SNMPD library.])],
  [
 - 	if test "x$withval" = "xno"
 +	if test "x$withval" = "xno"
  	then
  		with_libnetsnmp="no"
  	else if test "x$withval" = "xyes"
  	then
  		with_libnetsnmp="yes"
  	else
 -	       	if test -x "$withval"
 +		if test -x "$withval"
  		then
  			with_snmp_config="$withval"
  			with_libnetsnmp="yes"
@@@ -1629,7 -1565,7 +1627,7 @@@ the
  fi
  if test "x$with_libupsclient" = "xyes"
  then
 -	AC_CHECK_TYPES([UPSCONN_t, UPSCONN], [], [], 
 +	AC_CHECK_TYPES([UPSCONN_t, UPSCONN], [], [],
  [#include <stdlib.h>
  #include <stdio.h>
  #include <upsclient.h>])
@@@ -1809,125 -1745,6 +1807,125 @@@ the
  fi
  AM_CONDITIONAL(BUILD_WITH_LIBNETLINK, test "x$with_libnetlink" = "xyes")
  
 +dnl Check for libvirt and libxml2 libraries.
 +with_libxml2="no (pkg-config isn't available)"
 +with_libxml2_cflags=""
 +with_libxml2_ldflags=""
 +with_libvirt="no (pkg-config isn't available)"
 +with_libvirt_cflags=""
 +with_libvirt_ldflags=""
 +PKG_PROG_PKG_CONFIG
 +if test "x$PKG_CONFIG" != "x"
 +then
 +	pkg-config --exists 'libxml-2.0' 2>/dev/null
 +	if test "$?" = "0"
 +	then
 +		with_libxml2="yes"
 +	else
 +		with_libxml2="no (pkg-config doesn't know library)"
 +	fi
 +
 +	pkg-config --exists libvirt 2>/dev/null
 +	if test "$?" = "0"
 +	then
 +		with_libvirt="yes"
 +	else
 +		with_libvirt="no (pkg-config doesn't know library)"
 +	fi
 +fi
 +if test "x$with_libxml2" = "xyes"
 +then
 +	with_libxml2_cflags="`pkg-config --cflags libxml-2.0`"
 +	if test $? -ne 0
 +	then
 +		with_libxml2="no"
 +	fi
 +	with_libxml2_ldflags="`pkg-config --libs libxml-2.0`"
 +	if test $? -ne 0
 +	then
 +		with_libxml2="no"
 +	fi
 +fi
 +if test "x$with_libxml2" = "xyes"
 +then
 +	SAVE_CPPFLAGS="$CPPFLAGS"
 +	CPPFLAGS="$CPPFLAGS $with_libxml2_cflags"
 +
 +	AC_CHECK_HEADERS(libxml/parser.h, [],
 +		      [with_libxml2="no (libxml/parser.h not found)"])
 +
 +	CPPFLAGS="$SAVE_CPPFLAGS"
 +fi
 +if test "x$with_libxml2" = "xyes"
 +then
 +	SAVE_CFLAGS="$CFLAGS"
 +	SAVE_LD_FLAGS="$LDFLAGS"
 +
 +	CFLAGS="$CFLAGS $with_libxml2_cflags"
 +	LDFLAGS="$LDFLAGS $with_libxml2_ldflags"
 +
 +	AC_CHECK_LIB(xml2, xmlXPathEval,
 +		     [with_libxml2="yes"],
 +		     [with_libxml2="no (symbol xmlXPathEval not found)"])
 +
 +	CFLAGS="$SAVE_CFLAGS"
 +	LDFLAGS="$SAVE_LDFLAGS"
 +fi
 +dnl Add the right compiler flags and libraries.
 +if test "x$with_libxml2" = "xyes"; then
 +	BUILD_WITH_LIBXML2_CFLAGS="$with_libxml2_cflags"
 +	BUILD_WITH_LIBXML2_LIBS="$with_libxml2_ldflags"
 +	AC_SUBST(BUILD_WITH_LIBXML2_CFLAGS)
 +	AC_SUBST(BUILD_WITH_LIBXML2_LIBS)
 +fi
 +if test "x$with_libvirt" = "xyes"
 +then
 +	with_libvirt_cflags="`pkg-config --cflags libvirt`"
 +	if test $? -ne 0
 +	then
 +		with_libvirt="no"
 +	fi
 +	with_libvirt_ldflags="`pkg-config --libs libvirt`"
 +	if test $? -ne 0
 +	then
 +		with_libvirt="no"
 +	fi
 +fi
 +if test "x$with_libvirt" = "xyes"
 +then
 +	SAVE_CPPFLAGS="$CPPFLAGS"
 +	CPPFLAGS="$CPPFLAGS $with_libvirt_cflags"
 +
 +	AC_CHECK_HEADERS(libvirt/libvirt.h, [],
 +		      [with_libvirt="no (libvirt/libvirt.h not found)"])
 +
 +	CPPFLAGS="$SAVE_CPPFLAGS"
 +fi
 +if test "x$with_libvirt" = "xyes"
 +then
 +	SAVE_CFLAGS="$CFLAGS"
 +	SAVE_LD_FLAGS="$LDFLAGS"
 +
 +	CFLAGS="$CFLAGS $with_libvirt_cflags"
 +	LDFLAGS="$LDFLAGS $with_libvirt_ldflags"
 +
 +	AC_CHECK_LIB(virt, virDomainBlockStats,
 +		     [with_libvirt="yes"],
 +		     [with_libvirt="no (symbol virDomainBlockStats not found)"])
 +
 +	CFLAGS="$SAVE_CFLAGS"
 +	LDFLAGS="$SAVE_LDFLAGS"
 +fi
 +dnl Add the right compiler flags and libraries.
 +if test "x$with_libvirt" = "xyes"; then
 +	BUILD_WITH_LIBVIRT_CFLAGS="$with_libvirt_cflags"
 +	BUILD_WITH_LIBVIRT_LIBS="$with_libvirt_ldflags"
 +	AC_SUBST(BUILD_WITH_LIBVIRT_CFLAGS)
 +	AC_SUBST(BUILD_WITH_LIBVIRT_LIBS)
 +fi
 +
 +dnl End of check for libvirt and libxml2 libraries.
 +
  # Check for enabled/disabled features
  #
  
@@@ -2040,12 -1857,10 +2038,12 @@@ plugin_entropy="no
  plugin_interface="no"
  plugin_ipvs="no"
  plugin_irq="no"
 +plugin_libvirt="no"
  plugin_load="no"
  plugin_memory="no"
  plugin_multimeter="no"
  plugin_nfs="no"
 +plugin_perl="no"
  plugin_processes="no"
  plugin_serial="no"
  plugin_swap="no"
@@@ -2133,21 -1948,11 +2131,21 @@@ the
  	plugin_interface="yes"
  fi
  
 +if test "x$with_libxml2" = "xyes" && test "x$with_libvirt" = "xyes"
 +then
 +	plugin_libvirt="yes"
 +fi
 +
  if test "x$have_getloadavg" = "xyes"
  then
  	plugin_load="yes"
  fi
  
 +if test "x$have_libperl$have_perl_ithreads" = "xyesyes"
 +then
 +	plugin_perl="yes"
 +fi
 +
  # Mac OS X memory interface
  if test "x$have_host_statistics" = "xyes"
  then
@@@ -2201,7 -2006,6 +2199,7 @@@ AC_PLUGIN([interface],   [$plugin_inter
  AC_PLUGIN([iptables],    [$with_libiptc],      [IPTables rule counters])
  AC_PLUGIN([ipvs],        [$plugin_ipvs],       [IPVS connection statistics])
  AC_PLUGIN([irq],         [$plugin_irq],        [IRQ statistics])
 +AC_PLUGIN([libvirt],     [$plugin_libvirt],    [Virtual machine statistics])
  AC_PLUGIN([load],        [$plugin_load],       [System load])
  AC_PLUGIN([logfile],     [yes],                [File logging plugin])
  AC_PLUGIN([mbmon],       [yes],                [Query mbmond])
@@@ -2215,7 -2019,7 +2213,7 @@@ AC_PLUGIN([nfs],         [$plugin_nfs]
  AC_PLUGIN([nginx],       [$with_libcurl],      [nginx statistics])
  AC_PLUGIN([ntpd],        [yes],                [NTPd statistics])
  AC_PLUGIN([nut],         [$with_libupsclient], [Network UPS tools statistics])
 -AC_PLUGIN([perl],        [$with_libperl],      [Embed a Perl interpreter])
 +AC_PLUGIN([perl],        [$plugin_perl],       [Embed a Perl interpreter])
  AC_PLUGIN([ping],        [$with_liboping],     [Network latency statistics])
  AC_PLUGIN([processes],   [$plugin_processes],  [Process statistics])
  AC_PLUGIN([rrdtool],     [$with_rrdtool],      [RRDTool output plugin])
@@@ -2228,7 -2032,6 +2226,7 @@@ AC_PLUGIN([tape],        [$plugin_tape]
  AC_PLUGIN([tcpconns],    [$plugin_tcpconns],   [TCP connection statistics])
  AC_PLUGIN([unixsock],    [yes],                [Unixsock communication plugin])
  AC_PLUGIN([users],       [$plugin_users],      [User statistics])
 +AC_PLUGIN([uuid],        [yes],                [UUID as hostname plugin])
  AC_PLUGIN([vserver],     [$plugin_vserver],    [Linux VServer statistics])
  AC_PLUGIN([wireless],    [$plugin_wireless],   [Wireless statistics])
  AC_PLUGIN([xmms],        [$with_libxmms],      [XMMS statistics])
@@@ -2266,11 -2069,6 +2264,11 @@@ AC_SUBST(PERL_BINDINGS_OPTIONS
  
  AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
  
 +if test "x$with_rrdtool" = "xyes" -a "x$librrd_threadsafe" != "xyes"
 +then
 +	with_rrdtool="yes (warning: librrd is not thread-safe)"
 +fi
 +
  if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes"
  then
  	with_liboping="yes (shipped version)"
@@@ -2309,8 -2107,6 +2307,8 @@@ Configuration
      libsensors  . . . . $with_lm_sensors
      libstatgrab . . . . $with_libstatgrab
      libupsclient  . . . $with_libupsclient
 +    libvirt . . . . . . $with_libvirt
 +    libxml2 . . . . . . $with_libxml2
      libxmms . . . . . . $with_libxmms
  
    Features:
@@@ -2339,7 -2135,6 +2337,7 @@@
      iptables  . . . . . $enable_iptables
      ipvs  . . . . . . . $enable_ipvs
      irq . . . . . . . . $enable_irq
 +    libvirt . . . . . . $enable_libvirt
      load  . . . . . . . $enable_load
      logfile . . . . . . $enable_logfile
      mbmon . . . . . . . $enable_mbmon
@@@ -2366,7 -2161,6 +2364,7 @@@
      tcpconns  . . . . . $enable_tcpconns
      unixsock  . . . . . $enable_unixsock
      users . . . . . . . $enable_users
 +    uuid  . . . . . . . $enable_uuid
      vserver . . . . . . $enable_vserver
      wireless  . . . . . $enable_wireless
      xmms  . . . . . . . $enable_xmms
diff --combined src/collectd-unixsock.pod
index d17852a7,e282d986..23396256
--- a/src/collectd-unixsock.pod
+++ b/src/collectd-unixsock.pod
@@@ -83,12 -83,12 +83,12 @@@ plugin within collectd. I<type> identif
  (i.E<nbsp>e. data-set) passed to collectd. A large list of predefined
  data-sets is available in the B<types.db> file.
  
- The I<OptionList> is an optional list of I<Options>, where each option if a
+ The I<OptionList> is an optional list of I<Options>, where each option is a
  key-value-pair. A list of currently understood options can be found below, all
  other options will be ignored.
  
  I<Valuelist> is a colon-separated list of the time and the values, each either
- an integer if the data-source is a counter, of a double if the data-source if
+ an integer if the data-source is a counter, or a double if the data-source is
  of type "gauge". You can submit an undefined gauge-value by using B<U>. When
  submitting B<U> to a counter the behavior is undefined. The time is given as
  epoch (i.E<nbsp>e. standard UNIX time).
@@@ -116,64 -116,6 +116,64 @@@ Example
    -> | PUTVAL testhost/interface/if_octets-test0 interval=10 1179574444:123:456
    <- | 0 Success
  
 +=item B<PUTNOTIF> [I<OptionList>] B<message=>I<Message>
 +
 +Submits a notification to the daemon which will then dispatch it to all plugins
 +which have registered for receiving notifications. 
 +
 +The B<PUTNOTIF> if followed by a list of options which further describe the
 +notification. The B<message> option is special in that it will consume the rest
 +of the line as its value. The B<message>, B<severity>, and B<time> options are
 +mandatory.
 +
 +Valid options are:
 +
 +=over 4
 +
 +=item B<message=>I<Message> (B<REQUIRED>)
 +
 +Sets the message of the notification. This is the message that will be made
 +accessible to the user, so it should contain some useful information. This
 +option must be the last option because the rest of the line will be its value,
 +even if there are spaces and equal-signs following it! This option is
 +mandatory.
 +
 +=item B<severity=failure>|B<warning>|B<okay> (B<REQUIRED>)
 +
 +Sets the severity of the notification. This option is mandatory.
 +
 +=item B<time=>I<Time> (B<REQUIRED>)
 +
 +Sets the time of the notification. The time is given as "epoch", i.E<nbsp>e. as
 +seconds since January 1st, 1970, 00:00:00. This option is mandatory.
 +
 +=item B<host=>I<Hostname>
 +
 +=item B<plugin=>I<Plugin>
 +
 +=item B<plugin_instance=>I<Plugin-Instance>
 +
 +=item B<type=>I<Type>
 +
 +=item B<type_instance=>I<Type-Instance>
 +
 +These "associative" options establish a relation between this notification and
 +collected performance data. This connection is purely informal, i.E<nbsp>e. the
 +daemon itself doesn't do anything with this information. However, websites or
 +GUIs may use this information to place notifications near the affected graph or
 +table. All the options are optional, but B<plugin_instance> without B<plugin>
 +or B<type_instance> without B<type> doesn't make much sense and should be
 +avoided.
 +
 +Please note that this is the same format as used in the B<exec plugin>, see
 +L<collectd-exec(5)>.
 +
 +=back
 +
 +Example:
 +  -> | PUTNOTIF type=temperature severity=warning time=1201094702 message=The roof is on fire!
 +  <- | 0 Success
 +
  =back
  
  =head2 Identifiers
diff --combined src/liboconfig/parser.y
index 8df2c6e5,d237273c..49cd139d
--- a/src/liboconfig/parser.y
+++ b/src/liboconfig/parser.y
@@@ -1,6 -1,6 +1,6 @@@
  /**
   * oconfig - src/parser.y
 - * Copyright (C) 2007  Florian octo Forster <octo at verplant.org>
 + * Copyright (C) 2007,2008  Florian octo Forster <octo at verplant.org>
   *
   * This program is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License as published by the
@@@ -30,6 -30,7 +30,7 @@@ extern int yylineno
  extern char *yytext;
  
  extern oconfig_item_t *ci_root;
+ extern char           *c_file;
  %}
  
  %start entire_file
@@@ -64,6 -65,9 +65,9 @@@
  %type <sl> statement_list
  %type <ci> entire_file
  
+ /* pass an verbose, specific error message to yyerror() */
+ %error-verbose
+ 
  %%
  string:
  	QUOTED_STRING		{$$ = unquote ($1);}
@@@ -108,12 -112,6 +112,12 @@@ option
  	;
  
  block_begin:
 +	OPENBRAC identifier CLOSEBRAC EOL
 +	{
 +	 memset (&$$, '\0', sizeof ($$));
 +	 $$.key = $2;
 +	}
 +	|
  	OPENBRAC identifier argument_list CLOSEBRAC EOL
  	{
  	 memset (&$$, '\0', sizeof ($$));
@@@ -156,7 -154,7 +160,7 @@@ statement_list
  	statement_list statement
  	{
  	 $$ = $1;
 -	 if ($2.values_num > 0)
 +	 if (($2.values_num > 0) || ($2.children_num > 0))
  	 {
  		 $$.statement_num++;
  		 $$.statement = realloc ($$.statement, $$.statement_num * sizeof (oconfig_item_t));
@@@ -165,7 -163,7 +169,7 @@@
  	}
  	| statement
  	{
 -	 if ($1.values_num > 0)
 +	 if (($1.values_num > 0) || ($1.children_num > 0))
  	 {
  		 $$.statement = malloc (sizeof (oconfig_item_t));
  		 $$.statement[0] = $1;
@@@ -192,7 -190,15 +196,15 @@@ entire_file
  %%
  static int yyerror (const char *s)
  {
- 	fprintf (stderr, "Error in line %i near `%s': %s\n", yylineno, yytext, s);
+ 	char *text;
+ 
+ 	if (*yytext == '\n')
+ 		text = "<newline>";
+ 	else
+ 		text = yytext;
+ 
+ 	fprintf (stderr, "Parse error in file `%s', line %i near `%s': %s\n",
+ 		c_file, yylineno, text, s);
  	return (-1);
  } /* int yyerror */
  
@@@ -210,8 -216,8 +222,8 @@@ static char *unquote (const char *orig
  	if ((len < 2) || (ret[0] != '"') || (ret[len - 1] != '"'))
  		return (ret);
  
 -	ret++;
  	len -= 2;
 +	memmove (ret, ret + 1, len);
  	ret[len] = '\0';
  
  	for (i = 0; i < len; i++)
diff --combined src/perl.c
index d17551ee,02837578..96e85622
--- a/src/perl.c
+++ b/src/perl.c
@@@ -1,6 -1,6 +1,6 @@@
  /**
   * collectd - src/perl.c
-  * Copyright (C) 2007  Sebastian Harl
+  * Copyright (C) 2007, 2008  Sebastian Harl
   *
   * This program is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License as published by the
@@@ -24,9 -24,6 +24,9 @@@
   * interface for collectd plugins written in perl.
   */
  
 +/* do not automatically get the thread specific perl interpreter */
 +#define PERL_NO_GET_CONTEXT
 +
  #include "collectd.h"
  
  #include "configfile.h"
@@@ -45,24 -42,13 +45,24 @@@
  #include "plugin.h"
  #include "common.h"
  
 +#include <pthread.h>
 +
 +#if !defined(USE_ITHREADS)
 +# error "Perl does not support ithreads!"
 +#endif /* !defined(USE_ITHREADS) */
 +
 +/* clear the Perl sub's stack frame
 + * (this should only be used inside an XSUB) */
 +#define CLEAR_STACK_FRAME PL_stack_sp = PL_stack_base + *PL_markstack_ptr
 +
  #define PLUGIN_INIT     0
  #define PLUGIN_READ     1
  #define PLUGIN_WRITE    2
  #define PLUGIN_SHUTDOWN 3
  #define PLUGIN_LOG      4
 +#define PLUGIN_NOTIF    5
  
 -#define PLUGIN_TYPES    5
 +#define PLUGIN_TYPES    6
  
  #define PLUGIN_DATASET  255
  
@@@ -77,47 -63,15 +77,47 @@@ void boot_DynaLoader (PerlInterpreter *
  static XS (Collectd_plugin_register_ds);
  static XS (Collectd_plugin_unregister_ds);
  static XS (Collectd_plugin_dispatch_values);
 +static XS (Collectd_plugin_dispatch_notification);
  static XS (Collectd_plugin_log);
 +static XS (Collectd_call_by_name);
 +
 +/*
 + * private data types
 + */
 +
 +typedef struct c_ithread_s {
 +	/* the thread's Perl interpreter */
 +	PerlInterpreter *interp;
 +
 +	/* double linked list of threads */
 +	struct c_ithread_s *prev;
 +	struct c_ithread_s *next;
 +} c_ithread_t;
 +
 +typedef struct {
 +	c_ithread_t *head;
 +	c_ithread_t *tail;
 +
 +#if COLLECT_DEBUG
 +	/* some usage stats */
 +	int number_of_threads;
 +#endif /* COLLECT_DEBUG */
 +
 +	pthread_mutex_t mutex;
 +} c_ithread_list_t;
  
  /*
   * private variables
   */
  
 -static PerlInterpreter *perl = NULL;
 +/* if perl_threads != NULL perl_threads->head must
 + * point to the "base" thread */
 +static c_ithread_list_t *perl_threads = NULL;
 +
 +/* the key used to store each pthread's ithread */
 +static pthread_key_t perl_thr_key;
  
 -static int  perl_argc   = 0;
 +static int    perl_argc = 0;
  static char **perl_argv = NULL;
  
  static char base_name[DATA_MAX_NAME_LEN] = "";
@@@ -130,10 -84,7 +130,10 @@@ 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_dispatch_notification",
 +		Collectd_plugin_dispatch_notification },
  	{ "Collectd::plugin_log",                 Collectd_plugin_log },
 +	{ "Collectd::call_by_name",               Collectd_call_by_name },
  	{ "", NULL }
  };
  
@@@ -147,7 -98,6 +147,7 @@@ struct 
  	{ "Collectd::TYPE_WRITE",      PLUGIN_WRITE },
  	{ "Collectd::TYPE_SHUTDOWN",   PLUGIN_SHUTDOWN },
  	{ "Collectd::TYPE_LOG",        PLUGIN_LOG },
 +	{ "Collectd::TYPE_NOTIF",      PLUGIN_NOTIF },
  	{ "Collectd::TYPE_DATASET",    PLUGIN_DATASET },
  	{ "Collectd::DS_TYPE_COUNTER", DS_TYPE_COUNTER },
  	{ "Collectd::DS_TYPE_GAUGE",   DS_TYPE_GAUGE },
@@@ -156,30 -106,9 +156,30 @@@
  	{ "Collectd::LOG_NOTICE",      LOG_NOTICE },
  	{ "Collectd::LOG_INFO",        LOG_INFO },
  	{ "Collectd::LOG_DEBUG",       LOG_DEBUG },
 +	{ "Collectd::NOTIF_FAILURE",   NOTIF_FAILURE },
 +	{ "Collectd::NOTIF_WARNING",   NOTIF_WARNING },
 +	{ "Collectd::NOTIF_OKAY",      NOTIF_OKAY },
  	{ "", 0 }
  };
  
 +struct {
 +	char  name[64];
 +	char *var;
 +} g_strings[] =
 +{
 +	{ "Collectd::hostname_g", hostname_g },
 +	{ "", NULL }
 +};
 +
 +struct {
 +	char  name[64];
 +	int  *var;
 +} g_integers[] =
 +{
 +	{ "Collectd::interval_g", &interval_g },
 +	{ "", NULL }
 +};
 +
  /*
   * Helper functions for data type conversion.
   */
@@@ -196,14 -125,14 +196,14 @@@
   *   ...
   * ]
   */
 -static int hv2data_source (HV *hash, data_source_t *ds)
 +static int hv2data_source (pTHX_ HV *hash, data_source_t *ds)
  {
  	SV **tmp = NULL;
  
  	if ((NULL == hash) || (NULL == ds))
  		return -1;
  
 -	if (NULL != (tmp = Perl_hv_fetch (perl, hash, "name", 4, 0))) {
 +	if (NULL != (tmp = hv_fetch (hash, "name", 4, 0))) {
  		strncpy (ds->name, SvPV_nolen (*tmp), DATA_MAX_NAME_LEN);
  		ds->name[DATA_MAX_NAME_LEN - 1] = '\0';
  	}
@@@ -212,7 -141,7 +212,7 @@@
  		return -1;
  	}
  
 -	if (NULL != (tmp = Perl_hv_fetch (perl, hash, "type", 4, 0))) {
 +	if (NULL != (tmp = hv_fetch (hash, "type", 4, 0))) {
  		ds->type = SvIV (*tmp);
  
  		if ((DS_TYPE_COUNTER != ds->type) && (DS_TYPE_GAUGE != ds->type)) {
@@@ -224,19 -153,19 +224,19 @@@
  		ds->type = DS_TYPE_COUNTER;
  	}
  
 -	if (NULL != (tmp = Perl_hv_fetch (perl, hash, "min", 3, 0)))
 +	if (NULL != (tmp = hv_fetch (hash, "min", 3, 0)))
  		ds->min = SvNV (*tmp);
  	else
  		ds->min = NAN;
  
 -	if (NULL != (tmp = Perl_hv_fetch (perl, hash, "max", 3, 0)))
 +	if (NULL != (tmp = hv_fetch (hash, "max", 3, 0)))
  		ds->max = SvNV (*tmp);
  	else
  		ds->max = NAN;
  	return 0;
  } /* static data_source_t *hv2data_source (HV *) */
  
 -static int av2value (char *name, AV *array, value_t *value, int len)
 +static int av2value (pTHX_ char *name, AV *array, value_t *value, int len)
  {
  	const data_set_t *ds;
  
@@@ -245,8 -174,8 +245,8 @@@
  	if ((NULL == name) || (NULL == array) || (NULL == value))
  		return -1;
  
 -	if (Perl_av_len (perl, array) < len - 1)
 -		len = Perl_av_len (perl, array) + 1;
 +	if (av_len (array) < len - 1)
 +		len = av_len (array) + 1;
  
  	if (0 >= len)
  		return -1;
@@@ -263,7 -192,7 +263,7 @@@
  	}
  
  	for (i = 0; i < len; ++i) {
 -		SV **tmp = Perl_av_fetch (perl, array, i, 0);
 +		SV **tmp = av_fetch (array, i, 0);
  
  		if (NULL != tmp) {
  			if (DS_TYPE_COUNTER == ds->ds[i].type)
@@@ -278,42 -207,44 +278,42 @@@
  	return len;
  } /* static int av2value (char *, AV *, value_t *, int) */
  
 -static int data_set2av (data_set_t *ds, AV *array)
 +static int data_set2av (pTHX_ data_set_t *ds, AV *array)
  {
  	int i = 0;
  
  	if ((NULL == ds) || (NULL == array))
  		return -1;
  
 -	Perl_av_extend (perl, array, ds->ds_num);
 +	av_extend (array, ds->ds_num);
  
  	for (i = 0; i < ds->ds_num; ++i) {
 -		HV *source = Perl_newHV (perl);
 +		HV *source = newHV ();
  
 -		if (NULL == Perl_hv_store (perl, source, "name", 4,
 -				Perl_newSVpv (perl, ds->ds[i].name, 0), 0))
 +		if (NULL == hv_store (source, "name", 4,
 +				newSVpv (ds->ds[i].name, 0), 0))
  			return -1;
  
 -		if (NULL == Perl_hv_store (perl, source, "type", 4,
 -				Perl_newSViv (perl, ds->ds[i].type), 0))
 +		if (NULL == hv_store (source, "type", 4, newSViv (ds->ds[i].type), 0))
  			return -1;
  
  		if (! isnan (ds->ds[i].min))
 -			if (NULL == Perl_hv_store (perl, source, "min", 3,
 -					Perl_newSVnv (perl, ds->ds[i].min), 0))
 +			if (NULL == hv_store (source, "min", 3,
 +					newSVnv (ds->ds[i].min), 0))
  				return -1;
  
  		if (! isnan (ds->ds[i].max))
 -			if (NULL == Perl_hv_store (perl, source, "max", 3,
 -					Perl_newSVnv (perl, ds->ds[i].max), 0))
 +			if (NULL == hv_store (source, "max", 3,
 +					newSVnv (ds->ds[i].max), 0))
  				return -1;
  
 -		if (NULL == Perl_av_store (perl, array, i,
 -				Perl_newRV_noinc (perl, (SV *)source)))
 +		if (NULL == av_store (array, i, newRV_noinc ((SV *)source)))
  			return -1;
  	}
  	return 0;
  } /* static int data_set2av (data_set_t *, AV *) */
  
 -static int value_list2hv (value_list_t *vl, data_set_t *ds, HV *hash)
 +static int value_list2hv (pTHX_ value_list_t *vl, data_set_t *ds, HV *hash)
  {
  	AV *values = NULL;
  
@@@ -330,87 -261,54 +330,87 @@@
  		len = ds->ds_num;
  	}
  
 -	values = Perl_newAV (perl);
 -	Perl_av_extend (perl, values, len - 1);
 +	values = newAV ();
 +	av_extend (values, len - 1);
  
  	for (i = 0; i < len; ++i) {
  		SV *val = NULL;
  
  		if (DS_TYPE_COUNTER == ds->ds[i].type)
 -			val = Perl_newSViv (perl, vl->values[i].counter);
 +			val = newSViv (vl->values[i].counter);
  		else
 -			val = Perl_newSVnv (perl, vl->values[i].gauge);
 +			val = newSVnv (vl->values[i].gauge);
  
 -		if (NULL == Perl_av_store (perl, values, i, val)) {
 -			Perl_av_undef (perl, values);
 +		if (NULL == av_store (values, i, val)) {
 +			av_undef (values);
  			return -1;
  		}
  	}
  
 -	if (NULL == Perl_hv_store (perl, hash, "values", 6,
 -			Perl_newRV_noinc (perl, (SV *)values), 0))
 +	if (NULL == hv_store (hash, "values", 6, newRV_noinc ((SV *)values), 0))
  		return -1;
  
  	if (0 != vl->time)
 -		if (NULL == Perl_hv_store (perl, hash, "time", 4,
 -				Perl_newSViv (perl, vl->time), 0))
 +		if (NULL == hv_store (hash, "time", 4, newSViv (vl->time), 0))
  			return -1;
  
  	if ('\0' != vl->host[0])
 -		if (NULL == Perl_hv_store (perl, hash, "host", 4,
 -				Perl_newSVpv (perl, vl->host, 0), 0))
 +		if (NULL == hv_store (hash, "host", 4, newSVpv (vl->host, 0), 0))
  			return -1;
  
  	if ('\0' != vl->plugin[0])
 -		if (NULL == Perl_hv_store (perl, hash, "plugin", 6,
 -				Perl_newSVpv (perl, vl->plugin, 0), 0))
 +		if (NULL == hv_store (hash, "plugin", 6, newSVpv (vl->plugin, 0), 0))
  			return -1;
  
  	if ('\0' != vl->plugin_instance[0])
 -		if (NULL == Perl_hv_store (perl, hash, "plugin_instance", 15,
 -				Perl_newSVpv (perl, vl->plugin_instance, 0), 0))
 +		if (NULL == hv_store (hash, "plugin_instance", 15,
 +				newSVpv (vl->plugin_instance, 0), 0))
  			return -1;
  
  	if ('\0' != vl->type_instance[0])
 -		if (NULL == Perl_hv_store (perl, hash, "type_instance", 13,
 -				Perl_newSVpv (perl, vl->type_instance, 0), 0))
 +		if (NULL == hv_store (hash, "type_instance", 13,
 +				newSVpv (vl->type_instance, 0), 0))
  			return -1;
  	return 0;
  } /* static int value2av (value_list_t *, data_set_t *, HV *) */
  
 +static int notification2hv (pTHX_ notification_t *n, HV *hash)
 +{
 +	if (NULL == hv_store (hash, "severity", 8, newSViv (n->severity), 0))
 +		return -1;
 +
 +	if (0 != n->time)
 +		if (NULL == hv_store (hash, "time", 4, newSViv (n->time), 0))
 +			return -1;
 +
 +	if ('\0' != *n->message)
 +		if (NULL == hv_store (hash, "message", 7, newSVpv (n->message, 0), 0))
 +			return -1;
 +
 +	if ('\0' != *n->host)
 +		if (NULL == hv_store (hash, "host", 4, newSVpv (n->host, 0), 0))
 +			return -1;
 +
 +	if ('\0' != *n->plugin)
 +		if (NULL == hv_store (hash, "plugin", 6, newSVpv (n->plugin, 0), 0))
 +			return -1;
 +
 +	if ('\0' != *n->plugin_instance)
 +		if (NULL == hv_store (hash, "plugin_instance", 15,
 +				newSVpv (n->plugin_instance, 0), 0))
 +			return -1;
 +
 +	if ('\0' != *n->type)
 +		if (NULL == hv_store (hash, "type", 4, newSVpv (n->type, 0), 0))
 +			return -1;
 +
 +	if ('\0' != *n->type_instance)
 +		if (NULL == hv_store (hash, "type_instance", 13,
 +				newSVpv (n->type_instance, 0), 0))
 +			return -1;
 +	return 0;
 +} /* static int notification2hv (notification_t *, HV *) */
 +
  /*
   * Internal functions.
   */
@@@ -421,7 -319,7 +421,7 @@@ static char *get_module_name (char *buf
  		status = snprintf (buf, buf_len, "%s", module);
  	else
  		status = snprintf (buf, buf_len, "%s::%s", base_name, module);
 -	if ((status < 0) || (status >= buf_len))
 +	if ((status < 0) || ((unsigned int)status >= buf_len))
  		return (NULL);
  	buf[buf_len - 1] = '\0';
  	return (buf);
@@@ -430,10 -328,9 +430,10 @@@
  /*
   * Add a plugin's data set definition.
   */
 -static int pplugin_register_data_set (char *name, AV *dataset)
 +static int pplugin_register_data_set (pTHX_ char *name, AV *dataset)
  {
  	int len = -1;
 +	int ret = 0;
  	int i   = 0;
  
  	data_source_t *ds  = NULL;
@@@ -442,7 -339,7 +442,7 @@@
  	if ((NULL == name) || (NULL == dataset))
  		return -1;
  
 -	len = Perl_av_len (perl, dataset);
 +	len = av_len (dataset);
  
  	if (-1 == len)
  		return -1;
@@@ -451,7 -348,7 +451,7 @@@
  	set = (data_set_t *)smalloc (sizeof (data_set_t));
  
  	for (i = 0; i <= len; ++i) {
 -		SV **elem = Perl_av_fetch (perl, dataset, i, 0);
 +		SV **elem = av_fetch (dataset, i, 0);
  
  		if (NULL == elem)
  			return -1;
@@@ -461,7 -358,7 +461,7 @@@
  			return -1;
  		}
  
 -		if (-1 == hv2data_source ((HV *)SvRV (*elem), &ds[i]))
 +		if (-1 == hv2data_source (aTHX_ (HV *)SvRV (*elem), &ds[i]))
  			return -1;
  
  		log_debug ("pplugin_register_data_set: "
@@@ -474,12 -371,7 +474,12 @@@
  
  	set->ds_num = len + 1;
  	set->ds = ds;
 -	return plugin_register_data_set (set);
 +
 +	ret = plugin_register_data_set (set);
 +
 +	free (ds);
 +	free (set);
 +	return ret;
  } /* static int pplugin_register_data_set (char *, SV *) */
  
  /*
@@@ -505,7 -397,7 +505,7 @@@ static int pplugin_unregister_data_set 
   *   type_instance   => $tinstance,
   * }
   */
 -static int pplugin_dispatch_values (char *name, HV *values)
 +static int pplugin_dispatch_values (pTHX_ char *name, HV *values)
  {
  	value_list_t list = VALUE_LIST_INIT;
  	value_t      *val = NULL;
@@@ -517,7 -409,7 +517,7 @@@
  	if ((NULL == name) || (NULL == values))
  		return -1;
  
 -	if ((NULL == (tmp = Perl_hv_fetch (perl, values, "values", 6, 0)))
 +	if ((NULL == (tmp = hv_fetch (values, "values", 6, 0)))
  			|| (! (SvROK (*tmp) && (SVt_PVAV == SvTYPE (SvRV (*tmp)))))) {
  		log_err ("pplugin_dispatch_values: No valid values given.");
  		return -1;
@@@ -525,14 -417,14 +525,14 @@@
  
  	{
  		AV  *array = (AV *)SvRV (*tmp);
 -		int len    = Perl_av_len (perl, array) + 1;
 +		int len    = av_len (array) + 1;
  
  		if (len <= 0)
  			return -1;
  
  		val = (value_t *)smalloc (len * sizeof (value_t));
  
 -		list.values_len = av2value (name, (AV *)SvRV (*tmp), val, len);
 +		list.values_len = av2value (aTHX_ name, (AV *)SvRV (*tmp), val, len);
  		list.values = val;
  
  		if (-1 == list.values_len) {
@@@ -541,14 -433,14 +541,14 @@@
  		}
  	}
  
 -	if (NULL != (tmp = Perl_hv_fetch (perl, values, "time", 4, 0))) {
 +	if (NULL != (tmp = hv_fetch (values, "time", 4, 0))) {
  		list.time = (time_t)SvIV (*tmp);
  	}
  	else {
  		list.time = time (NULL);
  	}
  
 -	if (NULL != (tmp = Perl_hv_fetch (perl, values, "host", 4, 0))) {
 +	if (NULL != (tmp = hv_fetch (values, "host", 4, 0))) {
  		strncpy (list.host, SvPV_nolen (*tmp), DATA_MAX_NAME_LEN);
  		list.host[DATA_MAX_NAME_LEN - 1] = '\0';
  	}
@@@ -556,17 -448,18 +556,17 @@@
  		strcpy (list.host, hostname_g);
  	}
  
 -	if (NULL != (tmp = Perl_hv_fetch (perl, values, "plugin", 6, 0))) {
 +	if (NULL != (tmp = hv_fetch (values, "plugin", 6, 0))) {
  		strncpy (list.plugin, SvPV_nolen (*tmp), DATA_MAX_NAME_LEN);
  		list.plugin[DATA_MAX_NAME_LEN - 1] = '\0';
  	}
  
 -	if (NULL != (tmp = Perl_hv_fetch (perl, values,
 -			"plugin_instance", 15, 0))) {
 +	if (NULL != (tmp = hv_fetch (values, "plugin_instance", 15, 0))) {
  		strncpy (list.plugin_instance, SvPV_nolen (*tmp), DATA_MAX_NAME_LEN);
  		list.plugin_instance[DATA_MAX_NAME_LEN - 1] = '\0';
  	}
  
 -	if (NULL != (tmp = Perl_hv_fetch (perl, values, "type_instance", 13, 0))) {
 +	if (NULL != (tmp = hv_fetch (values, "type_instance", 13, 0))) {
  		strncpy (list.type_instance, SvPV_nolen (*tmp), DATA_MAX_NAME_LEN);
  		list.type_instance[DATA_MAX_NAME_LEN - 1] = '\0';
  	}
@@@ -577,75 -470,10 +577,75 @@@
  	return ret;
  } /* static int pplugin_dispatch_values (char *, HV *) */
  
 +/*
 + * Dispatch a notification.
 + *
 + * notification:
 + * {
 + *   severity => $severity,
 + *   time     => $time,
 + *   message  => $msg,
 + *   host     => $host,
 + *   plugin   => $plugin,
 + *   type     => $type,
 + *   plugin_instance => $instance,
 + *   type_instance   => $type_instance
 + * }
 + */
 +static int pplugin_dispatch_notification (pTHX_ HV *notif)
 +{
 +	notification_t n;
 +
 +	SV **tmp = NULL;
 +
 +	if (NULL == notif)
 +		return -1;
 +
 +	memset (&n, 0, sizeof (n));
 +
 +	if (NULL != (tmp = hv_fetch (notif, "severity", 8, 0)))
 +		n.severity = SvIV (*tmp);
 +	else
 +		n.severity = NOTIF_FAILURE;
 +
 +	if (NULL != (tmp = hv_fetch (notif, "time", 4, 0)))
 +		n.time = (time_t)SvIV (*tmp);
 +	else
 +		n.time = time (NULL);
 +
 +	if (NULL != (tmp = hv_fetch (notif, "message", 7, 0)))
 +		strncpy (n.message, SvPV_nolen (*tmp), sizeof (n.message));
 +	n.message[sizeof (n.message) - 1] = '\0';
 +
 +	if (NULL != (tmp = hv_fetch (notif, "host", 4, 0)))
 +		strncpy (n.host, SvPV_nolen (*tmp), sizeof (n.host));
 +	else
 +		strncpy (n.host, hostname_g, sizeof (n.host));
 +	n.host[sizeof (n.host) - 1] = '\0';
 +
 +	if (NULL != (tmp = hv_fetch (notif, "plugin", 6, 0)))
 +		strncpy (n.plugin, SvPV_nolen (*tmp), sizeof (n.plugin));
 +	n.plugin[sizeof (n.plugin) - 1] = '\0';
 +
 +	if (NULL != (tmp = hv_fetch (notif, "plugin_instance", 15, 0)))
 +		strncpy (n.plugin_instance, SvPV_nolen (*tmp),
 +				sizeof (n.plugin_instance));
 +	n.plugin_instance[sizeof (n.plugin_instance) - 1] = '\0';
 +
 +	if (NULL != (tmp = hv_fetch (notif, "type", 4, 0)))
 +		strncpy (n.type, SvPV_nolen (*tmp), sizeof (n.type));
 +	n.type[sizeof (n.type) - 1] = '\0';
 +
 +	if (NULL != (tmp = hv_fetch (notif, "type_instance", 13, 0)))
 +		strncpy (n.type_instance, SvPV_nolen (*tmp), sizeof (n.type_instance));
 +	n.type_instance[sizeof (n.type_instance) - 1] = '\0';
 +	return plugin_dispatch_notification (&n);
 +} /* static int pplugin_dispatch_notification (HV *) */
 +
  /*
   * Call all working functions of the given type.
   */
 -static int pplugin_call_all (int type, ...)
 +static int pplugin_call_all (pTHX_ int type, ...)
  {
  	int retvals = 0;
  
@@@ -664,7 -492,7 +664,7 @@@
  
  	PUSHMARK (SP);
  
 -	XPUSHs (sv_2mortal (Perl_newSViv (perl, (IV)type)));
 +	XPUSHs (sv_2mortal (newSViv ((IV)type)));
  
  	if (PLUGIN_WRITE == type) {
  		/*
@@@ -694,29 -522,21 +694,29 @@@
  		data_set_t   *ds;
  		value_list_t *vl;
  
 -		AV *pds = Perl_newAV (perl);
 -		HV *pvl = Perl_newHV (perl);
 +		AV *pds = newAV ();
 +		HV *pvl = newHV ();
  
  		ds = va_arg (ap, data_set_t *);
  		vl = va_arg (ap, value_list_t *);
  
 -		if (-1 == data_set2av (ds, pds))
 -			return -1;
 +		if (-1 == data_set2av (aTHX_ ds, pds)) {
 +			av_clear (pds);
 +			av_undef (pds);
 +			pds = Nullav;
 +			ret = -1;
 +		}
  
 -		if (-1 == value_list2hv (vl, ds, pvl))
 -			return -1;
 +		if (-1 == value_list2hv (aTHX_ vl, ds, pvl)) {
 +			hv_clear (pvl);
 +			hv_undef (pvl);
 +			pvl = Nullhv;
 +			ret = -1;
 +		}
  
 -		XPUSHs (sv_2mortal (Perl_newSVpv (perl, ds->type, 0)));
 -		XPUSHs (sv_2mortal (Perl_newRV_noinc (perl, (SV *)pds)));
 -		XPUSHs (sv_2mortal (Perl_newRV_noinc (perl, (SV *)pvl)));
 +		XPUSHs (sv_2mortal (newSVpv (ds->type, 0)));
 +		XPUSHs (sv_2mortal (newRV_noinc ((SV *)pds)));
 +		XPUSHs (sv_2mortal (newRV_noinc ((SV *)pvl)));
  	}
  	else if (PLUGIN_LOG == type) {
  		/*
@@@ -724,41 -544,13 +724,41 @@@
  		 *
  		 * $_[1] = $message;
  		 */
 -		XPUSHs (sv_2mortal (Perl_newSViv (perl, va_arg (ap, int))));
 -		XPUSHs (sv_2mortal (Perl_newSVpv (perl, va_arg (ap, char *), 0)));
 +		XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
 +		XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
 +	}
 +	else if (PLUGIN_NOTIF == type) {
 +		/*
 +		 * $_[0] =
 +		 * {
 +		 *   severity => $severity,
 +		 *   time     => $time,
 +		 *   message  => $msg,
 +		 *   host     => $host,
 +		 *   plugin   => $plugin,
 +		 *   type     => $type,
 +		 *   plugin_instance => $instance,
 +		 *   type_instance   => $type_instance
 +		 * };
 +		 */
 +		notification_t *n;
 +		HV *notif = newHV ();
 +
 +		n = va_arg (ap, notification_t *);
 +
 +		if (-1 == notification2hv (aTHX_ n, notif)) {
 +			hv_clear (notif);
 +			hv_undef (notif);
 +			notif = Nullhv;
 +			ret = -1;
 +		}
 +
 +		XPUSHs (sv_2mortal (newRV_noinc ((SV *)notif)));
  	}
  
  	PUTBACK;
  
 -	retvals = Perl_call_pv (perl, "Collectd::plugin_call_all", G_SCALAR);
 +	retvals = call_pv ("Collectd::plugin_call_all", G_SCALAR);
  
  	SPAGAIN;
  	if (0 < retvals) {
@@@ -807,7 -599,7 +807,7 @@@ static XS (Collectd_plugin_register_ds
  	data = ST (1);
  
  	if (SvROK (data) && (SVt_PVAV == SvTYPE (SvRV (data)))) {
 -		ret = pplugin_register_data_set (SvPV_nolen (ST (0)),
 +		ret = pplugin_register_data_set (aTHX_ SvPV_nolen (ST (0)),
  				(AV *)SvRV (data));
  	}
  	else {
@@@ -839,7 -631,7 +839,7 @@@ static XS (Collectd_plugin_unregister_d
  	log_debug ("Collectd::plugin_unregister_data_set: type = \"%s\"",
  			SvPV_nolen (ST (0)));
  
 -	if (0 == pplugin_unregister_data_set (SvPV_nolen (ST (1))))
 +	if (0 == pplugin_unregister_data_set (SvPV_nolen (ST (0))))
  		XSRETURN_YES;
  	else
  		XSRETURN_EMPTY;
@@@ -881,8 -673,7 +881,8 @@@ static XS (Collectd_plugin_dispatch_val
  	if ((NULL == ST (0)) || (NULL == values))
  		XSRETURN_EMPTY;
  
 -	ret = pplugin_dispatch_values (SvPV_nolen (ST (0)), (HV *)SvRV (values));
 +	ret = pplugin_dispatch_values (aTHX_ SvPV_nolen (ST (0)),
 +			(HV *)SvRV (values));
  
  	if (0 == ret)
  		XSRETURN_YES;
@@@ -890,43 -681,6 +890,43 @@@
  		XSRETURN_EMPTY;
  } /* static XS (Collectd_plugin_dispatch_values) */
  
 +/*
 + * Collectd::plugin_dispatch_notification (notif).
 + *
 + * notif:
 + *   notification to dispatch
 + */
 +static XS (Collectd_plugin_dispatch_notification)
 +{
 +	SV *notif = NULL;
 +
 +	int ret = 0;
 +
 +	dXSARGS;
 +
 +	if (1 != items) {
 +		log_err ("Usage: Collectd::plugin_dispatch_notification(notif)");
 +		XSRETURN_EMPTY;
 +	}
 +
 +	log_debug ("Collectd::plugin_dispatch_notification: notif = \"%s\"",
 +			SvPV_nolen (ST (0)));
 +
 +	notif = ST (0);
 +
 +	if (! (SvROK (notif) && (SVt_PVHV == SvTYPE (SvRV (notif))))) {
 +		log_err ("Collectd::plugin_dispatch_notification: Invalid notif.");
 +		XSRETURN_EMPTY;
 +	}
 +
 +	ret = pplugin_dispatch_notification (aTHX_ (HV *)SvRV (notif));
 +
 +	if (0 == ret)
 +		XSRETURN_YES;
 +	else
 +		XSRETURN_EMPTY;
 +} /* static XS (Collectd_plugin_dispatch_notification) */
 +
  /*
   * Collectd::plugin_log (level, message).
   *
@@@ -949,305 -703,71 +949,305 @@@ static XS (Collectd_plugin_log
  	XSRETURN_YES;
  } /* static XS (Collectd_plugin_log) */
  
 +/*
 + * Collectd::call_by_name (...).
 + *
 + * Call a Perl sub identified by its name passed through $Collectd::cb_name.
 + */
 +static XS (Collectd_call_by_name)
 +{
 +	SV   *tmp  = NULL;
 +	char *name = NULL;
 +
 +	if (NULL == (tmp = get_sv ("Collectd::cb_name", 0))) {
 +		sv_setpv (get_sv ("@", 1), "cb_name has not been set");
 +		CLEAR_STACK_FRAME;
 +		return;
 +	}
 +
 +	name = SvPV_nolen (tmp);
 +
 +	if (NULL == get_cv (name, 0)) {
 +		sv_setpvf (get_sv ("@", 1), "unknown callback \"%s\"", name);
 +		CLEAR_STACK_FRAME;
 +		return;
 +	}
 +
 +	/* simply pass on the subroutine call without touching the stack,
 +	 * thus leaving any arguments and return values in place */
 +	call_pv (name, 0);
 +} /* static XS (Collectd_call_by_name) */
 +
 +/*
 + * collectd's perl interpreter based thread implementation.
 + *
 + * This has been inspired by Perl's ithreads introduced in version 5.6.0.
 + */
 +
 +/* must be called with perl_threads->mutex locked */
 +static void c_ithread_destroy (c_ithread_t *ithread)
 +{
 +	dTHXa (ithread->interp);
 +
 +	assert (NULL != perl_threads);
 +
 +	PERL_SET_CONTEXT (aTHX);
 +	log_debug ("Shutting down Perl interpreter %p...", aTHX);
 +
 +#if COLLECT_DEBUG
 +	sv_report_used ();
 +
 +	--perl_threads->number_of_threads;
 +#endif /* COLLECT_DEBUG */
 +
 +	perl_destruct (aTHX);
 +	perl_free (aTHX);
 +
 +	if (NULL == ithread->prev)
 +		perl_threads->head = ithread->next;
 +	else
 +		ithread->prev->next = ithread->next;
 +
 +	if (NULL == ithread->next)
 +		perl_threads->tail = ithread->prev;
 +	else
 +		ithread->next->prev = ithread->prev;
 +
 +	sfree (ithread);
 +	return;
 +} /* static void c_ithread_destroy (c_ithread_t *) */
 +
 +static void c_ithread_destructor (void *arg)
 +{
 +	c_ithread_t *ithread = (c_ithread_t *)arg;
 +	c_ithread_t *t = NULL;
 +
 +	if (NULL == perl_threads)
 +		return;
 +
 +	pthread_mutex_lock (&perl_threads->mutex);
 +
 +	for (t = perl_threads->head; NULL != t; t = t->next)
 +		if (t == ithread)
 +			break;
 +
 +	/* the ithread no longer exists */
 +	if (NULL == t)
 +		return;
 +
 +	c_ithread_destroy (ithread);
 +
 +	pthread_mutex_unlock (&perl_threads->mutex);
 +	return;
 +} /* static void c_ithread_destructor (void *) */
 +
 +/* must be called with perl_threads->mutex locked */
 +static c_ithread_t *c_ithread_create (PerlInterpreter *base)
 +{
 +	c_ithread_t *t = NULL;
 +	dTHXa (NULL);
 +
 +	assert (NULL != perl_threads);
 +
 +	t = (c_ithread_t *)smalloc (sizeof (c_ithread_t));
 +	memset (t, 0, sizeof (c_ithread_t));
 +
 +	t->interp = (NULL == base)
 +		? NULL
 +		: perl_clone (base, CLONEf_KEEP_PTR_TABLE);
 +
 +	aTHX = t->interp;
 +
 +	if (NULL != base) {
 +		av_clear (PL_endav);
 +		av_undef (PL_endav);
 +		PL_endav = Nullav;
 +	}
 +
 +#if COLLECT_DEBUG
 +	++perl_threads->number_of_threads;
 +#endif /* COLLECT_DEBUG */
 +
 +	t->next = NULL;
 +
 +	if (NULL == perl_threads->tail) {
 +		perl_threads->head = t;
 +		t->prev = NULL;
 +	}
 +	else {
 +		perl_threads->tail->next = t;
 +		t->prev = perl_threads->tail;
 +	}
 +
 +	perl_threads->tail = t;
 +
 +	pthread_setspecific (perl_thr_key, (const void *)t);
 +	return t;
 +} /* static c_ithread_t *c_ithread_create (PerlInterpreter *) */
 +
  /*
   * Interface to collectd.
   */
  
  static int perl_init (void)
  {
 -	if (NULL == perl)
 +	dTHX;
 +
 +	if (NULL == perl_threads)
  		return 0;
  
 -	PERL_SET_CONTEXT (perl);
 -	return pplugin_call_all (PLUGIN_INIT);
 +	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;
 +	}
 +
 +	log_debug ("perl_init: c_ithread: interp = %p (active threads: %i)",
 +			aTHX, perl_threads->number_of_threads);
 +	return pplugin_call_all (aTHX_ PLUGIN_INIT);
  } /* static int perl_init (void) */
  
  static int perl_read (void)
  {
 -	if (NULL == perl)
 +	dTHX;
 +
 +	if (NULL == perl_threads)
  		return 0;
  
 -	PERL_SET_CONTEXT (perl);
 -	return pplugin_call_all (PLUGIN_READ);
 +	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;
 +	}
 +
 +	log_debug ("perl_read: c_ithread: interp = %p (active threads: %i)",
 +			aTHX, perl_threads->number_of_threads);
 +	return pplugin_call_all (aTHX_ PLUGIN_READ);
  } /* static int perl_read (void) */
  
  static int perl_write (const data_set_t *ds, const value_list_t *vl)
  {
 -	if (NULL == perl)
 +	dTHX;
 +
 +	if (NULL == perl_threads)
  		return 0;
  
 -	PERL_SET_CONTEXT (perl);
 -	return pplugin_call_all (PLUGIN_WRITE, ds, vl);
 +	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;
 +	}
 +
 +	log_debug ("perl_write: c_ithread: interp = %p (active threads: %i)",
 +			aTHX, perl_threads->number_of_threads);
 +	return pplugin_call_all (aTHX_ PLUGIN_WRITE, ds, vl);
  } /* static int perl_write (const data_set_t *, const value_list_t *) */
  
  static void perl_log (int level, const char *msg)
  {
 -	if (NULL == perl)
 +	dTHX;
 +
 +	if (NULL == perl_threads)
  		return;
  
 -	PERL_SET_CONTEXT (perl);
 -	pplugin_call_all (PLUGIN_LOG, level, msg);
 +	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;
 +	}
 +
 +	pplugin_call_all (aTHX_ PLUGIN_LOG, level, msg);
  	return;
  } /* static void perl_log (int, const char *) */
  
 +static int perl_notify (const notification_t *notif)
 +{
 +	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_NOTIF, notif);
 +} /* static int perl_notify (const notification_t *) */
 +
  static int perl_shutdown (void)
  {
 +	c_ithread_t *t = NULL;
 +
  	int ret = 0;
  
 +	dTHX;
 +
  	plugin_unregister_complex_config ("perl");
  
 -	if (NULL == perl)
 +	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;
 +	}
 +
 +	log_debug ("perl_shutdown: c_ithread: interp = %p (active threads: %i)",
 +			aTHX, perl_threads->number_of_threads);
 +
  	plugin_unregister_log ("perl");
 +	plugin_unregister_notification ("perl");
  	plugin_unregister_init ("perl");
  	plugin_unregister_read ("perl");
  	plugin_unregister_write ("perl");
  
 -	PERL_SET_CONTEXT (perl);
 -	ret = pplugin_call_all (PLUGIN_SHUTDOWN);
 +	ret = pplugin_call_all (aTHX_ PLUGIN_SHUTDOWN);
  
 -#if COLLECT_DEBUG
 -	Perl_sv_report_used (perl);
 -#endif /* COLLECT_DEBUG */
 +	pthread_mutex_lock (&perl_threads->mutex);
 +	t = perl_threads->tail;
 +
 +	while (NULL != t) {
 +		c_ithread_t *thr = t;
  
 -	perl_destruct (perl);
 -	perl_free (perl);
 -	perl = NULL;
 +		/* the pointer has to be advanced before destroying
 +		 * the thread as this will free the memory */
 +		t = t->prev;
 +
 +		c_ithread_destroy (thr);
 +	}
 +
 +	pthread_mutex_unlock (&perl_threads->mutex);
 +	pthread_mutex_destroy (&perl_threads->mutex);
 +
 +	sfree (perl_threads);
 +
 +	pthread_key_delete (perl_thr_key);
  
  	PERL_SYS_TERM ();
  
@@@ -1255,50 -775,10 +1255,50 @@@
  	return ret;
  } /* static void perl_shutdown (void) */
  
 +/*
 + * Access functions for global variables.
 + *
 + * These functions implement the "magic" used to access
 + * the global variables from Perl.
 + */
 +
 +static int g_pv_get (pTHX_ SV *var, MAGIC *mg)
 +{
 +	char *pv = mg->mg_ptr;
 +	sv_setpv (var, pv);
 +	return 0;
 +} /* static int g_pv_get (pTHX_ SV *, MAGIC *) */
 +
 +static int g_pv_set (pTHX_ SV *var, MAGIC *mg)
 +{
 +	char *pv = mg->mg_ptr;
 +	strncpy (pv, SvPV_nolen (var), DATA_MAX_NAME_LEN);
 +	pv[DATA_MAX_NAME_LEN - 1] = '\0';
 +	return 0;
 +} /* static int g_pv_set (pTHX_ SV *, MAGIC *) */
 +
 +static int g_iv_get (pTHX_ SV *var, MAGIC *mg)
 +{
 +	int *iv = (int *)mg->mg_ptr;
 +	sv_setiv (var, *iv);
 +	return 0;
 +} /* static int g_iv_get (pTHX_ SV *, MAGIC *) */
 +
 +static int g_iv_set (pTHX_ SV *var, MAGIC *mg)
 +{
 +	int *iv = (int *)mg->mg_ptr;
 +	*iv = (int)SvIV (var);
 +	return 0;
 +} /* static int g_iv_set (pTHX_ SV *, MAGIC *) */
 +
 +static MGVTBL g_pv_vtbl = { g_pv_get, g_pv_set, NULL, NULL, NULL, NULL, NULL };
 +static MGVTBL g_iv_vtbl = { g_iv_get, g_iv_set, NULL, NULL, NULL, NULL, NULL };
 +
  /* bootstrap the Collectd module */
  static void xs_init (pTHX)
  {
  	HV   *stash = NULL;
 +	SV   *tmp   = NULL;
  	char *file  = __FILE__;
  
  	int i = 0;
@@@ -1306,45 -786,25 +1306,45 @@@
  	dXSUB_SYS;
  
  	/* enable usage of Perl modules using shared libraries */
 -	Perl_newXS (perl, "DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
 +	newXS ("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
  
  	/* register API */
  	for (i = 0; NULL != api[i].f; ++i)
 -		Perl_newXS (perl, api[i].name, api[i].f, file);
 +		newXS (api[i].name, api[i].f, file);
  
 -	stash = Perl_gv_stashpv (perl, "Collectd", 1);
 +	stash = gv_stashpv ("Collectd", 1);
  
  	/* export "constants" */
  	for (i = 0; '\0' != constants[i].name[0]; ++i)
 -		Perl_newCONSTSUB (perl, stash, constants[i].name,
 -				Perl_newSViv (perl, constants[i].value));
 +		newCONSTSUB (stash, constants[i].name, newSViv (constants[i].value));
 +
 +	/* export global variables
 +	 * by adding "magic" to the SV's representing the globale variables
 +	 * perl is able to automagically call the get/set function when
 +	 * accessing any such variable (this is basically the same as using
 +	 * tie() in Perl) */
 +	/* global strings */
 +	for (i = 0; '\0' != g_strings[i].name[0]; ++i) {
 +		tmp = get_sv (g_strings[i].name, 1);
 +		sv_magicext (tmp, NULL, PERL_MAGIC_ext, &g_pv_vtbl,
 +				g_strings[i].var, 0);
 +	}
 +
 +	/* global integers */
 +	for (i = 0; '\0' != g_integers[i].name[0]; ++i) {
 +		tmp = get_sv (g_integers[i].name, 1);
 +		sv_magicext (tmp, NULL, PERL_MAGIC_ext, &g_iv_vtbl,
 +				(char *)g_integers[i].var, 0);
 +	}
  	return;
  } /* static void xs_init (pTHX) */
  
  /* Initialize the global Perl interpreter. */
  static int init_pi (int argc, char **argv)
  {
 -	if (NULL != perl)
 +	dTHXa (NULL);
 +
 +	if (NULL != perl_threads)
  		return 0;
  
  	log_info ("Initializing Perl interpreter...");
@@@ -1357,50 -817,27 +1357,50 @@@
  	}
  #endif /* COLLECT_DEBUG */
  
 +	if (0 != pthread_key_create (&perl_thr_key, c_ithread_destructor)) {
 +		log_err ("init_pi: pthread_key_create failed");
 +
 +		/* this must not happen - cowardly giving up if it does */
 +		exit (1);
 +	}
 +
  	PERL_SYS_INIT3 (&argc, &argv, &environ);
  
 -	if (NULL == (perl = perl_alloc ())) {
 -		log_err ("module_register: Not enough memory.");
 +	perl_threads = (c_ithread_list_t *)smalloc (sizeof (c_ithread_list_t));
 +	memset (perl_threads, 0, sizeof (c_ithread_list_t));
 +
 +	pthread_mutex_init (&perl_threads->mutex, NULL);
 +	/* locking the mutex should not be necessary at this point
 +	 * but let's just do it for the sake of completeness */
 +	pthread_mutex_lock (&perl_threads->mutex);
 +
 +	perl_threads->head = c_ithread_create (NULL);
 +	perl_threads->tail = perl_threads->head;
 +
 +	if (NULL == (perl_threads->head->interp = perl_alloc ())) {
 +		log_err ("init_pi: Not enough memory.");
  		exit (3);
  	}
 -	perl_construct (perl);
 +
 +	aTHX = perl_threads->head->interp;
 +	pthread_mutex_unlock (&perl_threads->mutex);
 +
 +	perl_construct (aTHX);
  
  	PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
  
 -	if (0 != perl_parse (perl, xs_init, argc, argv, NULL)) {
 -		log_err ("module_register: Unable to bootstrap Collectd.");
 +	if (0 != perl_parse (aTHX_ xs_init, argc, argv, NULL)) {
 +		log_err ("init_pi: Unable to bootstrap Collectd.");
  		exit (1);
  	}
  
  	/* Set $0 to "collectd" because perl_parse() has to set it to "-e". */
 -	Perl_sv_setpv (perl, Perl_get_sv (perl, "0", 0), "collectd");
 +	sv_setpv (get_sv ("0", 0), "collectd");
  
 -	perl_run (perl);
 +	perl_run (aTHX);
  
  	plugin_register_log ("perl", perl_log);
 +	plugin_register_notification ("perl", perl_notify);
  	plugin_register_init ("perl", perl_init);
  
  	plugin_register_read ("perl", perl_read);
@@@ -1413,17 -850,15 +1413,17 @@@
  /*
   * LoadPlugin "<Plugin>"
   */
 -static int perl_config_loadplugin (oconfig_item_t *ci)
 +static int perl_config_loadplugin (pTHX_ oconfig_item_t *ci)
  {
  	char module_name[DATA_MAX_NAME_LEN];
  
  	char *value = NULL;
  
  	if ((0 != ci->children_num) || (1 != ci->values_num)
 -			|| (OCONFIG_TYPE_STRING != ci->values[0].type))
 +			|| (OCONFIG_TYPE_STRING != ci->values[0].type)) {
 +		log_err ("LoadPlugin expects a single string argument.");
  		return 1;
 +	}
  
  	value = ci->values[0].value.string;
  
@@@ -1433,29 -868,24 +1433,29 @@@
  	}
  
  	init_pi (perl_argc, perl_argv);
 +	assert (NULL != perl_threads);
 +	assert (NULL != perl_threads->head);
 +
 +	aTHX = perl_threads->head->interp;
  
  	log_debug ("perl_config: loading perl plugin \"%s\"", value);
 -	Perl_load_module (perl, PERL_LOADMOD_NOIMPORT,
 -			Perl_newSVpv (perl, module_name, strlen (module_name)),
 -			Nullsv);
 +	load_module (PERL_LOADMOD_NOIMPORT,
 +			newSVpv (module_name, strlen (module_name)), Nullsv);
  	return 0;
  } /* static int perl_config_loadplugin (oconfig_item_it *) */
  
  /*
   * BaseName "<Name>"
   */
 -static int perl_config_basename (oconfig_item_t *ci)
 +static int perl_config_basename (pTHX_ oconfig_item_t *ci)
  {
  	char *value = NULL;
  
  	if ((0 != ci->children_num) || (1 != ci->values_num)
 -			|| (OCONFIG_TYPE_STRING != ci->values[0].type))
 +			|| (OCONFIG_TYPE_STRING != ci->values[0].type)) {
 +		log_err ("BaseName expects a single string argument.");
  		return 1;
 +	}
  
  	value = ci->values[0].value.string;
  
@@@ -1468,20 -898,13 +1468,20 @@@
  /*
   * EnableDebugger "<Package>"|""
   */
 -static int perl_config_enabledebugger (oconfig_item_t *ci)
 +static int perl_config_enabledebugger (pTHX_ oconfig_item_t *ci)
  {
  	char *value = NULL;
  
  	if ((0 != ci->children_num) || (1 != ci->values_num)
 -			|| (OCONFIG_TYPE_STRING != ci->values[0].type))
 +			|| (OCONFIG_TYPE_STRING != ci->values[0].type)) {
 +		log_err ("EnableDebugger expects a single string argument.");
 +		return 1;
 +	}
 +
 +	if (NULL != perl_threads) {
 +		log_warn ("EnableDebugger has no effects if used after LoadPlugin.");
  		return 1;
 +	}
  
  	value = ci->values[0].value.string;
  
@@@ -1509,19 -932,22 +1509,19 @@@
  /*
   * IncludeDir "<Dir>"
   */
 -static int perl_config_includedir (oconfig_item_t *ci)
 +static int perl_config_includedir (pTHX_ oconfig_item_t *ci)
  {
  	char *value = NULL;
  
  	if ((0 != ci->children_num) || (1 != ci->values_num)
 -			|| (OCONFIG_TYPE_STRING != ci->values[0].type))
 -		return 1;
 -
 -	if (NULL == aTHX) {
 -		log_warn ("EnableDebugger has no effects if used after LoadPlugin.");
 +			|| (OCONFIG_TYPE_STRING != ci->values[0].type)) {
 +		log_err ("IncludeDir expects a single string argument.");
  		return 1;
  	}
  
  	value = ci->values[0].value.string;
  
 -	if (NULL == perl) {
 +	if (NULL == aTHX) {
  		perl_argv = (char **)realloc (perl_argv,
  				(++perl_argc + 1) * sizeof (char *));
  
@@@ -1538,8 -964,9 +1538,8 @@@
  	}
  	else {
  		/* prepend the directory to @INC */
 -		Perl_av_unshift (perl, GvAVn (PL_incgv), 1);
 -		Perl_av_store (perl, GvAVn (PL_incgv),
 -				0, Perl_newSVpv (perl, value, strlen (value)));
 +		av_unshift (GvAVn (PL_incgv), 1);
 +		av_store (GvAVn (PL_incgv), 0, newSVpv (value, strlen (value)));
  	}
  	return 0;
  } /* static int perl_config_includedir (oconfig_item_it *) */
@@@ -1548,24 -975,17 +1548,24 @@@ static int perl_config (oconfig_item_t 
  {
  	int i = 0;
  
 +	dTHX;
 +
 +	/* dTHX does not get any valid values in case Perl
 +	 * has not been initialized */
 +	if (NULL == perl_threads)
 +		aTHX = NULL;
 +
  	for (i = 0; i < ci->children_num; ++i) {
  		oconfig_item_t *c = ci->children + i;
  
  		if (0 == strcasecmp (c->key, "LoadPlugin"))
 -			perl_config_loadplugin (c);
 +			perl_config_loadplugin (aTHX_ c);
  		else if (0 == strcasecmp (c->key, "BaseName"))
 -			perl_config_basename (c);
 +			perl_config_basename (aTHX_ c);
  		else if (0 == strcasecmp (c->key, "EnableDebugger"))
 -			perl_config_enabledebugger (c);
 +			perl_config_enabledebugger (aTHX_ c);
  		else if (0 == strcasecmp (c->key, "IncludeDir"))
 -			perl_config_includedir (c);
 +			perl_config_includedir (aTHX_ c);
  		else
  			log_warn ("Ignoring unknown config key \"%s\".", c->key);
  	}