Merge pull request #1737 from rubenk/pthread-cleanup

Pthread cleanup

diff --git a/configure.ac b/configure.ac
index 8232a0e..7d5c292 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1603,45 +1603,21 @@ if test "x$with_libhal" = "xyes"; then
        fi
 fi
 
-# --with-libpthread {{{
-AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Path to libpthread.])],
-[      if test "x$withval" != "xno" \
-               && test "x$withval" != "xyes"
-       then
-               LDFLAGS="$LDFLAGS -L$withval/lib"
-               CPPFLAGS="$CPPFLAGS -I$withval/include"
-               with_libpthread="yes"
-       else
-               if test "x$withval" = "xno"
-               then
-                       with_libpthread="no (disabled)"
-               fi
-       fi
-], [with_libpthread="yes"])
+SAVE_LIBS="$LIBS"
+AC_CHECK_LIB([pthread],
+  [pthread_create],
+  [],
+  [AC_MSG_ERROR([Symbol 'pthread_create' not found in libpthread"])],
+  []
+)
+PTHREAD_LIBS="$LIBS"
+LIBS="$SAVE_LIBS"
 
+AC_CHECK_HEADERS([pthread.h],
+  [],
+  [AC_MSG_ERROR([pthread.h not found])]
+)
 AC_SUBST([PTHREAD_LIBS])
-if test "x$with_libpthread" = "xyes"
-then
-       SAVE_LIBS="$LIBS"
-       AC_CHECK_LIB(pthread, pthread_create, [], [with_libpthread="no (Symbol 'pthread_create' not found)"], [])
-       PTHREAD_LIBS="$LIBS"
-       LIBS="$SAVE_LIBS"
-fi
-
-if test "x$with_libpthread" = "xyes"
-then
-       AC_CHECK_HEADERS(pthread.h,, [with_libpthread="no (pthread.h not found)"])
-fi
-if test "x$with_libpthread" = "xyes"
-then
-       collect_pthread=1
-else
-       collect_pthread=0
-fi
-AC_DEFINE_UNQUOTED(HAVE_LIBPTHREAD, [$collect_pthread],
-       [Wether or not to use pthread (POSIX threads) library])
-AM_CONDITIONAL(BUILD_WITH_LIBPTHREAD, test "x$with_libpthread" = "xyes")
-# }}}
 
 m4_divert_once([HELP_WITH], [
 collectd additional packages:])
@@ -6215,7 +6191,6 @@ Configuration:
     libperfstat . . . . . $with_perfstat
     libperl . . . . . . . $with_libperl
     libpq . . . . . . . . $with_libpq
-    libpthread  . . . . . $with_libpthread
     librabbitmq . . . . . $with_librabbitmq
     libriemann-client . . $with_libriemann_client
     librdkafka  . . . . . $with_librdkafka

diff --git a/src/Makefile.am b/src/Makefile.am
index 1bf3961..bf0c62b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,6 +85,7 @@ collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) \
        -I$(top_srcdir)/src/libcollectdclient/collectd \
        -I$(top_builddir)/src/libcollectdclient/collectd
 collectd_tg_LDADD = \
+       $(PTHREAD_LIBS) \
        daemon/libheap.la \
        libcollectdclient/libcollectdclient.la
 if BUILD_WITH_LIBSOCKET
@@ -96,9 +97,6 @@ endif
 if BUILD_AIX
 collectd_tg_LDADD += -lm
 endif
-if BUILD_WITH_LIBPTHREAD
-collectd_tg_LDADD += $(PTHREAD_LIBS)
-endif
 
 
 pkglib_LTLIBRARIES =
@@ -341,7 +339,7 @@ if BUILD_PLUGIN_DNS
 pkglib_LTLIBRARIES += dns.la
 dns_la_SOURCES = dns.c utils_dns.c utils_dns.h
 dns_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-dns_la_LIBADD = $(PTHREAD_LIBS) -lpcap
+dns_la_LIBADD = -lpcap
 endif
 
 if BUILD_PLUGIN_DRBD
@@ -354,7 +352,6 @@ if BUILD_PLUGIN_EMAIL
 pkglib_LTLIBRARIES += email.la
 email_la_SOURCES = email.c
 email_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-email_la_LIBADD = $(PTHREAD_LIBS)
 endif
 
 if BUILD_PLUGIN_ENTROPY
@@ -370,7 +367,6 @@ exec_la_SOURCES = exec.c \
                  utils_cmd_putval.c utils_cmd_putval.h \
                  utils_parse_option.h utils_parse_option.c
 exec_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-exec_la_LIBADD = $(PTHREAD_LIBS)
 endif
 
 if BUILD_PLUGIN_ETHSTAT
@@ -475,7 +471,7 @@ java_la_SOURCES = java.c
 java_la_CPPFLAGS = $(AM_CPPFLAGS) $(JAVA_CPPFLAGS)
 java_la_CFLAGS = $(AM_CFLAGS) $(JAVA_CFLAGS)
 java_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(JAVA_LDFLAGS)
-java_la_LIBADD = $(PTHREAD_LIBS) $(JAVA_LIBS)
+java_la_LIBADD = $(JAVA_LIBS)
 endif
 
 if BUILD_PLUGIN_LOAD
@@ -673,7 +669,7 @@ network_la_SOURCES = network.c network.h \
                     utils_fbhash.c utils_fbhash.h
 network_la_CPPFLAGS = $(AM_CPPFLAGS)
 network_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-network_la_LIBADD = $(PTHREAD_LIBS)
+network_la_LIBADD =
 if BUILD_WITH_LIBSOCKET
 network_la_LIBADD += -lsocket
 endif
@@ -716,7 +712,7 @@ if BUILD_PLUGIN_NOTIFY_EMAIL
 pkglib_LTLIBRARIES += notify_email.la
 notify_email_la_SOURCES = notify_email.c
 notify_email_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-notify_email_la_LIBADD = $(PTHREAD_LIBS) -lesmtp -lssl -lcrypto
+notify_email_la_LIBADD = -lesmtp -lssl -lcrypto
 endif
 
 if BUILD_PLUGIN_NOTIFY_NAGIOS
@@ -746,7 +742,7 @@ pkglib_LTLIBRARIES += nut.la
 nut_la_SOURCES = nut.c
 nut_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBUPSCLIENT_CFLAGS)
 nut_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-nut_la_LIBADD = $(PTHREAD_LIBS) $(BUILD_WITH_LIBUPSCLIENT_LIBS)
+nut_la_LIBADD = $(BUILD_WITH_LIBUPSCLIENT_LIBS)
 endif
 
 if BUILD_PLUGIN_OLSRD
@@ -949,16 +945,13 @@ if BUILD_WITH_LIBNETSNMP
 snmp_la_CFLAGS += $(BUILD_WITH_LIBSNMP_CFLAGS)
 snmp_la_LIBADD += $(BUILD_WITH_LIBSNMP_LIBS)
 endif
-if BUILD_WITH_LIBPTHREAD
-snmp_la_LIBADD += $(PTHREAD_LIBS)
-endif
 endif
 
 if BUILD_PLUGIN_STATSD
 pkglib_LTLIBRARIES += statsd.la
 statsd_la_SOURCES = statsd.c
 statsd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-statsd_la_LIBADD = $(PTHREAD_LIBS) liblatency.la -lm
+statsd_la_LIBADD = liblatency.la -lm
 endif
 
 if BUILD_PLUGIN_SWAP
@@ -1109,7 +1102,6 @@ unixsock_la_SOURCES = unixsock.c \
                      utils_cmd_putnotif.h utils_cmd_putnotif.c \
                      utils_parse_option.h utils_parse_option.c
 unixsock_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-unixsock_la_LIBADD = $(PTHREAD_LIBS)
 endif
 
 if BUILD_PLUGIN_UPTIME

diff --git a/src/aggregation.c b/src/aggregation.c
index 3d5f396..c4c1627 100644 (file)
--- a/src/aggregation.c
+++ b/src/aggregation.c
@@ -26,8 +26,6 @@
 
 #include "collectd.h"
 
-#include <pthread.h>
-
 #include "plugin.h"
 #include "common.h"
 #include "configfile.h"

diff --git a/src/amqp.c b/src/amqp.c
index fc69e93..99dca90 100644 (file)
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -33,8 +33,6 @@
 #include "utils_format_json.h"
 #include "utils_format_graphite.h"
 
-#include <pthread.h>
-
 #include <amqp.h>
 #include <amqp_framing.h>
 

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 2fe42ae..d59e823 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
 AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
 
 # Link to these libraries..
-COMMON_LIBS =
+COMMON_LIBS = $(PTHREAD_LIBS)
 if BUILD_WITH_LIBRT
 COMMON_LIBS += -lrt
 endif
@@ -23,9 +23,6 @@ endif
 if BUILD_WITH_LIBRESOLV
 COMMON_LIBS += -lresolv
 endif
-if BUILD_WITH_LIBPTHREAD
-COMMON_LIBS += -lpthread
-endif
 if BUILD_WITH_LIBKSTAT
 COMMON_LIBS += -lkstat
 endif

diff --git a/src/daemon/common.c b/src/daemon/common.c
index 546da3b..f82efe3 100644 (file)
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -36,9 +36,7 @@
 #include "plugin.h"
 #include "utils_cache.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
+#include <pthread.h>
 
 #ifdef HAVE_MATH_H
 # include <math.h>

diff --git a/src/daemon/plugin.h b/src/daemon/plugin.h
index 7398227..75498c8 100644 (file)
--- a/src/daemon/plugin.h
+++ b/src/daemon/plugin.h
@@ -33,9 +33,7 @@
 #include "meta_data.h"
 #include "utils_time.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
+#include <pthread.h>
 
 #define PLUGIN_FLAGS_GLOBAL 0x0001
 

diff --git a/src/dns.c b/src/dns.c
index 53fa725..2c3a904 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -30,7 +30,6 @@
 #include "configfile.h"
 
 #include "utils_dns.h"
-#include <pthread.h>
 #include <poll.h>
 
 #include <pcap.h>

diff --git a/src/email.c b/src/email.c
index ea4e785..8a1ac2e 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -46,10 +46,6 @@
 
 #include <stddef.h>
 
-#if HAVE_LIBPTHREAD
-# include <pthread.h>
-#endif
-
 #include <sys/un.h>
 #include <sys/select.h>
 

diff --git a/src/exec.c b/src/exec.c
index 6d5908c..cdaf79a 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -38,8 +38,6 @@
 #include <grp.h>
 #include <signal.h>
 
-#include <pthread.h>
-
 #define PL_NORMAL        0x01
 #define PL_NOTIF_ACTION  0x02
 

diff --git a/src/gmond.c b/src/gmond.c
index 67e0406..53cdcbf 100644 (file)
--- a/src/gmond.c
+++ b/src/gmond.c
@@ -30,9 +30,6 @@
 #include "configfile.h"
 #include "utils_avltree.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif

diff --git a/src/ipmi.c b/src/ipmi.c
index 76dd9cb..c3aa558 100644 (file)
--- a/src/ipmi.c
+++ b/src/ipmi.c
@@ -28,8 +28,6 @@
 #include "plugin.h"
 #include "utils_ignorelist.h"
 
-#include <pthread.h>
-
 #include <OpenIPMI/ipmiif.h>
 #include <OpenIPMI/ipmi_err.h>
 #include <OpenIPMI/ipmi_posix.h>

diff --git a/src/java.c b/src/java.c
index 4187e7c..01dc1b8 100644 (file)
--- a/src/java.c
+++ b/src/java.c
@@ -26,7 +26,6 @@
 #include "common.h"
 #include "filter_chain.h"
 
-#include <pthread.h>
 #include <jni.h>
 
 #if !defined(JNI_VERSION_1_2)

diff --git a/src/log_logstash.c b/src/log_logstash.c
index 2d5f620..45aa86d 100644 (file)
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
@@ -31,7 +31,6 @@
 #include "plugin.h"
 
 #include <sys/types.h>
-#include <pthread.h>
 #include <yajl/yajl_common.h>
 #include <yajl/yajl_gen.h>
 #if HAVE_YAJL_YAJL_VERSION_H

diff --git a/src/logfile.c b/src/logfile.c
index 1179718..334226b 100644 (file)
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -30,8 +30,6 @@
 #include "common.h"
 #include "plugin.h"
 
-#include <pthread.h>
-
 #define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
 
 #if COLLECT_DEBUG

diff --git a/src/mqtt.c b/src/mqtt.c
index 0b00bab..dbef915 100644 (file)
--- a/src/mqtt.c
+++ b/src/mqtt.c
@@ -36,8 +36,6 @@
 #include "utils_cache.h"
 #include "utils_complain.h"
 
-#include <pthread.h>
-
 #include <mosquitto.h>
 
 #define MQTT_MAX_TOPIC_SIZE         1024

diff --git a/src/network.c b/src/network.c
index bf1f2ab..219f163 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -36,9 +36,6 @@
 
 #include "network.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif
@@ -56,7 +53,6 @@
 #endif
 
 #if HAVE_LIBGCRYPT
-# include <pthread.h>
 # if defined __APPLE__
 /* default xcode compiler throws warnings even when deprecated functionality
  * is not used. -Werror breaks the build because of erroneous warnings.

diff --git a/src/notify_email.c b/src/notify_email.c
index c77b2d1..0120a40 100644 (file)
--- a/src/notify_email.c
+++ b/src/notify_email.c
@@ -28,7 +28,6 @@
 
 #include <auth-client.h>
 #include <libesmtp.h>
-#include <pthread.h>
 
 #define MAXSTRING               256
 

diff --git a/src/nut.c b/src/nut.c
index 17eb1b9..a033e2f 100644 (file)
--- a/src/nut.c
+++ b/src/nut.c
@@ -28,7 +28,6 @@
 #include "common.h"
 #include "plugin.h"
 
-#include <pthread.h>
 #include <upsclient.h>
 
 #if HAVE_UPSCONN_T

diff --git a/src/perl.c b/src/perl.c
index 16db312..7d78630 100644 (file)
--- a/src/perl.c
+++ b/src/perl.c
@@ -63,8 +63,6 @@
 
 #include "filter_chain.h"
 
-#include <pthread.h>
-
 #if !defined(USE_ITHREADS)
 # error "Perl does not support ithreads!"
 #endif /* !defined(USE_ITHREADS) */

diff --git a/src/pinba.c b/src/pinba.c
index 980fbf2..cfc0777 100644 (file)
--- a/src/pinba.c
+++ b/src/pinba.c
@@ -28,7 +28,6 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#include <pthread.h>
 #include <netdb.h>
 #include <poll.h>
 

diff --git a/src/ping.c b/src/ping.c
index 88661e9..e16ba07 100644 (file)
--- a/src/ping.c
+++ b/src/ping.c
@@ -30,7 +30,6 @@
 #include "configfile.h"
 #include "utils_complain.h"
 
-#include <pthread.h>
 #include <netinet/in.h>
 #if HAVE_NETDB_H
 # include <netdb.h> /* NI_MAXHOST */

diff --git a/src/postgresql.c b/src/postgresql.c
index 759560e..41ce95c 100644 (file)
--- a/src/postgresql.c
+++ b/src/postgresql.c
@@ -40,10 +40,6 @@
 #include "utils_db_query.h"
 #include "utils_complain.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
-
 #include <pg_config_manual.h>
 #include <libpq-fe.h>
 

diff --git a/src/python.c b/src/python.c
index 1ed6dc0..61d464d 100644 (file)
--- a/src/python.c
+++ b/src/python.c
@@ -28,9 +28,6 @@
 #include <structmember.h>
 
 #include <signal.h>
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
 
 #include "collectd.h"
 #include "common.h"

diff --git a/src/redis.c b/src/redis.c
index 919a831..0814126 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -25,7 +25,6 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#include <pthread.h>
 #include <sys/time.h>
 #include <hiredis/hiredis.h>
 

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 3cd6d6b..21b01d9 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -32,10 +32,6 @@
 
 #include <rrd.h>
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
-
 /*
  * Private types
  */

diff --git a/src/sigrok.c b/src/sigrok.c
index 6c781f8..d8c65c0 100644 (file)
--- a/src/sigrok.c
+++ b/src/sigrok.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <pthread.h>
 
 #include <glib.h>
 #include <libsigrok/libsigrok.h>

diff --git a/src/snmp.c b/src/snmp.c
index 89cbc46..6a5bb8b 100644 (file)
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -29,8 +29,6 @@
 #include "plugin.h"
 #include "utils_complain.h"
 
-#include <pthread.h>
-
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 

diff --git a/src/statsd.c b/src/statsd.c
index 3c08861..1819b3e 100644 (file)
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -32,8 +32,6 @@
 #include "utils_complain.h"
 #include "utils_latency.h"
 
-#include <pthread.h>
-
 #include <sys/types.h>
 #include <netdb.h>
 #include <poll.h>

diff --git a/src/threshold.c b/src/threshold.c
index e849b1d..94a4f02 100644 (file)
--- a/src/threshold.c
+++ b/src/threshold.c
@@ -31,7 +31,6 @@
 #include "utils_threshold.h"
 
 #include <assert.h>
-#include <pthread.h>
 
 /*
  * Threshold management

diff --git a/src/unixsock.c b/src/unixsock.c
index 1840e34..d4bf004 100644 (file)
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -36,9 +36,6 @@
 #include "utils_cmd_putval.h"
 #include "utils_cmd_putnotif.h"
 
-/* Folks without pthread will need to disable this plugin. */
-#include <pthread.h>
-
 #include <sys/stat.h>
 #include <sys/un.h>
 

diff --git a/src/write_graphite.c b/src/write_graphite.c
index 0b8ab41..5acda6e 100644 (file)
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -51,9 +51,6 @@
 #include "utils_complain.h"
 #include "utils_format_graphite.h"
 
-/* Folks without pthread will need to disable this plugin. */
-#include <pthread.h>
-
 #include <netdb.h>
 
 #define WG_DEFAULT_NODE "localhost"

diff --git a/src/write_http.c b/src/write_http.c
index 8dd37c4..779c94f 100644 (file)
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -29,10 +29,6 @@
 #include "utils_cache.h"
 #include "utils_format_json.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
-
 #include <curl/curl.h>
 
 #ifndef WRITE_HTTP_DEFAULT_BUFFER_SIZE

diff --git a/src/write_kafka.c b/src/write_kafka.c
index 10ae5a5..e881593 100644 (file)
--- a/src/write_kafka.c
+++ b/src/write_kafka.c
@@ -36,7 +36,6 @@
 
 #include <stdint.h>
 #include <librdkafka/rdkafka.h>
-#include <pthread.h>
 #include <zlib.h>
 #include <errno.h>
 

diff --git a/src/write_log.c b/src/write_log.c
index ebf0e12..db09849 100644 (file)
--- a/src/write_log.c
+++ b/src/write_log.c
@@ -32,9 +32,6 @@
 
 #include "utils_format_graphite.h"
 
-/* Folks without pthread will need to disable this plugin. */
-#include <pthread.h>
-
 #include <netdb.h>
 
 #define WL_BUF_SIZE 8192

diff --git a/src/write_mongodb.c b/src/write_mongodb.c
index 9a6fdf2..fb80ba2 100644 (file)
--- a/src/write_mongodb.c
+++ b/src/write_mongodb.c
@@ -34,8 +34,6 @@
 #include "configfile.h"
 #include "utils_cache.h"
 
-#include <pthread.h>
-
 #if HAVE_STDINT_H
 # define MONGO_HAVE_STDINT 1
 #else

diff --git a/src/write_redis.c b/src/write_redis.c
index a79eb36..5c299a4 100644 (file)
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -29,7 +29,6 @@
 #include "common.h"
 #include "configfile.h"
 
-#include <pthread.h>
 #include <sys/time.h>
 #include <hiredis/hiredis.h>
 

diff --git a/src/write_riemann.c b/src/write_riemann.c
index 2936dfa..ac4e9f5 100644 (file)
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -30,7 +30,6 @@
 
 #include <riemann/riemann-client.h>
 #include <errno.h>
-#include <pthread.h>
 
 #include "collectd.h"
 #include "plugin.h"

diff --git a/src/write_sensu.c b/src/write_sensu.c
index 475354c..d37792b 100644 (file)
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <netdb.h>
 #include <inttypes.h>
-#include <pthread.h>
 #include <stddef.h>
 
 #include <stdlib.h>

diff --git a/src/write_tsdb.c b/src/write_tsdb.c
index 46028ba..2bd2707 100644 (file)
--- a/src/write_tsdb.c
+++ b/src/write_tsdb.c
@@ -48,7 +48,6 @@
 
 #include "utils_cache.h"
 
-#include <pthread.h>
 #include <netdb.h>
 
 #ifndef WT_DEFAULT_NODE