projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7' into collectd-5.8
[collectd.git]
/
src
/
perl.c
diff --git
a/src/perl.c
b/src/perl.c
index
9268086
..
671d1f3
100644
(file)
--- a/
src/perl.c
+++ b/
src/perl.c
@@
-2093,7
+2093,7
@@
static int perl_init(void) {
/* 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.
/* 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);
assert(aTHX == perl_threads->head->interp);
pthread_mutex_lock(&perl_threads->mutex);
@@
-2184,7
+2184,7
@@
static void perl_log(int level, const char *msg, user_data_t *user_data) {
/* Lock the base thread if this is not called from one of the read threads
* to avoid race conditions with c_ithread_create(). See
* https://github.com/collectd/collectd/issues/9 for details.
/* Lock the base thread if this is not called from one of the read threads
* to avoid race conditions with c_ithread_create(). See
* https://github.com/collectd/collectd/issues/9 for details.
- */
+
*/
if (aTHX == perl_threads->head->interp)
pthread_mutex_lock(&perl_threads->mutex);
if (aTHX == perl_threads->head->interp)
pthread_mutex_lock(&perl_threads->mutex);
@@
-2343,14
+2343,25
@@
static int g_interval_set(pTHX_ SV *var, MAGIC *mg) {
return 0;
} /* static int g_interval_set (pTHX_ SV *, MAGIC *) */
return 0;
} /* static int g_interval_set (pTHX_ SV *, MAGIC *) */
-static MGVTBL g_pv_vtbl = {g_pv_get, g_pv_set, NULL, NULL, NULL, NULL, NULL
+static MGVTBL g_pv_vtbl = {g_pv_get,
+ g_pv_set,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL
#if HAVE_PERL_STRUCT_MGVTBL_SVT_LOCAL
,
NULL
#endif
};
#if HAVE_PERL_STRUCT_MGVTBL_SVT_LOCAL
,
NULL
#endif
};
-static MGVTBL g_interval_vtbl = {g_interval_get, g_interval_set, NULL, NULL,
- NULL, NULL, NULL
+static MGVTBL g_interval_vtbl = {g_interval_get,
+ g_interval_set,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL
#if HAVE_PERL_STRUCT_MGVTBL_SVT_LOCAL
,
NULL
#if HAVE_PERL_STRUCT_MGVTBL_SVT_LOCAL
,
NULL
@@
-2385,8
+2396,8
@@
static void xs_init(pTHX) {
* tie() in Perl) */
/* global strings */
struct {
* tie() in Perl) */
/* global strings */
struct {
-
char name[64];
-
char *var;
+ char name[64];
+ char *var;
} g_strings[] = {{"Collectd::hostname_g", hostname_g}, {"", NULL}};
for (int i = 0; '\0' != g_strings[i].name[0]; ++i) {
} g_strings[] = {{"Collectd::hostname_g", hostname_g}, {"", NULL}};
for (int i = 0; '\0' != g_strings[i].name[0]; ++i) {