From 82f6ebad0250c0b8cd0cdf7453fe427fd7b38135 Mon Sep 17 00:00:00 2001 From: Pavel Rochnyack Date: Fri, 13 May 2016 14:50:31 +0600 Subject: [PATCH] perl plugin: lock base thread interpreter in perl_init() too. Avoid race conditions with c_ithread_create() called from threads of already-initialized plugins. Fix for https://github.com/collectd/collectd/issues/1706. --- src/perl.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/perl.c b/src/perl.c index 41e763dc..4daa7621 100644 --- a/src/perl.c +++ b/src/perl.c @@ -1,4 +1,4 @@ -/** +/* * collectd - src/perl.c * Copyright (C) 2007-2009 Sebastian Harl * @@ -1886,6 +1886,7 @@ static XS (Collectd_call_by_name) static int perl_init (void) { + int status; dTHX; if (NULL == perl_threads) @@ -1903,7 +1904,19 @@ static int perl_init (void) log_debug ("perl_init: c_ithread: interp = %p (active threads: %i)", aTHX, perl_threads->number_of_threads); - return pplugin_call_all (aTHX_ PLUGIN_INIT); + + /* Lock the base thread to avoid race conditions with c_ithread_create(). + * See https://github.com/collectd/collectd/issues/9 and + * https://github.com/collectd/collectd/issues/1706 for details. */ + + assert (aTHX == perl_threads->head->interp); + pthread_mutex_lock (&perl_threads->mutex); + + status = pplugin_call_all (aTHX_ PLUGIN_INIT); + + pthread_mutex_unlock (&perl_threads->mutex); + + return status; } /* static int perl_init (void) */ static int perl_read (void) -- 2.30.2