From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 15 May 2018 15:05:18 +0000 (+0200)
Subject: Merge branch 'collectd-5.8'
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=614660f40c32b5af9b6c4852e4e370fc3953a5c8;hp=-c

Merge branch 'collectd-5.8'
---

614660f40c32b5af9b6c4852e4e370fc3953a5c8
diff --combined src/perl.c
index 4c6387da,8df8fd4b..306d4138
--- a/src/perl.c
+++ b/src/perl.c
@@@ -138,8 -138,8 +138,8 @@@ static int perl_flush(cdtime_t timeout
  typedef struct c_ithread_s {
    /* the thread's Perl interpreter */
    PerlInterpreter *interp;
 -  _Bool running; /* thread is inside Perl interpreter */
 -  _Bool shutdown;
 +  bool running; /* thread is inside Perl interpreter */
 +  bool shutdown;
    pthread_t pthread;
  
    /* double linked list of threads */
@@@ -183,17 -183,17 +183,17 @@@ extern char **environ
   * private variables
   */
  
 -static _Bool register_legacy_flush = 1;
 +static bool register_legacy_flush = true;
  
  /* if perl_threads != NULL perl_threads->head must
   * point to the "base" thread */
 -static c_ithread_list_t *perl_threads = NULL;
 +static c_ithread_list_t *perl_threads;
  
  /* the key used to store each pthread's ithread */
  static pthread_key_t perl_thr_key;
  
 -static int perl_argc = 0;
 -static char **perl_argv = NULL;
 +static int perl_argc;
 +static char **perl_argv;
  
  static char base_name[DATA_MAX_NAME_LEN] = "";
  
@@@ -331,12 -331,12 +331,12 @@@ static size_t av2value(pTHX_ char *name
  
    if (array_len < ds->ds_num) {
      log_warn("av2value: array does not contain enough elements for type "
 -             "\"%s\": got %zu, want %zu",
 +             "\"%s\": got %" PRIsz ", want %" PRIsz,
               name, array_len, ds->ds_num);
      return 0;
    } else if (array_len > ds->ds_num) {
      log_warn("av2value: array contains excess elements for type \"%s\": got "
 -             "%zu, want %zu",
 +             "%" PRIsz ", want %" PRIsz,
               name, array_len, ds->ds_num);
    }
  
@@@ -981,7 -981,7 +981,7 @@@ static int pplugin_dispatch_notificatio
   * Call perl sub with thread locking flags handled.
   */
  static int call_pv_locked(pTHX_ const char *sub_name) {
 -  _Bool old_running;
 +  bool old_running;
    int ret;
  
    c_ithread_t *t = (c_ithread_t *)pthread_getspecific(perl_thr_key);
@@@ -989,7 -989,7 +989,7 @@@
      return 0;
  
    old_running = t->running;
 -  t->running = 1;
 +  t->running = true;
  
    if (t->shutdown) {
      t->running = old_running;
@@@ -1189,7 -1189,7 +1189,7 @@@ static void c_ithread_destroy(c_ithread
    /* Mark as running to avoid deadlock:
       c_ithread_destroy -> log_debug -> perl_log()
    */
 -  ithread->running = 1;
 +  ithread->running = true;
    log_debug("Shutting down Perl interpreter %p...", aTHX);
  
  #if COLLECT_DEBUG
@@@ -1275,8 -1275,8 +1275,8 @@@ static c_ithread_t *c_ithread_create(Pe
    }
  
    t->pthread = pthread_self();
 -  t->running = 0;
 -  t->shutdown = 0;
 +  t->running = false;
 +  t->shutdown = false;
    perl_threads->tail = t;
  
    pthread_setspecific(perl_thr_key, (const void *)t);
@@@ -1642,23 -1642,23 +1642,23 @@@ static void _plugin_register_generic_us
   */
  
  static XS(Collectd_plugin_register_read) {
-   return _plugin_register_generic_userdata(aTHX, PLUGIN_READ, "read");
+   _plugin_register_generic_userdata(aTHX, PLUGIN_READ, "read");
  }
  
  static XS(Collectd_plugin_register_write) {
-   return _plugin_register_generic_userdata(aTHX, PLUGIN_WRITE, "write");
+   _plugin_register_generic_userdata(aTHX, PLUGIN_WRITE, "write");
  }
  
  static XS(Collectd_plugin_register_log) {
-   return _plugin_register_generic_userdata(aTHX, PLUGIN_LOG, "log");
+   _plugin_register_generic_userdata(aTHX, PLUGIN_LOG, "log");
  }
  
  static XS(Collectd_plugin_register_notification) {
-   return _plugin_register_generic_userdata(aTHX, PLUGIN_NOTIF, "notification");
+   _plugin_register_generic_userdata(aTHX, PLUGIN_NOTIF, "notification");
  }
  
  static XS(Collectd_plugin_register_flush) {
-   return _plugin_register_generic_userdata(aTHX, PLUGIN_FLUSH, "flush");
+   _plugin_register_generic_userdata(aTHX, PLUGIN_FLUSH, "flush");
  }
  
  typedef int perl_unregister_function_t(const char *name);
@@@ -1685,8 -1685,6 +1685,6 @@@ static void _plugin_unregister_generic(
    unreg(SvPV_nolen(ST(0)));
  
    XSRETURN_EMPTY;
- 
-   return;
  } /* static void _plugin_unregister_generic ( ... ) */
  
  /*
@@@ -1700,24 -1698,24 +1698,24 @@@
   */
  
  static XS(Collectd_plugin_unregister_read) {
-   return _plugin_unregister_generic(aTHX, plugin_unregister_read, "read");
+   _plugin_unregister_generic(aTHX, plugin_unregister_read, "read");
  }
  
  static XS(Collectd_plugin_unregister_write) {
-   return _plugin_unregister_generic(aTHX, plugin_unregister_write, "write");
+   _plugin_unregister_generic(aTHX, plugin_unregister_write, "write");
  }
  
  static XS(Collectd_plugin_unregister_log) {
-   return _plugin_unregister_generic(aTHX, plugin_unregister_log, "log");
+   _plugin_unregister_generic(aTHX, plugin_unregister_log, "log");
  }
  
  static XS(Collectd_plugin_unregister_notification) {
-   return _plugin_unregister_generic(aTHX, plugin_unregister_notification,
-                                     "notification");
+   _plugin_unregister_generic(aTHX, plugin_unregister_notification,
+                              "notification");
  }
  
  static XS(Collectd_plugin_unregister_flush) {
-   return _plugin_unregister_generic(aTHX, plugin_unregister_flush, "flush");
+   _plugin_unregister_generic(aTHX, plugin_unregister_flush, "flush");
  }
  
  /*
@@@ -2276,7 -2274,7 +2274,7 @@@ static int perl_shutdown(void) 
       * the thread as this will free the memory */
      t = t->prev;
  
 -    thr->shutdown = 1;
 +    thr->shutdown = true;
      if (thr->running) {
        /* Give some time to thread to exit from Perl interpreter */
        WARNING("perl shutdown: Thread is running inside Perl. Waiting.");