Tree wide: Move utilities and libraries to src/utils/.

This is a first step that does not yet include *all* "utils_*.c" files,
but we're getting there.

diff --git a/Makefile.am b/Makefile.am
index 9bb22fc509a2db12e537182078b8e7d6c091c288..83613b0ba0ead9fc5c6df3efda1f3b532d203e93 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -236,8 +236,8 @@ collectd_SOURCES = \
        src/daemon/filter_chain.h \
        src/daemon/globals.c \
        src/daemon/globals.h \
-       src/daemon/meta_data.c \
-       src/daemon/meta_data.h \
+       src/utils/metadata/meta_data.c \
+       src/utils/metadata/meta_data.h \
        src/daemon/plugin.c \
        src/daemon/plugin.h \
        src/daemon/utils_cache.c \
@@ -341,22 +341,22 @@ endif
 
 
 test_common_SOURCES = \
-       src/daemon/common_test.c \
+       src/utils/common/common_test.c \
        src/testing.h
 test_common_LDADD = libplugin_mock.la
 
 test_meta_data_SOURCES = \
-       src/daemon/meta_data_test.c \
+       src/utils/metadata/meta_data_test.c \
        src/testing.h
 test_meta_data_LDADD = libmetadata.la libplugin_mock.la
 
 test_utils_avltree_SOURCES = \
-       src/daemon/utils_avltree_test.c \
+       src/utils/avltree/avltree_test.c \
        src/testing.h
 test_utils_avltree_LDADD = libavltree.la $(COMMON_LIBS)
 
 test_utils_heap_SOURCES = \
-       src/daemon/utils_heap_test.c \
+       src/utils/heap/heap_test.c \
        src/testing.h
 test_utils_heap_LDADD = libheap.la $(COMMON_LIBS)
 
@@ -372,30 +372,30 @@ test_utils_subst_SOURCES = \
 test_utils_subst_LDADD = libplugin_mock.la
 
 test_utils_config_cores_SOURCES = \
-       src/utils_config_cores_test.c \
+       src/utils/config_cores/config_cores_test.c \
        src/testing.h
 test_utils_config_cores_LDADD = libplugin_mock.la
 
 libavltree_la_SOURCES = \
-       src/daemon/utils_avltree.c \
-       src/daemon/utils_avltree.h
+       src/utils/avltree/avltree.c \
+       src/utils/avltree/avltree.h
 
 libcommon_la_SOURCES = \
-       src/daemon/common.c \
-       src/daemon/common.h
+       src/utils/common/common.c \
+       src/utils/common/common.h
 libcommon_la_LIBADD = $(COMMON_LIBS)
 
 libheap_la_SOURCES = \
-       src/daemon/utils_heap.c \
-       src/daemon/utils_heap.h
+       src/utils/heap/heap.c \
+       src/utils/heap/heap.h
 
 libignorelist_la_SOURCES = \
-       src/utils_ignorelist.c \
-       src/utils_ignorelist.h
+       src/utils/ignorelist/ignorelist.c \
+       src/utils/ignorelist/ignorelist.h
 
 libmetadata_la_SOURCES = \
-       src/daemon/meta_data.c \
-       src/daemon/meta_data.h
+       src/utils/metadata/meta_data.c \
+       src/utils/metadata/meta_data.h
 
 libplugin_mock_la_SOURCES = \
        src/daemon/plugin_mock.c \
@@ -409,11 +409,11 @@ libplugin_mock_la_CPPFLAGS = $(AM_CPPFLAGS) -DMOCK_TIME
 libplugin_mock_la_LIBADD = libcommon.la libignorelist.la $(COMMON_LIBS)
 
 libformat_graphite_la_SOURCES = \
-       src/utils_format_graphite.c \
-       src/utils_format_graphite.h
+       src/utils/format_graphite/format_graphite.c \
+       src/utils/format_graphite/format_graphite.h
 
 test_format_graphite_SOURCES = \
-       src/utils_format_graphite_test.c \
+       src/utils/format_graphite/format_graphite_test.c \
        src/testing.h
 test_format_graphite_LDADD = \
        libformat_graphite.la \
@@ -422,8 +422,8 @@ test_format_graphite_LDADD = \
        -lm
 
 libformat_json_la_SOURCES = \
-       src/utils_format_json.c \
-       src/utils_format_json.h
+       src/utils/format_json/format_json.c \
+       src/utils/format_json/format_json.h
 libformat_json_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libformat_json_la_LDFLAGS   = $(AM_LDFLAGS)
 libformat_json_la_LIBADD    =
@@ -435,7 +435,7 @@ libformat_json_la_LIBADD   += $(BUILD_WITH_LIBYAJL_LIBS)
 check_PROGRAMS += test_format_json
 
 test_format_json_SOURCES = \
-       src/utils_format_json_test.c \
+       src/utils/format_json/format_json_test.c \
        src/testing.h
 test_format_json_LDADD = \
        libformat_json.la \
@@ -453,16 +453,16 @@ check_PROGRAMS += test_plugin_ceph
 endif
 
 liblatency_la_SOURCES = \
-       src/utils_latency.c \
-       src/utils_latency.h \
-       src/utils_latency_config.c \
-       src/utils_latency_config.h
+       src/utils/latency/latency.c \
+       src/utils/latency/latency.h \
+       src/utils/latency/latency_config.c \
+       src/utils/latency/latency_config.h
 liblatency_la_LIBADD = \
        libcommon.la \
        -lm
 
 test_utils_latency_SOURCES = \
-       src/utils_latency_test.c \
+       src/utils/latency/latency_test.c \
        src/testing.h
 test_utils_latency_LDADD = \
        liblatency.la \
@@ -470,41 +470,41 @@ test_utils_latency_LDADD = \
        -lm
 
 libcmds_la_SOURCES = \
-       src/utils_cmds.c \
-       src/utils_cmds.h \
-       src/utils_cmd_flush.c \
-       src/utils_cmd_flush.h \
-       src/utils_cmd_getthreshold.c \
-       src/utils_cmd_getthreshold.h \
-       src/utils_cmd_getval.c \
-       src/utils_cmd_getval.h \
-       src/utils_cmd_listval.c \
-       src/utils_cmd_listval.h \
-       src/utils_cmd_putnotif.c \
-       src/utils_cmd_putnotif.h \
-       src/utils_cmd_putval.c \
-       src/utils_cmd_putval.h \
-       src/utils_parse_option.c \
-       src/utils_parse_option.h
+       src/utils/cmds/cmds.c \
+       src/utils/cmds/cmds.h \
+       src/utils/cmds/flush.c \
+       src/utils/cmds/flush.h \
+       src/utils/cmds/getthreshold.c \
+       src/utils/cmds/getthreshold.h \
+       src/utils/cmds/getval.c \
+       src/utils/cmds/getval.h \
+       src/utils/cmds/listval.c \
+       src/utils/cmds/listval.h \
+       src/utils/cmds/putnotif.c \
+       src/utils/cmds/putnotif.h \
+       src/utils/cmds/putval.c \
+       src/utils/cmds/putval.h \
+       src/utils/cmds/parse_option.c \
+       src/utils/cmds/parse_option.h
 libcmds_la_LIBADD = \
        libcommon.la \
        libmetadata.la \
        -lm
 
 test_utils_cmds_SOURCES = \
-       src/utils_cmds_test.c \
+       src/utils/cmds/cmds_test.c \
        src/testing.h
 test_utils_cmds_LDADD = \
        libcmds.la \
        libplugin_mock.la
 
 liblookup_la_SOURCES = \
-       src/utils_vl_lookup.c \
-       src/utils_vl_lookup.h
+       src/utils/lookup/vl_lookup.c \
+       src/utils/lookup/vl_lookup.h
 liblookup_la_LIBADD = libavltree.la
 
 test_utils_vl_lookup_SOURCES = \
-       src/utils_vl_lookup_test.c \
+       src/utils/lookup/vl_lookup_test.c \
        src/testing.h
 test_utils_vl_lookup_LDADD = \
        liblookup.la \
@@ -514,11 +514,11 @@ test_utils_vl_lookup_LDADD += -lkstat
 endif
 
 libmount_la_SOURCES = \
-       src/utils_mount.c \
-       src/utils_mount.h
+       src/utils/mount/mount.c \
+       src/utils/mount/mount.h
 
 test_utils_mount_SOURCES = \
-       src/utils_mount_test.c \
+       src/utils/mount/mount_test.c \
        src/testing.h
 test_utils_mount_LDADD = \
        libmount.la \
@@ -579,8 +579,8 @@ if BUILD_WITH_LIBSSL
 if BUILD_WITH_LIBYAJL2
 noinst_LTLIBRARIES += liboauth.la
 liboauth_la_SOURCES = \
-       src/utils_oauth.c \
-       src/utils_oauth.h
+       src/utils/oauth/oauth.c \
+       src/utils/oauth/oauth.h
 liboauth_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        $(BUILD_WITH_LIBCURL_CFLAGS) \
@@ -594,7 +594,7 @@ liboauth_la_LIBADD = \
 check_PROGRAMS += test_utils_oauth
 TESTS += test_utils_oauth
 test_utils_oauth_SOURCES = \
-       src/utils_oauth_test.c
+       src/utils/oauth/oauth_test.c
 test_utils_oauth_LDADD = \
        liboauth.la \
        libcommon.la \
@@ -602,8 +602,8 @@ test_utils_oauth_LDADD = \
 
 noinst_LTLIBRARIES += libgce.la
 libgce_la_SOURCES = \
-       src/utils_gce.c \
-       src/utils_gce.h
+       src/utils/gce/gce.c \
+       src/utils/gce/gce.h
 libgce_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        $(BUILD_WITH_LIBCURL_CFLAGS)
@@ -616,8 +616,8 @@ endif
 if BUILD_WITH_LIBYAJL2
 noinst_LTLIBRARIES += libformat_stackdriver.la
 libformat_stackdriver_la_SOURCES = \
-       src/utils_format_stackdriver.c \
-       src/utils_format_stackdriver.h
+       src/utils/format_stackdriver/format_stackdriver.c \
+       src/utils/format_stackdriver/format_stackdriver.h
 libformat_stackdriver_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        $(BUILD_WITH_LIBYAJL_CPPFLAGS)
@@ -629,7 +629,7 @@ libformat_stackdriver_la_LIBADD = \
 check_PROGRAMS += test_format_stackdriver
 TESTS += test_format_stackdriver
 test_format_stackdriver_SOURCES = \
-       src/utils_format_stackdriver_test.c \
+       src/utils/format_stackdriver/format_stackdriver_test.c \
        src/testing.h
 test_format_stackdriver_LDADD = \
        libformat_stackdriver.la \
@@ -641,8 +641,8 @@ if BUILD_PLUGIN_AGGREGATION
 pkglib_LTLIBRARIES += aggregation.la
 aggregation_la_SOURCES = \
        src/aggregation.c \
-       src/utils_vl_lookup.c \
-       src/utils_vl_lookup.h
+       src/utils/lookup/vl_lookup.c \
+       src/utils/lookup/vl_lookup.h
 aggregation_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 aggregation_la_LIBADD = -lm
 endif
@@ -663,7 +663,7 @@ if BUILD_PLUGIN_AMQP1
 pkglib_LTLIBRARIES += amqp1.la
 amqp1_la_SOURCES = \
        src/amqp1.c \
-       src/utils_deq.h
+       src/utils/deq/deq.h
 amqp1_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBQPIDPROTON_CPPFLAGS)
 amqp1_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBQPIDPROTON_LDFLAGS)
 amqp1_la_LIBADD = \
@@ -827,10 +827,10 @@ if BUILD_PLUGIN_CURL
 pkglib_LTLIBRARIES += curl.la
 curl_la_SOURCES = \
        src/curl.c \
-       src/utils_curl_stats.c \
-       src/utils_curl_stats.h \
-       src/utils_match.c \
-       src/utils_match.h
+       src/utils/curl_stats/curl_stats.c \
+       src/utils/curl_stats/curl_stats.h \
+       src/utils/match/match.c \
+       src/utils/match/match.h
 curl_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 curl_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 curl_la_LIBADD = liblatency.la $(BUILD_WITH_LIBCURL_LIBS)
@@ -840,15 +840,15 @@ if BUILD_PLUGIN_CURL_JSON
 pkglib_LTLIBRARIES += curl_json.la
 curl_json_la_SOURCES = \
        src/curl_json.c \
-       src/utils_curl_stats.c \
-       src/utils_curl_stats.h
+       src/utils/curl_stats/curl_stats.c \
+       src/utils/curl_stats/curl_stats.h
 curl_json_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 curl_json_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
 curl_json_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 curl_json_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBYAJL_LIBS)
 
 test_plugin_curl_json_SOURCES = src/curl_json_test.c \
-                               src/utils_curl_stats.c \
+                               src/utils/curl_stats/curl_stats.c \
                                src/daemon/configfile.c \
                                src/daemon/types_list.c
 test_plugin_curl_json_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
@@ -861,8 +861,8 @@ if BUILD_PLUGIN_CURL_XML
 pkglib_LTLIBRARIES += curl_xml.la
 curl_xml_la_SOURCES = \
        src/curl_xml.c \
-       src/utils_curl_stats.c \
-       src/utils_curl_stats.h
+       src/utils/curl_stats/curl_stats.c \
+       src/utils/curl_stats/curl_stats.h
 curl_xml_la_CFLAGS = $(AM_CFLAGS) \
                $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS)
 curl_xml_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@@ -873,8 +873,8 @@ if BUILD_PLUGIN_DBI
 pkglib_LTLIBRARIES += dbi.la
 dbi_la_SOURCES = \
        src/dbi.c \
-       src/utils_db_query.c \
-       src/utils_db_query.h
+       src/utils/db_query/db_query.c \
+       src/utils/db_query/db_query.h
 dbi_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBDBI_CPPFLAGS)
 dbi_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBDBI_LDFLAGS)
 dbi_la_LIBADD = $(BUILD_WITH_LIBDBI_LIBS)
@@ -924,8 +924,8 @@ if BUILD_PLUGIN_DNS
 pkglib_LTLIBRARIES += dns.la
 dns_la_SOURCES = \
        src/dns.c \
-       src/utils_dns.c \
-       src/utils_dns.h
+       src/utils/dns/dns.c \
+       src/utils/dns/dns.h
 dns_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPCAP_CPPFLAGS)
 dns_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPCAP_LDFLAGS)
 dns_la_LIBADD = $(BUILD_WITH_LIBPCAP_LIBS)
@@ -933,7 +933,7 @@ endif
 
 if BUILD_PLUGIN_DPDKEVENTS
 pkglib_LTLIBRARIES += dpdkevents.la
-dpdkevents_la_SOURCES = src/dpdkevents.c src/utils_dpdk.c src/utils_dpdk.h
+dpdkevents_la_SOURCES = src/dpdkevents.c src/utils/dpdk/dpdk.c src/utils/dpdk/dpdk.h
 dpdkevents_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDPDK_CPPFLAGS)
 dpdkevents_la_CFLAGS = $(AM_CFLAGS) $(LIBDPDK_CFLAGS)
 dpdkevents_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS)
@@ -942,7 +942,7 @@ endif
 
 if BUILD_PLUGIN_DPDKSTAT
 pkglib_LTLIBRARIES += dpdkstat.la
-dpdkstat_la_SOURCES = src/dpdkstat.c src/utils_dpdk.c src/utils_dpdk.h
+dpdkstat_la_SOURCES = src/dpdkstat.c src/utils/dpdk/dpdk.c src/utils/dpdk/dpdk.h
 dpdkstat_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDPDK_CPPFLAGS)
 dpdkstat_la_CFLAGS = $(AM_CFLAGS) $(LIBDPDK_CFLAGS)
 dpdkstat_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS)
@@ -1054,8 +1054,8 @@ if BUILD_PLUGIN_INTEL_PMU
 pkglib_LTLIBRARIES += intel_pmu.la
 intel_pmu_la_SOURCES = \
        src/intel_pmu.c \
-       src/utils_config_cores.h \
-       src/utils_config_cores.c
+       src/utils/config_cores/config_cores.h \
+       src/utils/config_cores/config_cores.c
 intel_pmu_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBJEVENTS_CPPFLAGS)
 intel_pmu_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBJEVENTS_LDFLAGS)
 intel_pmu_la_LIBADD = $(BUILD_WITH_LIBJEVENTS_LIBS)
@@ -1065,8 +1065,8 @@ if BUILD_PLUGIN_INTEL_RDT
 pkglib_LTLIBRARIES += intel_rdt.la
 intel_rdt_la_SOURCES = \
        src/intel_rdt.c \
-       src/utils_config_cores.h \
-       src/utils_config_cores.c
+       src/utils/config_cores/config_cores.h \
+       src/utils/config_cores/config_cores.c
 intel_rdt_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBPQOS_CPPFLAGS)
 intel_rdt_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPQOS_LDFLAGS)
 intel_rdt_la_LIBADD = $(BUILD_WITH_LIBPQOS_LIBS)
@@ -1260,8 +1260,8 @@ if BUILD_PLUGIN_MEMCACHEC
 pkglib_LTLIBRARIES += memcachec.la
 memcachec_la_SOURCES = \
        src/memcachec.c \
-       src/utils_match.c \
-       src/utils_match.h
+       src/utils/match/match.c \
+       src/utils/match/match.h
 memcachec_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBMEMCACHED_CPPFLAGS)
 memcachec_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBMEMCACHED_LDFLAGS)
 memcachec_la_LIBADD = liblatency.la $(BUILD_WITH_LIBMEMCACHED_LIBS)
@@ -1468,8 +1468,8 @@ if BUILD_PLUGIN_ORACLE
 pkglib_LTLIBRARIES += oracle.la
 oracle_la_SOURCES = \
        src/oracle.c \
-       src/utils_db_query.c \
-       src/utils_db_query.h
+       src/utils/db_query/db_query.c \
+       src/utils/db_query/db_query.h
 oracle_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_ORACLE_CPPFLAGS)
 oracle_la_LIBADD = $(BUILD_WITH_ORACLE_LIBS)
 oracle_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@@ -1479,8 +1479,8 @@ if BUILD_PLUGIN_OVS_EVENTS
 pkglib_LTLIBRARIES += ovs_events.la
 ovs_events_la_SOURCES = \
        src/ovs_events.c \
-       src/utils_ovs.c \
-       src/utils_ovs.h
+       src/utils/ovs/ovs.c \
+       src/utils/ovs/ovs.h
 ovs_events_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
 ovs_events_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 ovs_events_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
@@ -1490,8 +1490,8 @@ if BUILD_PLUGIN_OVS_STATS
 pkglib_LTLIBRARIES += ovs_stats.la
 ovs_stats_la_SOURCES = \
        src/ovs_stats.c \
-       src/utils_ovs.c \
-       src/utils_ovs.h
+       src/utils/ovs/ovs.c \
+       src/utils/ovs/ovs.h
 ovs_stats_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
 ovs_stats_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 ovs_stats_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
@@ -1561,8 +1561,8 @@ if BUILD_PLUGIN_POSTGRESQL
 pkglib_LTLIBRARIES += postgresql.la
 postgresql_la_SOURCES = \
        src/postgresql.c \
-       src/utils_db_query.c \
-       src/utils_db_query.h
+       src/utils/db_query/db_query.c \
+       src/utils/db_query/db_query.h
 postgresql_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPQ_CPPFLAGS)
 postgresql_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
        $(BUILD_WITH_LIBPQ_LDFLAGS)
@@ -1589,8 +1589,8 @@ endif
 if HAVE_LIBMNL
 noinst_LTLIBRARIES += libtaskstats.la
 libtaskstats_la_SOURCES = \
-       src/utils_taskstats.c \
-       src/utils_taskstats.h
+       src/utils/taskstats/taskstats.c \
+       src/utils/taskstats/taskstats.h
 libtaskstats_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS)
 libtaskstats_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
 endif
@@ -1637,8 +1637,8 @@ if BUILD_PLUGIN_RRDCACHED
 pkglib_LTLIBRARIES += rrdcached.la
 rrdcached_la_SOURCES = \
        src/rrdcached.c \
-       src/utils_rrdcreate.c \
-       src/utils_rrdcreate.h
+       src/utils/rrdcreate/rrdcreate.c \
+       src/utils/rrdcreate/rrdcreate.h
 rrdcached_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS)
 rrdcached_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS)
 rrdcached_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS)
@@ -1648,8 +1648,8 @@ if BUILD_PLUGIN_RRDTOOL
 pkglib_LTLIBRARIES += rrdtool.la
 rrdtool_la_SOURCES = \
        src/rrdtool.c \
-       src/utils_rrdcreate.c \
-       src/utils_rrdcreate.h
+       src/utils/rrdcreate/rrdcreate.c \
+       src/utils/rrdcreate/rrdcreate.h
 rrdtool_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS)
 rrdtool_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS)
 rrdtool_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS)
@@ -1703,7 +1703,7 @@ snmp_agent_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBNETSNMPAGENT_LDFLAGS)
 snmp_agent_la_LIBADD = $(BUILD_WITH_LIBNETSNMPAGENT_LIBS)
 
 test_plugin_snmp_agent_SOURCES = src/snmp_agent_test.c \
-                                 src/daemon/utils_avltree.c \
+                                 src/utils/avltree/avltree.c \
                                  src/daemon/utils_llist.c \
                                  src/daemon/configfile.c \
                                  src/daemon/types_list.c
@@ -1774,10 +1774,10 @@ if BUILD_PLUGIN_TAIL
 pkglib_LTLIBRARIES += tail.la
 tail_la_SOURCES = \
        src/tail.c \
-       src/utils_match.c \
-       src/utils_match.h \
-       src/utils_tail.c \
-       src/utils_tail.h \
+       src/utils/match/match.c \
+       src/utils/match/match.h \
+       src/utils/tail/tail.c \
+       src/utils/tail/tail.h \
        src/utils_tail_match.c \
        src/utils_tail_match.h
 tail_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@@ -1788,8 +1788,8 @@ if BUILD_PLUGIN_TAIL_CSV
 pkglib_LTLIBRARIES += tail_csv.la
 tail_csv_la_SOURCES = \
        src/tail_csv.c \
-       src/utils_tail.c \
-       src/utils_tail.h
+       src/utils/tail/tail.c \
+       src/utils/tail/tail.h
 tail_csv_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 endif
 
@@ -1979,8 +1979,8 @@ if BUILD_PLUGIN_WRITE_HTTP
 pkglib_LTLIBRARIES += write_http.la
 write_http_la_SOURCES = \
        src/write_http.c \
-       src/utils_format_kairosdb.c \
-       src/utils_format_kairosdb.h
+       src/utils/format_kairosdb/format_kairosdb.c \
+       src/utils/format_kairosdb/format_kairosdb.h
 write_http_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 write_http_la_LIBADD = libformat_json.la $(BUILD_WITH_LIBCURL_LIBS)

diff --git a/src/aggregation.c b/src/aggregation.c
index a80219965192f1065eed0d7813fc0210dfd31e3b..089ff1daf5202b1a7f866e47762048fced168ebb 100644 (file)
--- a/src/aggregation.c
+++ b/src/aggregation.c
@@ -26,12 +26,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "meta_data.h"
 #include "plugin.h"
+#include "utils/common/common.h"
+#include "utils/lookup/vl_lookup.h"
+#include "utils/metadata/meta_data.h"
 #include "utils_cache.h" /* for uc_get_rate() */
 #include "utils_subst.h"
-#include "utils_vl_lookup.h"
 
 #define AGG_MATCHES_ALL(str) (strcmp("/.*/", str) == 0)
 #define AGG_FUNC_PLACEHOLDER "%{aggregation}"

diff --git a/src/amqp.c b/src/amqp.c
index 281130b142bd66f6f8664be5c02f5f3c92f0013f..9eb51653b9306ea1c0fa48971e253f942f098e57 100644 (file)
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -28,11 +28,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_cmd_putval.h"
-#include "utils_format_graphite.h"
-#include "utils_format_json.h"
+#include "utils/cmds/putval.h"
+#include "utils/common/common.h"
+#include "utils/format_graphite/format_graphite.h"
+#include "utils/format_json/format_json.h"
 
 #include <amqp.h>
 #include <amqp_framing.h>

diff --git a/src/amqp1.c b/src/amqp1.c
index 87bb50cf8412a1b45efba4b0d59289bbe685ddbe..a7fd26be229121af860d353f0dd7de597a954907 100644 (file)
--- a/src/amqp1.c
+++ b/src/amqp1.c
@@ -26,12 +26,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_cmd_putval.h"
-#include "utils_deq.h"
-#include "utils_format_graphite.h"
-#include "utils_format_json.h"
+#include "utils/cmds/putval.h"
+#include "utils/common/common.h"
+#include "utils/deq/deq.h"
+#include "utils/format_graphite/format_graphite.h"
+#include "utils/format_json/format_json.h"
 #include "utils_random.h"
 
 #include <proton/condition.h>

diff --git a/src/apache.c b/src/apache.c
index 5c67a3885fa9b0fccfbe76bc57df9854ef91693d..d64e5471231109320b7b9d56288d7e49e96c80f5 100644 (file)
--- a/src/apache.c
+++ b/src/apache.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <curl/curl.h>
 

diff --git a/src/apcups.c b/src/apcups.c
index 2931d2c08d146d4ba8210dd0ac4bb95d01e5f1c5..83a5c87a3b770b85df448a0fe0f13398569f345f 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h" /* rrd_update_file */
-#include "plugin.h" /* plugin_register, plugin_submit */
+#include "plugin.h"              /* plugin_register, plugin_submit */
+#include "utils/common/common.h" /* rrd_update_file */
 
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/src/apple_sensors.c b/src/apple_sensors.c
index f78c3da2025413e576d6d6e51ac0ef077d94e576..ad6e6c039b9b1435564702272074f837247646b4 100644 (file)
--- a/src/apple_sensors.c
+++ b/src/apple_sensors.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_MACH_MACH_TYPES_H
 #include <mach/mach_types.h>

diff --git a/src/aquaero.c b/src/aquaero.c
index 937742b0af0f4cc89ab4f60c3ea22ae590570d87..dfa2804d0e0aaa65e6dbd33dac2e628e2ddd45c3 100644 (file)
--- a/src/aquaero.c
+++ b/src/aquaero.c
@@ -21,8 +21,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <libaquaero5.h>
 

diff --git a/src/ascent.c b/src/ascent.c
index 223586589c6703fb8235c667ce648384a55be117..e5589bf68b016e20d4f908752a30ccc5073bd7c2 100644 (file)
--- a/src/ascent.c
+++ b/src/ascent.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <curl/curl.h>
 #include <libxml/parser.h>

diff --git a/src/barometer.c b/src/barometer.c
index b6f2bc0067e5a09d430f3de7efb5dae87c3386b1..468a2371f9cf5191b9c7e247797291ac1f1db153 100644 (file)
--- a/src/barometer.c
+++ b/src/barometer.c
@@ -21,8 +21,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 
 #include <fcntl.h>

diff --git a/src/battery.c b/src/battery.c
index a74e7b6423dc6f6692e496ee3d987ef85f285715..8e6c4b292f594c8273310dc67c90c294e1536e79 100644 (file)
--- a/src/battery.c
+++ b/src/battery.c
@@ -25,8 +25,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_MACH_MACH_TYPES_H
 #include <mach/mach_types.h>

diff --git a/src/battery_statefs.c b/src/battery_statefs.c
index 149512b9f48fdf85056dd047da03a85d292ee6b6..d2c1ed9d623a1da225eeb6edca1bd5c6e3ac0b95 100644 (file)
--- a/src/battery_statefs.c
+++ b/src/battery_statefs.c
@@ -44,9 +44,9 @@ SOFTWARE.
 
  **/
 
-#include "common.h"
-#include "plugin.h"
 #include "collectd.h"
+#include "plugin.h"
+#include "utils/common/common.h"
 
 #include <stdio.h>
 

diff --git a/src/bind.c b/src/bind.c
index fe3480d0bd5684dbeaa96aaf9b6c76399d147612..29f65d40c7051f452c9fb67cfb74fc88c37128e6 100644 (file)
--- a/src/bind.c
+++ b/src/bind.c
@@ -43,8 +43,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <time.h>
 

diff --git a/src/ceph.c b/src/ceph.c
index 26cf215553a1d20116b215a0db3d92ef9429f67f..19a09d861f308c1097b2e3dc9d4e4905f490b622 100644 (file)
--- a/src/ceph.c
+++ b/src/ceph.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <arpa/inet.h>
 #include <errno.h>

diff --git a/src/cgroups.c b/src/cgroups.c
index 9304216d39159826845371ccefdd21cc17d9964d..8925239848f0ba2af42d50e92b6a5224fc050540 100644 (file)
--- a/src/cgroups.c
+++ b/src/cgroups.c
@@ -23,10 +23,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
-#include "utils_mount.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
+#include "utils/mount/mount.h"
 
 static char const *config_keys[] = {"CGroup", "IgnoreSelected"};
 static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);

diff --git a/src/chrony.c b/src/chrony.c
index 913aab94dd60e4c3c989151f6b526aac0ad8ac07..65e3c4c8fa8a5e35282cf4e2ec4d8117dd5eb10a 100644 (file)
--- a/src/chrony.c
+++ b/src/chrony.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h" /* auxiliary functions */
-#include "plugin.h" /* plugin_register_*, plugin_dispatch_values */
+#include "plugin.h"              /* plugin_register_*, plugin_dispatch_values */
+#include "utils/common/common.h" /* auxiliary functions */
 
 #if HAVE_NETDB_H
 #include <netdb.h> /* struct addrinfo */

diff --git a/src/collectd-tg.c b/src/collectd-tg.c
index 5210a221d978b680f1e81354131ea7caf6d63485..92d1f012c97a4eb3e3bba821dcb04100779fc856 100644 (file)
--- a/src/collectd-tg.c
+++ b/src/collectd-tg.c
@@ -43,7 +43,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "utils_heap.h"
+#include "utils/heap/heap.h"
 
 #include "collectd/client.h"
 #include "collectd/network.h"

diff --git a/src/conntrack.c b/src/conntrack.c
index 29c7003e9296dfaebb44cb9fa0892db2bcbb981a..7b61eef0814647df272bde241244f9468164716d 100644 (file)
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -23,8 +23,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if !KERNEL_LINUX
 #error "No applicable input method."

diff --git a/src/contextswitch.c b/src/contextswitch.c
index 35ac5a397b03b1a095ac6199d5af48096546f0eb..acf3a74d65711151151a469495e8ed90669d7e5c 100644 (file)
--- a/src/contextswitch.c
+++ b/src/contextswitch.c
@@ -23,8 +23,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>

diff --git a/src/cpu.c b/src/cpu.c
index 2a6971292a5ca676b2466308eaf62a226a2130c7..e7f3c187dd236f00ed00251a679c216f7bdc5f75 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -29,8 +29,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #ifdef HAVE_MACH_KERN_RETURN_H
 #include <mach/kern_return.h>

diff --git a/src/cpufreq.c b/src/cpufreq.c
index 21b6429a18d7b9eb4e47de0ee4c5a4e41b94ffea..35ec07fbc98c3ef798f200972310a1967ca5d08f 100644 (file)
--- a/src/cpufreq.c
+++ b/src/cpufreq.c
@@ -22,8 +22,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #define MAX_AVAIL_FREQS 20
 

diff --git a/src/cpusleep.c b/src/cpusleep.c
index aa14cc12f8286060e388fd5be7ded5ba3400c7e3..b5cbe6601c8435fd2e29dc293ed25b86a49eaa1c 100644 (file)
--- a/src/cpusleep.c
+++ b/src/cpusleep.c
@@ -32,9 +32,9 @@
 
 #include "collectd.h"
 
-#include <time.h>
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
+#include <time.h>
 
 static void cpusleep_submit(derive_t cpu_sleep) {
   value_list_t vl = VALUE_LIST_INIT;

diff --git a/src/csv.c b/src/csv.c
index 88726bba46df8ac3547c82783af916791ca84cdb..953473fce56a2e6a43ad2d5fa882f212556d2a2c 100644 (file)
--- a/src/csv.c
+++ b/src/csv.c
@@ -23,8 +23,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 
 /*

diff --git a/src/curl.c b/src/curl.c
index 4925ad091487012904c601143531c588d3744f42..9ad3dc8321e88f205da2d55dca945a42e0668e54 100644 (file)
--- a/src/curl.c
+++ b/src/curl.c
@@ -23,10 +23,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_curl_stats.h"
-#include "utils_match.h"
+#include "utils/common/common.h"
+#include "utils/curl_stats/curl_stats.h"
+#include "utils/match/match.h"
 #include "utils_time.h"
 
 #include <curl/curl.h>

diff --git a/src/curl_json.c b/src/curl_json.c
index 3b2fffe08c9078f3c994c04116d5ab880a0e5e43..a26664f05d0e6d66dfd28c372beb0009268671d0 100644 (file)
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@ -23,11 +23,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
+#include "utils/curl_stats/curl_stats.h"
 #include "utils_complain.h"
-#include "utils_curl_stats.h"
 
 #include <sys/types.h>
 #include <sys/un.h>

diff --git a/src/curl_xml.c b/src/curl_xml.c
index 0bed05a5fb50140595bf3dd2396a43de359a720f..ed70f698fd1de4bcfd5ec94ea434a5edfdf899f5 100644 (file)
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
@@ -21,9 +21,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_curl_stats.h"
+#include "utils/common/common.h"
+#include "utils/curl_stats/curl_stats.h"
 #include "utils_llist.h"
 
 #include <libxml/parser.h>

diff --git a/src/daemon/cmd.c b/src/daemon/cmd.c
index 7b779955488ee88586a98eebfcc62e296988ef1a..49f9272cc09e3a3da39c14e7f083375dd7372998 100644 (file)
--- a/src/daemon/cmd.c
+++ b/src/daemon/cmd.c
@@ -24,7 +24,7 @@
 #include "cmd.h"
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 #include <sys/un.h>
 
 static void *do_flush(void __attribute__((unused)) * arg) {

diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index f1a492379456657b1fb9690dfe82641f788ed655..28fa7155f9de84c60900178f1fed29a86530eec1 100644 (file)
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
@@ -28,9 +28,9 @@
 #include "cmd.h"
 #include "collectd.h"
 
-#include "common.h"
 #include "configfile.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <netdb.h>
 #include <sys/types.h>

diff --git a/src/daemon/configfile.c b/src/daemon/configfile.c
index 95cb32fc503519b4faa4ae11a9e64c20fa4b68a1..8bf6b8d7e69a92e62521cd3618b1938c7635c2eb 100644 (file)
--- a/src/daemon/configfile.c
+++ b/src/daemon/configfile.c
@@ -29,11 +29,11 @@
 
 #include "liboconfig/oconfig.h"
 
-#include "common.h"
 #include "configfile.h"
 #include "filter_chain.h"
 #include "plugin.h"
 #include "types_list.h"
+#include "utils/common/common.h"
 
 #if HAVE_WORDEXP_H
 #include <wordexp.h>

diff --git a/src/daemon/filter_chain.c b/src/daemon/filter_chain.c
index a0a768760a68446aba0aee1d1a70cd17f2500fcf..d5e14a3414377c1bba21c62497b31e76a45d5ed1 100644 (file)
--- a/src/daemon/filter_chain.c
+++ b/src/daemon/filter_chain.c
@@ -26,10 +26,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "configfile.h"
 #include "filter_chain.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_complain.h"
 
 /*

diff --git a/src/daemon/globals.c b/src/daemon/globals.c
index 5c6749ff83d57b9074f6c73c247e8ceeb9f3fc5e..a76a44c4f0080e9e2e5e791fbc377d419bd97de1 100644 (file)
--- a/src/daemon/globals.c
+++ b/src/daemon/globals.c
@@ -21,8 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  **/
 
-#include "common.h"
 #include "globals.h"
+#include "utils/common/common.h"
 
 #if HAVE_KSTAT_H
 #include <kstat.h>

diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index de04665ab3d941eac75d16810f3cd30a7d441012..b4e5ae7261677657029577f366540359e695567f 100644 (file)
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@ -30,14 +30,14 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "configfile.h"
 #include "filter_chain.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
+#include "utils/heap/heap.h"
 #include "utils_cache.h"
 #include "utils_complain.h"
-#include "utils_heap.h"
 #include "utils_llist.h"
 #include "utils_random.h"
 #include "utils_time.h"

diff --git a/src/daemon/plugin.h b/src/daemon/plugin.h
index 616889ad53a7dc920c9c80b4ab790e33b97c00fe..6b3a030cb21ea46f11fe7a8a0e34be68e2d7e5d9 100644 (file)
--- a/src/daemon/plugin.h
+++ b/src/daemon/plugin.h
@@ -31,7 +31,7 @@
 #include "collectd.h"
 
 #include "configfile.h"
-#include "meta_data.h"
+#include "utils/metadata/meta_data.h"
 #include "utils_time.h"
 
 #include <inttypes.h>

diff --git a/src/daemon/types_list.c b/src/daemon/types_list.c
index c3f590c15f5c51a203eeb40e8493de1b83606742..9c61040920c53c86bb9b9e7469aebd758d0b92d9 100644 (file)
--- a/src/daemon/types_list.c
+++ b/src/daemon/types_list.c
@@ -26,7 +26,7 @@
 
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 
 #include "configfile.h"
 #include "plugin.h"

diff --git a/src/daemon/utils_cache.c b/src/daemon/utils_cache.c
index cdb764224cca406a8eff065c06c45a5b003f5cd5..c53e5d14d2229e9f9963c903700f018afad09014 100644 (file)
--- a/src/daemon/utils_cache.c
+++ b/src/daemon/utils_cache.c
@@ -28,10 +28,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "meta_data.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
+#include "utils/metadata/meta_data.h"
 #include "utils_cache.h"
 
 #include <assert.h>

diff --git a/src/daemon/utils_subst.c b/src/daemon/utils_subst.c
index 28924e449f37564e2cf8a2b2074cbf992be8ef78..0b5f00d14577b711751a86396b3d87da0d3aeae9 100644 (file)
--- a/src/daemon/utils_subst.c
+++ b/src/daemon/utils_subst.c
@@ -30,7 +30,7 @@
 
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 #include "utils_subst.h"
 
 char *subst(char *buf, size_t buflen, const char *string, size_t off1,

diff --git a/src/daemon/utils_subst_test.c b/src/daemon/utils_subst_test.c
index 20560966241906d3377e13c2b870df97d58dd8d0..0e5823064ad13f1368df62c0647f235d3967c62f 100644 (file)
--- a/src/daemon/utils_subst_test.c
+++ b/src/daemon/utils_subst_test.c
@@ -25,7 +25,7 @@
  */
 
 #include "collectd.h"
-#include "common.h" /* for STATIC_ARRAY_SIZE */
+#include "utils/common/common.h" /* for STATIC_ARRAY_SIZE */
 
 #include "testing.h"
 #include "utils_subst.h"

diff --git a/src/daemon/utils_threshold.c b/src/daemon/utils_threshold.c
index 8c03341148af5931269f8d088cad132be04affb4..52af648f0ee8438abf1538236465b1720ea4844e 100644 (file)
--- a/src/daemon/utils_threshold.c
+++ b/src/daemon/utils_threshold.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
 #include "utils_threshold.h"
 
 #include <pthread.h>

diff --git a/src/daemon/utils_time.c b/src/daemon/utils_time.c
index 4637122eb05dd63bcab530407e863e4df7cd641c..5dd7d0e182ca045d6e30fa472b6b6f423136e278 100644 (file)
--- a/src/daemon/utils_time.c
+++ b/src/daemon/utils_time.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_time.h"
 
 #ifndef DEFAULT_MOCK_TIME

diff --git a/src/dbi.c b/src/dbi.c
index 899c802c4eb1fbd8d64b8c3b8073faa853f1c28b..8466bd11b1271f49c38f885f6b72d4c13e8a6d99 100644 (file)
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_db_query.h"
+#include "utils/common/common.h"
+#include "utils/db_query/db_query.h"
 
 #include <dbi/dbi.h>
 

diff --git a/src/df.c b/src/df.c
index 8877b74092a59495fc49d093621edf2930625faf..5b3fbd28edcc0f58c6db34bc90a53391c3675f55 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -23,10 +23,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
-#include "utils_mount.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
+#include "utils/mount/mount.h"
 
 #if HAVE_STATVFS
 #if HAVE_SYS_STATVFS_H

diff --git a/src/disk.c b/src/disk.c
index 7ceb95a61d6f9fc271661f5d3f5f1ca5e84ec7c3..e73a5c08cababd659f161596d3812782cd39c9fb 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -23,9 +23,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #if HAVE_MACH_MACH_TYPES_H
 #include <mach/mach_types.h>

diff --git a/src/dns.c b/src/dns.c
index bd6820fa6b24aa1b958581ed34d62b4a3d7d6ab1..7fa297b81d33dc6cc9bb5d0f3b21493b7544017d 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -26,10 +26,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
-#include "utils_dns.h"
+#include "utils/dns/dns.h"
 #include <poll.h>
 
 #include <pcap.h>

diff --git a/src/dpdkevents.c b/src/dpdkevents.c
index 2a44b2c1eb24a8b3cee86746cc098570c66cb8d9..4cdf01dfb778a83626b99e07d67403c865906835 100644 (file)
--- a/src/dpdkevents.c
+++ b/src/dpdkevents.c
@@ -32,12 +32,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include "semaphore.h"
 #include "sys/mman.h"
-#include "utils_dpdk.h"
+#include "utils/dpdk/dpdk.h"
 #include "utils_time.h"
 
 #include <rte_config.h>

diff --git a/src/dpdkstat.c b/src/dpdkstat.c
index 59ab9760033b5eba19a001c03a9ac35b73ef2bc5..0005d091dd7f465e181c04e3ab125aa61fdb0cfc 100644 (file)
--- a/src/dpdkstat.c
+++ b/src/dpdkstat.c
@@ -32,8 +32,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "utils_dpdk.h"
+#include "utils/common/common.h"
+#include "utils/dpdk/dpdk.h"
 
 #include <rte_config.h>
 #include <rte_ethdev.h>

diff --git a/src/drbd.c b/src/drbd.c
index 69dc4ef9326289baa833c642ed3f4e1d27d24df8..0f54dd5e37bcda761e8aef57a3087e47a46842af 100644 (file)
--- a/src/drbd.c
+++ b/src/drbd.c
@@ -36,8 +36,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 static const char *drbd_stats = "/proc/drbd";
 static const char *drbd_names[] = {

diff --git a/src/email.c b/src/email.c
index f8a94fb6e4a64181968473f4486ebf5038c84407..deb660061f27f261cd958fb5c79a672933a28c93 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -40,8 +40,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <stddef.h>
 

diff --git a/src/entropy.c b/src/entropy.c
index c7b5b3f3bbc3f2d3af0fe1d31ce1da7dd498416a..94a291ece1a7edde7783ec3a353da38976a43bc3 100644 (file)
--- a/src/entropy.c
+++ b/src/entropy.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if !KERNEL_LINUX
 #error "No applicable input method."

diff --git a/src/ethstat.c b/src/ethstat.c
index 0d4c7e1522a6d28a18a52b7a21a9c4e59d9fc516..f8bc5b540ab29cbebbe269e3e01b819a83952ca9 100644 (file)
--- a/src/ethstat.c
+++ b/src/ethstat.c
@@ -24,9 +24,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
 #include "utils_complain.h"
 
 #if HAVE_SYS_IOCTL_H

diff --git a/src/exec.c b/src/exec.c
index 26b8fa7ef4ae929fce16af725d91d030fd44c529..7e1616774e4d3277961ee995b49c5f534cdcae57 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -28,11 +28,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
-#include "utils_cmd_putnotif.h"
-#include "utils_cmd_putval.h"
+#include "utils/cmds/putnotif.h"
+#include "utils/cmds/putval.h"
 
 #include <grp.h>
 #include <pwd.h>

diff --git a/src/fhcount.c b/src/fhcount.c
index 9bcb9115bf702423b24bbe9e954eefe1d24d9e5e..93ad903e51b08c7672690c145687c9314b5433e8 100644 (file)
--- a/src/fhcount.c
+++ b/src/fhcount.c
@@ -19,8 +19,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 static const char *config_keys[] = {"ValuesAbsolute", "ValuesPercentage"};
 static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);

diff --git a/src/filecount.c b/src/filecount.c
index 9091ff55a216d63d131b8104ee05627200e4837b..5acd47b3339e99d259fce8a9c1c5513e987f2b5a 100644 (file)
--- a/src/filecount.c
+++ b/src/filecount.c
@@ -23,8 +23,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <dirent.h>
 #include <fcntl.h>

diff --git a/src/fscache.c b/src/fscache.c
index dd36b8b9fd128b0e16d4e4e3d52f44b8bc005cb6..e875da8de7b6e15ee8e8481e53d6f891284ab7ee 100644 (file)
--- a/src/fscache.c
+++ b/src/fscache.c
@@ -21,11 +21,11 @@
 
 #include "collectd.h"
 
+#include "plugin.h"
+#include "utils/common/common.h"
 #include <stdio.h>  /* a header needed for FILE */
 #include <stdlib.h> /* used for atoi */
 #include <string.h> /* a header needed for scanf function */
-#include "common.h"
-#include "plugin.h"
 
 #if !KERNEL_LINUX
 #error "This module only supports the Linux implementation of fscache"

diff --git a/src/gmond.c b/src/gmond.c
index 3312f96e898cae7bd9ef77345cd5cf0cac4f2f27..b14dee3bfae852c7a57d72a044718e0d48e6c4c2 100644 (file)
--- a/src/gmond.c
+++ b/src/gmond.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
 
 #if HAVE_NETDB_H
 #include <netdb.h>

diff --git a/src/gps.c b/src/gps.c
index b22c3a2e5ecd505620709654b2bdaf1808b38262..4d65176836b24946e135a2112d7cfea147236aa4 100644 (file)
--- a/src/gps.c
+++ b/src/gps.c
@@ -27,8 +27,8 @@
  **/
 
 #include "collectd.h"
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_time.h"
 
 #define CGPS_TRUE 1

diff --git a/src/gpu_nvidia.c b/src/gpu_nvidia.c
index 812cfeb097d7d2c4dc6d068ee80654944fe3de2e..d76e503dcfa2ca6b746608fd71c9210aa249eb7d 100644 (file)
--- a/src/gpu_nvidia.c
+++ b/src/gpu_nvidia.c
@@ -21,8 +21,8 @@ SOFTWARE.
 */
 
 #include "daemon/collectd.h"
-#include "daemon/common.h"
 #include "daemon/plugin.h"
+#include "utils/common/common.h"
 
 #include <nvml.h>
 #include <stdint.h>

diff --git a/src/grpc.cc b/src/grpc.cc
index 17168ec29a1e9a16f961d14fab400ddf82190d9b..1e9cb20c869a0be8613adae4540cb0c6e90aca27 100644 (file)
--- a/src/grpc.cc
+++ b/src/grpc.cc
@@ -41,8 +41,8 @@ extern "C" {
 #include <stdbool.h>
 
 #include "collectd.h"
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include "daemon/utils_cache.h"
 }

diff --git a/src/hddtemp.c b/src/hddtemp.c
index 80daf15b7ef8e491f515dc166c6c9b22eceab2a3..96b4f0c59addbb7d78bed638f312dceb20cf8483 100644 (file)
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -33,8 +33,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <assert.h>
 #include <libgen.h> /* for basename */

diff --git a/src/hugepages.c b/src/hugepages.c
index dd897356b78017ab8919b35a90915954dd5a2ea6..e066300beb799460f0b12b0f991740ef62983452 100644 (file)
--- a/src/hugepages.c
+++ b/src/hugepages.c
@@ -30,8 +30,8 @@
 
 #include "collectd.h"
 
-#include "common.h" /* auxiliary functions */
-#include "plugin.h" /* plugin_register_*, plugin_dispatch_values */
+#include "plugin.h"              /* plugin_register_*, plugin_dispatch_values */
+#include "utils/common/common.h" /* auxiliary functions */
 
 static const char g_plugin_name[] = "hugepages";
 

diff --git a/src/intel_pmu.c b/src/intel_pmu.c
index ff92beede478ab77fb08a3d660dc33a825516bc1..f04f8871e18e492074b43a9a1b761c1e4d81fa93 100644 (file)
--- a/src/intel_pmu.c
+++ b/src/intel_pmu.c
@@ -27,9 +27,9 @@
  **/
 
 #include "collectd.h"
-#include "common.h"
+#include "utils/common/common.h"
 
-#include "utils_config_cores.h"
+#include "utils/config_cores/config_cores.h"
 
 #include <jevents.h>
 #include <jsession.h>

diff --git a/src/intel_rdt.c b/src/intel_rdt.c
index df9c9c4412410a09d8faedd890377898641eaf0f..d9491147930e8aff6a72e649a23c100c5beac002 100644 (file)
--- a/src/intel_rdt.c
+++ b/src/intel_rdt.c
@@ -26,8 +26,8 @@
  **/
 
 #include "collectd.h"
-#include "common.h"
-#include "utils_config_cores.h"
+#include "utils/common/common.h"
+#include "utils/config_cores/config_cores.h"
 
 #include <pqos.h>
 

diff --git a/src/interface.c b/src/interface.c
index 86110b0c4bfedcd307d84c26188265124893a745..0e1397089cb41d177620f4c755320bef6c0ffede 100644 (file)
--- a/src/interface.c
+++ b/src/interface.c
@@ -24,9 +24,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/src/ipc.c b/src/ipc.c
index 6e888c4643c52db7aba6ff98a4191fd72e70c870..ab4b214d221338830b109e83bf837073a1d63ae2 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if KERNEL_LINUX
 /* _GNU_SOURCE is needed for struct shm_info.used_ids on musl libc */

diff --git a/src/ipmi.c b/src/ipmi.c
index 58dfb41121ebab49f464264aff280f3ca5ee29f7..d78ffa95ae725a697cb8ec9cdc3f3e6a9299fde8 100644 (file)
--- a/src/ipmi.c
+++ b/src/ipmi.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #include <OpenIPMI/ipmi_auth.h>
 #include <OpenIPMI/ipmi_conn.h>

diff --git a/src/iptables.c b/src/iptables.c
index 225ed2c136d456096608b3847c5a314b1e949e28..e1d83dfcba06ba3e3549320e4b9d4bde2e78d412 100644 (file)
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <libiptc/libip6tc.h>
 #include <libiptc/libiptc.h>

diff --git a/src/ipvs.c b/src/ipvs.c
index 0afc7494277f293c70f1c4a78adc7012df104d7e..0259df80fa011c389df2a70c3f2be2250dcf5cb6 100644 (file)
--- a/src/ipvs.c
+++ b/src/ipvs.c
@@ -32,8 +32,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_ARPA_INET_H
 #include <arpa/inet.h>

diff --git a/src/irq.c b/src/irq.c
index eeea058a46e1f3bff32736e821fc9b36ac951374..915635606cd8addf345665269b012449f7ccabcd 100644 (file)
--- a/src/irq.c
+++ b/src/irq.c
@@ -23,9 +23,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #if !KERNEL_LINUX
 #error "No applicable input method."

diff --git a/src/java.c b/src/java.c
index 0a5336a5231bedf246407444f87a6158c461a228..cf301c6bc3d6ee331849841da55a43d4d98143d5 100644 (file)
--- a/src/java.c
+++ b/src/java.c
@@ -23,9 +23,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <jni.h>
 

diff --git a/src/load.c b/src/load.c
index 858d9beacdf01536e49a8d8e825b4be97423a75f..da7fe58ff835516a405bf0c5355f0e5eece3d882 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <unistd.h>
 

diff --git a/src/log_logstash.c b/src/log_logstash.c
index d115ae56affd404067c9a53e8c7ac35bf0ad42ef..b04aadddba67d243d7d935a27f307ecebb500c71 100644 (file)
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <sys/types.h>
 #include <yajl/yajl_common.h>

diff --git a/src/logfile.c b/src/logfile.c
index fa56a1bcc95e790d5aac21d4aa42394fc5548835..3a25319e1410d591cb413a0bfdf36fb015e6e7d1 100644 (file)
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if COLLECT_DEBUG
 static int log_level = LOG_DEBUG;

diff --git a/src/lpar.c b/src/lpar.c
index df18b525fa513095a823ae9b63cd86493fc91b3e..dc3739b8f219aa22dc55da5fbeae9fb9e90e3d5b 100644 (file)
--- a/src/lpar.c
+++ b/src/lpar.c
@@ -21,8 +21,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <libperfstat.h>
 #include <sys/protosw.h>

diff --git a/src/lua.c b/src/lua.c
index f66d852635e6fa9ecb0cdb06b82749795d11f0a3..d91676c9fd765aa8ebf0c044a30431348906f00a 100644 (file)
--- a/src/lua.c
+++ b/src/lua.c
@@ -29,8 +29,8 @@
  **/
 
 #include "collectd.h"
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_lua.h"
 
 /* Include the Lua API header files. */

diff --git a/src/lvm.c b/src/lvm.c
index 3ec79dea90c113505997ba8bbae6774f2190caf3..c30489cbddd231c681e541167d8e4f351228702d 100644 (file)
--- a/src/lvm.c
+++ b/src/lvm.c
@@ -23,8 +23,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <lvm2app.h>
 

diff --git a/src/madwifi.c b/src/madwifi.c
index 60ac3c8cb05959837875f78461c40dc26bdd11e3..85454c3fc5ee1efa34a328b83e5b185570dfb816 100644 (file)
--- a/src/madwifi.c
+++ b/src/madwifi.c
@@ -88,9 +88,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #include <dirent.h>
 #include <sys/ioctl.h>

diff --git a/src/match_empty_counter.c b/src/match_empty_counter.c
index 27817fe5dbde63aaadcc9e2962d00a212c4be7d7..fd87b3848623bc6082d157f4b840966a86316ad4 100644 (file)
--- a/src/match_empty_counter.c
+++ b/src/match_empty_counter.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
+#include "utils/common/common.h"
 
 /*
  * internal helper functions

diff --git a/src/match_hashed.c b/src/match_hashed.c
index c0554b2339d2dfe81706c4c8a2f3e3442af38a51..4911ee2cc8bbd9522c0d6eb4c643050669d2a88a 100644 (file)
--- a/src/match_hashed.c
+++ b/src/match_hashed.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
+#include "utils/common/common.h"
 
 /*
  * private data types

diff --git a/src/match_regex.c b/src/match_regex.c
index 20445cc196ab3c6b700e2da1738c948c9e228b4a..4052ad5543de15a210967703443415acfbcbb146 100644 (file)
--- a/src/match_regex.c
+++ b/src/match_regex.c
@@ -33,9 +33,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
-#include "meta_data.h"
+#include "utils/common/common.h"
+#include "utils/metadata/meta_data.h"
 #include "utils_llist.h"
 
 #include <regex.h>

diff --git a/src/match_timediff.c b/src/match_timediff.c
index c80694de39bb800c2ea257b4adc93052e7404565..172b31262480e3f4c092c2bafc2f67d93efbb42a 100644 (file)
--- a/src/match_timediff.c
+++ b/src/match_timediff.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
+#include "utils/common/common.h"
 
 #define SATISFY_ALL 0
 #define SATISFY_ANY 1

diff --git a/src/match_value.c b/src/match_value.c
index 44cea2683290161b96e5200f98dcb06b918a308e..7b9da693097d4884a73ffadbbe896887c79e5b75 100644 (file)
--- a/src/match_value.c
+++ b/src/match_value.c
@@ -31,8 +31,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 
 #define SATISFY_ALL 0

diff --git a/src/mbmon.c b/src/mbmon.c
index 63a300de16c4f7397aeb764659c0d7a4528614ca..50955f3c4aab74b82492c113a7dd28b722c8f609 100644 (file)
--- a/src/mbmon.c
+++ b/src/mbmon.c
@@ -25,8 +25,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <netdb.h>
 #include <netinet/in.h>

diff --git a/src/mcelog.c b/src/mcelog.c
index 4e514004a6261995a3285810b76ce923a74555b1..0cce0c6043685c2ac6d7f1c096eaba180bf26aa9 100644 (file)
--- a/src/mcelog.c
+++ b/src/mcelog.c
@@ -31,7 +31,7 @@
 
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 #include "utils_llist.h"
 
 #include <poll.h>

diff --git a/src/md.c b/src/md.c
index 0a015c7b0088f3796ff14a7f2f085cb235407aca..643dabd7051a11a4d246d0167df365c89407aa39 100644 (file)
--- a/src/md.c
+++ b/src/md.c
@@ -21,9 +21,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #include <sys/ioctl.h>
 

diff --git a/src/memcachec.c b/src/memcachec.c
index f293aa1b34e9089df423d028642f745510b3e5fd..eefcfb73c1643d16bed6c4cf5a61aa608d7911e4 100644 (file)
--- a/src/memcachec.c
+++ b/src/memcachec.c
@@ -23,9 +23,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_match.h"
+#include "utils/common/common.h"
+#include "utils/match/match.h"
 
 #include <libmemcached/memcached.h>
 

diff --git a/src/memcached.c b/src/memcached.c
index 4ff70f7c9ea5a642e1c5aca4e45a53965ca745a1..0baf6c221835a5663b6ab032cb37f7ec7f886dd6 100644 (file)
--- a/src/memcached.c
+++ b/src/memcached.c
@@ -32,8 +32,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <netdb.h>
 #include <netinet/in.h>

diff --git a/src/memory.c b/src/memory.c
index cc95496a72ffd9e3a77aed3b0810af61a044a90f..4a3a7723b5a2442ae299c228b2152f373256b7a7 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -25,8 +25,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>

diff --git a/src/mic.c b/src/mic.c
index 4f4a9bacea13cfc2bf2fa86b802f548d386d8162..6924eaf7773d1b9138c9e59cafa7d3f2e8200e85 100644 (file)
--- a/src/mic.c
+++ b/src/mic.c
@@ -21,9 +21,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #include <MicAccessApi.h>
 #include <MicAccessErrorTypes.h>

diff --git a/src/modbus.c b/src/modbus.c
index 0a4f40ca035397e3eb5f3827bc098a97c1f4dd58..ed53319fa57b3e340f3034f17fbeef4b0ac5dde6 100644 (file)
--- a/src/modbus.c
+++ b/src/modbus.c
@@ -22,9 +22,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "configfile.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <modbus.h>
 #include <netdb.h>

diff --git a/src/mqtt.c b/src/mqtt.c
index 48c34edc036897e7853599bfc6b0a6e197be2419..630114e414507a6cd4aa157ff44a3a76efa63b94 100644 (file)
--- a/src/mqtt.c
+++ b/src/mqtt.c
@@ -31,8 +31,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_complain.h"
 
 #include <mosquitto.h>

diff --git a/src/multimeter.c b/src/multimeter.c
index ca9b15d4e5d383943a428e8aafb8285155439b57..5a7d5a2a60c3d49bf610ab05ac81c5129693b786 100644 (file)
--- a/src/multimeter.c
+++ b/src/multimeter.c
@@ -24,8 +24,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_TERMIOS_H && HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>

diff --git a/src/mysql.c b/src/mysql.c
index e7ffb4890ff433f7a51671936d7f024e81b2cdc3..7399fe21def999a275584f18501d634898a02a4b 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -29,8 +29,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #ifdef HAVE_MYSQL_H
 #include <mysql.h>

diff --git a/src/netapp.c b/src/netapp.c
index 0c1fe31dd3a3dd291224a3542ce393e4ef44d913..1b510d2a575b24f12b92fe5e19fca44b0bf26747 100644 (file)
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #include <netapp_api.h>
 #include <netapp_errno.h>

diff --git a/src/netlink.c b/src/netlink.c
index a1f52a450013448f12af23c2e6452a56b4e6efa8..37c2e294971c1ca1d2f3a580c5abfeb6bb108f75 100644 (file)
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -27,8 +27,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <asm/types.h>
 

diff --git a/src/network.c b/src/network.c
index af23d485017301e72cea87cc9f027b3236045ade..f6f0ac1504ce07f7bb98113f74a2a21be2d05779 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -27,8 +27,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 #include "utils_complain.h"
 #include "utils_fbhash.h"

diff --git a/src/nfs.c b/src/nfs.c
index 481aa79e27c7e38420f9986a8eb95816b4ad942f..320caa4a16c5798e64aa013ca9f92ddc17552620 100644 (file)
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -24,8 +24,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_KSTAT_H
 #include <kstat.h>

diff --git a/src/nginx.c b/src/nginx.c
index e5ca89c06227e41f8970376cede0fb6c819efde6..7bb307a3985bfe2a27dbf1fb4f9a9811a5ffd955 100644 (file)
--- a/src/nginx.c
+++ b/src/nginx.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <curl/curl.h>
 

diff --git a/src/notify_desktop.c b/src/notify_desktop.c
index e391cf275c04410ac76b67bbf6c896977f0fc74f..849b1d4cb2331d5f2b4b300d7015fe5c4ad12449 100644 (file)
--- a/src/notify_desktop.c
+++ b/src/notify_desktop.c
@@ -30,8 +30,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <glib.h>
 #include <libnotify/notify.h>

diff --git a/src/notify_email.c b/src/notify_email.c
index bb36ff27a2ef934094d3c8c538d13f136f8ec96f..dddb8b260b2722afb3cfe6d43fd2e6c0ce11ccce 100644 (file)
--- a/src/notify_email.c
+++ b/src/notify_email.c
@@ -24,8 +24,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <auth-client.h>
 #include <libesmtp.h>

diff --git a/src/notify_nagios.c b/src/notify_nagios.c
index 68f6e2a7f43b151df37a2e9a0a8904ff940a175b..79926b52659b5e52796949382ad855991a87803d 100644 (file)
--- a/src/notify_nagios.c
+++ b/src/notify_nagios.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #define NAGIOS_OK 0
 #define NAGIOS_WARNING 1

diff --git a/src/ntpd.c b/src/ntpd.c
index 0b824ba273e268f7cc7ac489d97b5812546cb7b5..33acc69fe1b0631d28f65e49a4144d111d77be7d 100644 (file)
--- a/src/ntpd.c
+++ b/src/ntpd.c
@@ -29,8 +29,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_NETDB_H
 #include <netdb.h>

diff --git a/src/numa.c b/src/numa.c
index c68fb8693a4e244cf497305c1e9516e264be200a..dfe7a6dc605bf41fda65f56f5f61bb0296a79823 100644 (file)
--- a/src/numa.c
+++ b/src/numa.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if !KERNEL_LINUX
 #error "No applicable input method."

diff --git a/src/nut.c b/src/nut.c
index 997d1a50ed838336e8f10026fa416dad4964ef06..ae48692b8b15204f1e3f73e73ad41aee8be4fc4a 100644 (file)
--- a/src/nut.c
+++ b/src/nut.c
@@ -27,8 +27,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <upsclient.h>
 

diff --git a/src/olsrd.c b/src/olsrd.c
index df052889e0d2e63bf2a04fc31c099fc6db0ed89f..c8b8b7a96e311c569ce8c4b24fb3611d90aa08b5 100644 (file)
--- a/src/olsrd.c
+++ b/src/olsrd.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <netdb.h>
 #include <netinet/in.h>

diff --git a/src/onewire.c b/src/onewire.c
index 575a682082d3a4588230d7215db3e2e4ed3bf2e5..a0a546b2dc99ff5fc986259b453ff636b68ea2be 100644 (file)
--- a/src/onewire.c
+++ b/src/onewire.c
@@ -21,9 +21,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #include <owcapi.h>
 #include <regex.h>

diff --git a/src/openldap.c b/src/openldap.c
index 3897cd16904c08389f88ffdd83721d36c0ad7bbb..5659c69f4599c9b52c3ab8cf28e19397f15732f1 100644 (file)
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if defined(__APPLE__)
 #pragma clang diagnostic push

diff --git a/src/openvpn.c b/src/openvpn.c
index 193a9b4359f95ed3f6295d805d015143a50dfae4..4d4a878f5025f65863bdfd8258f9e62ab3c3babf 100644 (file)
--- a/src/openvpn.c
+++ b/src/openvpn.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 /**
  * There is two main kinds of OpenVPN status file:

diff --git a/src/oracle.c b/src/oracle.c
index f54b285ae2d6945a611b66145bfc933b4b5035ca..3f28110f8caf94fb014be5f58bed929e7336ff5d 100644 (file)
--- a/src/oracle.c
+++ b/src/oracle.c
@@ -47,9 +47,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_db_query.h"
+#include "utils/common/common.h"
+#include "utils/db_query/db_query.h"
 
 #include <oci.h>
 

diff --git a/src/ovs_events.c b/src/ovs_events.c
index ba3238b6c0b47978354722407493a7057361098a..0f9a57ca4b85e67c60a4526f1d2041fd2c45e809 100644 (file)
--- a/src/ovs_events.c
+++ b/src/ovs_events.c
@@ -30,9 +30,9 @@
 
 #include "collectd.h"
 
-#include "common.h" /* auxiliary functions */
+#include "utils/common/common.h" /* auxiliary functions */
 
-#include "utils_ovs.h" /* OVS helpers */
+#include "utils/ovs/ovs.h" /* OVS helpers */
 
 #define OVS_EVENTS_IFACE_NAME_SIZE 128
 #define OVS_EVENTS_IFACE_UUID_SIZE 64

diff --git a/src/ovs_stats.c b/src/ovs_stats.c
index eca7329e8c8352b3a9ccdb1aed163b51b8d2b776..fe1953f29542232a92c5feba781831ade1ae54bf 100644 (file)
--- a/src/ovs_stats.c
+++ b/src/ovs_stats.c
@@ -28,9 +28,9 @@
  *   Taras Chornyi <tarasx.chornyi@intel.com>
  */
 
-#include "common.h"
+#include "utils/common/common.h"
 
-#include "utils_ovs.h" /* OvS helpers */
+#include "utils/ovs/ovs.h" /* OvS helpers */
 
 /* Plugin name */
 static const char plugin_name[] = "ovs_stats";
@@ -280,8 +280,11 @@ static void ovs_stats_submit_interfaces(port_list_t *port) {
       if (strlen(iface->ex_iface_id))
         meta_data_add_string(meta, "iface-id", iface->ex_iface_id);
     }
-    snprintf(devname, sizeof(devname), "%s.%s.%s", bridge->name, port->name,
-             iface->name);
+    strjoin(devname, sizeof(devname),
+            (char *[]){
+                bridge->name, port->name, iface->name,
+            },
+            3, ".");
     ovs_stats_submit_one(devname, "if_collisions", NULL,
                          iface->stats[collisions], meta);
     ovs_stats_submit_two(devname, "if_dropped", NULL, iface->stats[rx_dropped],

diff --git a/src/pcie_errors.c b/src/pcie_errors.c
index b239a8c551b61789f02e26e661604cb73722e8f3..63996050ad4c0dfadb44c50838e5480082ac19cb 100644 (file)
--- a/src/pcie_errors.c
+++ b/src/pcie_errors.c
@@ -27,7 +27,7 @@
 
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 #include "utils_llist.h"
 
 #include <linux/pci_regs.h>

diff --git a/src/perl.c b/src/perl.c
index fffbc21d04e86106ad0fa6b9bd74cd1a2eaed5bb..09e6e5aafaeccac5d6d6ab0cd4274c569f2df892 100644 (file)
--- a/src/perl.c
+++ b/src/perl.c
@@ -47,8 +47,8 @@
 #endif /* DEBUG */
 
 /* ... while we want the definition found in plugin.h. */
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include "filter_chain.h"
 

diff --git a/src/pf.c b/src/pf.c
index 88a4c2d0ecfe27a6d466d40d60d480a1d197f80b..9681d366a1631b7b29d8074ee4a774f75218ace8 100644 (file)
--- a/src/pf.c
+++ b/src/pf.c
@@ -21,8 +21,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>

diff --git a/src/pinba.c b/src/pinba.c
index 9f571d04d3a053a73ddbda75a8b3ebf2780cdb0e..61d226c4c91e7c03b61076dd84dae7775f033b80 100644 (file)
--- a/src/pinba.c
+++ b/src/pinba.c
@@ -25,8 +25,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <netdb.h>
 #include <poll.h>

diff --git a/src/ping.c b/src/ping.c
index ffb16910eaff3655d7326e30592595dc1da31410..203d22302c1fd688c2e4ff218d35741838de10dc 100644 (file)
--- a/src/ping.c
+++ b/src/ping.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_complain.h"
 
 #include <netinet/in.h>

diff --git a/src/postgresql.c b/src/postgresql.c
index e627806224b5adf6c7fd57a9db6c2bbe46d6ac9e..8e4328fa84e0e3c0a66958f7360c1e8d8b8cec96 100644 (file)
--- a/src/postgresql.c
+++ b/src/postgresql.c
@@ -32,13 +32,13 @@
 
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 
 #include "plugin.h"
 
+#include "utils/db_query/db_query.h"
 #include "utils_cache.h"
 #include "utils_complain.h"
-#include "utils_db_query.h"
 
 #include <libpq-fe.h>
 #include <pg_config_manual.h>

diff --git a/src/powerdns.c b/src/powerdns.c
index b2cebbf8f283a1b75f67c4934a294dc92d5b02f2..a5b45a19489c8c39e72eb9feebb5d519a0df8d6d 100644 (file)
--- a/src/powerdns.c
+++ b/src/powerdns.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_llist.h"
 
 #include <errno.h>

diff --git a/src/processes.c b/src/processes.c
index 2e3b927ed228167c44fb7b6b732904201c3ce9ed..ac5ec6041bd221ace5413d2ee88be44b57b50189 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
@@ -38,12 +38,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_LIBTASKSTATS
+#include "utils/taskstats/taskstats.h"
 #include "utils_complain.h"
-#include "utils_taskstats.h"
 #endif
 
 /* Include header files for the mach system, if they exist.. */

diff --git a/src/protocols.c b/src/protocols.c
index 36b1d83b1cfdd4d59cff2974ff58c71ec627ba48..65b450c988fd6249ebe7b4131b5fd6ef1714f9c6 100644 (file)
--- a/src/protocols.c
+++ b/src/protocols.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #if !KERNEL_LINUX
 #error "No applicable input method."

diff --git a/src/pyconfig.c b/src/pyconfig.c
index 4ba7e0d2012190ae6dfc8287322b4ff982ce2e82..5f51b937cd88172b73eac58a4769c8858a5d454d 100644 (file)
--- a/src/pyconfig.c
+++ b/src/pyconfig.c
@@ -29,7 +29,7 @@
 
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 
 #include "cpython.h"
 

diff --git a/src/python.c b/src/python.c
index 2f08bd348bf0ffe2936cb132ce0129c6a6bcbe35..9d47d701ce1e5154c6d65b7b55dee4b854412507 100644 (file)
--- a/src/python.c
+++ b/src/python.c
@@ -31,7 +31,7 @@
 
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 
 #include "cpython.h"
 

diff --git a/src/pyvalues.c b/src/pyvalues.c
index 301df4429f0b96fb816c6bbed65b7c070a70ab08..967fecfd8857978b32422465d3deb33af65e76f5 100644 (file)
--- a/src/pyvalues.c
+++ b/src/pyvalues.c
@@ -29,7 +29,7 @@
 
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 
 #include "cpython.h"
 

diff --git a/src/redis.c b/src/redis.c
index e24abd54b9f34fbdaa74984848e1c57a1deb804d..37dc8d6812d92c9fe2290133693b4c75a4e360d2 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -22,8 +22,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <hiredis/hiredis.h>
 #include <sys/time.h>

diff --git a/src/routeros.c b/src/routeros.c
index 1286805f1944c647ed0b25962d480e61ed8b7e8c..70dd75ee1d68315255d0c6cd48b840c8ea94eb1a 100644 (file)
--- a/src/routeros.c
+++ b/src/routeros.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <routeros_api.h>
 

diff --git a/src/rrdcached.c b/src/rrdcached.c
index 8b742bb5574ea1f1a7b5bfc6aaa986ad52095382..b5f0970b7e909146b3477b544c8b9e0970ef900e 100644 (file)
--- a/src/rrdcached.c
+++ b/src/rrdcached.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_rrdcreate.h"
+#include "utils/common/common.h"
+#include "utils/rrdcreate/rrdcreate.h"
 
 #undef HAVE_CONFIG_H
 #include <rrd.h>

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 605a16ccc00855f8554f70af940dec7fcdf106f7..d0849d12f1121c0c9b7809c9220b4d06f7591157 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -25,11 +25,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
+#include "utils/rrdcreate/rrdcreate.h"
 #include "utils_random.h"
-#include "utils_rrdcreate.h"
 
 #include <rrd.h>
 

diff --git a/src/sensors.c b/src/sensors.c
index b800e98f299086940ee081e73246bded94718950..8d1ece9a1ba0a45a43ba99abe2a550d8c3482bd6 100644 (file)
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -35,9 +35,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #if defined(HAVE_SENSORS_SENSORS_H)
 #include <sensors/sensors.h>

diff --git a/src/serial.c b/src/serial.c
index 2b8653703d75ce5d40045268a2761134e56f7eaf..aae99789d815833d28e0ba10372be8466eeed45c 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -23,8 +23,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if !KERNEL_LINUX
 #error "No applicable input method."

diff --git a/src/sigrok.c b/src/sigrok.c
index eeab8c951b543e6b36d06354a4b7559f97efbe73..a8b67afe77dd2ed9f4066054a00761f55fb31086 100644 (file)
--- a/src/sigrok.c
+++ b/src/sigrok.c
@@ -21,8 +21,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/smart.c b/src/smart.c
index 62cbb4f1ef821ff730e07932ef9b883c083767f8..2dfb924faa2186deeaf1b50295c82256ef08473d 100644 (file)
--- a/src/smart.c
+++ b/src/smart.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #include <atasmart.h>
 #include <libudev.h>

diff --git a/src/snmp.c b/src/snmp.c
index fb1b83c395e97c42f3d8829d0e9990984125c049..c921e0285e429a6b5aa51d84b77feae3cd0cef11 100644 (file)
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -26,10 +26,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 #include "utils_complain.h"
-#include "utils_ignorelist.h"
 
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>

diff --git a/src/snmp_agent.c b/src/snmp_agent.c
index 2dfa6613d6b253d696da5ab99ed366c0eaad0c2e..cbd33664a29a9f9ec4f67437e6a936d79906e0b3 100644 (file)
--- a/src/snmp_agent.c
+++ b/src/snmp_agent.c
@@ -29,8 +29,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 #include "utils_llist.h"
 #include <regex.h>

diff --git a/src/statsd.c b/src/statsd.c
index 1558ec84af595de39c32e5f292ded3c0f26f6acc..6c7820a1e2d020dc6a08e55ea92f1147e353ca24 100644 (file)
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -26,10 +26,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
-#include "utils_latency.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
+#include "utils/latency/latency.h"
 
 #include <netdb.h>
 #include <poll.h>

diff --git a/src/swap.c b/src/swap.c
index 929df6db5a2385d2d0198f5281832d60003fcd03..9e58919e446bf548b6f8ba91e356c001f372425f 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -37,8 +37,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_SYS_SWAP_H
 #include <sys/swap.h>

diff --git a/src/synproxy.c b/src/synproxy.c
index 6c6b997d478268d3698e12509fa3c183aa255ca9..d51077f26d7ee570342a75aecb0ad3e690fec5d4 100644 (file)
--- a/src/synproxy.c
+++ b/src/synproxy.c
@@ -21,8 +21,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if !KERNEL_LINUX
 #error "No applicable input method."

diff --git a/src/syslog.c b/src/syslog.c
index beb82456b40649c0b15fc0d5327b73787fc6655c..a600f30eca4fe17e883205428fd221df6fcddf13 100644 (file)
--- a/src/syslog.c
+++ b/src/syslog.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_SYSLOG_H
 #include <syslog.h>

diff --git a/src/table.c b/src/table.c
index 492bea619f22a8b5c88a1c47a9e5de9705ef9c5b..f181de94624b2be7201819592d120c43d61b5455 100644 (file)
--- a/src/table.c
+++ b/src/table.c
@@ -30,7 +30,7 @@
 
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 
 #include "plugin.h"
 

diff --git a/src/tail.c b/src/tail.c
index df94580cf458cac2acc8fe0b47e63e36139c5b18..8c9dfbe539ad4f119dd3c6d34ef1e36ea5392a2a 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_latency_config.h"
+#include "utils/common/common.h"
+#include "utils/latency/latency_config.h"
 #include "utils_tail_match.h"
 
 /*

diff --git a/src/tail_csv.c b/src/tail_csv.c
index 4c5897166fd8e1d5920510b0da8c1eb4307dcbcd..e1d473eb6938a0b3dd9c6c1b094fbf2691df160d 100644 (file)
--- a/src/tail_csv.c
+++ b/src/tail_csv.c
@@ -23,9 +23,9 @@
 
 #include "collectd.h"
 
-#include "common.h" /* auxiliary functions */
-#include "plugin.h" /* plugin_register_*, plugin_dispatch_values */
-#include "utils_tail.h"
+#include "plugin.h"              /* plugin_register_*, plugin_dispatch_values */
+#include "utils/common/common.h" /* auxiliary functions */
+#include "utils/tail/tail.h"
 
 #include <fcntl.h>
 #include <stdlib.h>

diff --git a/src/tape.c b/src/tape.c
index 26bd969ac83c1c03b8060df1ed6cb7fa86009d3d..ccf88255c0110e7a1d47e10febc28b0fb05d0e65 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -22,8 +22,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if !HAVE_LIBKSTAT
 #error "No applicable input method."

diff --git a/src/target_notification.c b/src/target_notification.c
index f83a904ac07f6f73d9d7530e2d01e3dfa3c07178..6d8059ea723f121a5d69ab43bafb914e9090dfd6 100644 (file)
--- a/src/target_notification.c
+++ b/src/target_notification.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 #include "utils_subst.h"
 

diff --git a/src/target_replace.c b/src/target_replace.c
index 887507e1dc0f6234a87cb4d90b6c66d41969e0d8..62928c0924278905872ff336c29d4d206de3545a 100644 (file)
--- a/src/target_replace.c
+++ b/src/target_replace.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
+#include "utils/common/common.h"
 #include "utils_subst.h"
 
 #include <regex.h>

diff --git a/src/target_scale.c b/src/target_scale.c
index 1cc5d793d956e6a656b2896d719908acc6fd139e..4a9e9df4a9b8eae27c9a2b301a38c27913620dbd 100644 (file)
--- a/src/target_scale.c
+++ b/src/target_scale.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
+#include "utils/common/common.h"
 
 #include "utils_cache.h"
 

diff --git a/src/target_set.c b/src/target_set.c
index 9629e0eddf771b8382c1035f29db910a5a8addca..4bbd2c0dde3b89b1acbcee52650554cb55520665 100644 (file)
--- a/src/target_set.c
+++ b/src/target_set.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
-#include "meta_data.h"
+#include "utils/common/common.h"
+#include "utils/metadata/meta_data.h"
 #include "utils_subst.h"
 
 struct ts_key_list_s {

diff --git a/src/target_v5upgrade.c b/src/target_v5upgrade.c
index 650f9a5eae769ebb8e62afeaa4b2c5a169436b94..c2fe1922f984eb87b2b3bbd9cf27fb8c86dbfb76 100644 (file)
--- a/src/target_v5upgrade.c
+++ b/src/target_v5upgrade.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 static void v5_swap_instances(value_list_t *vl) /* {{{ */
 {

diff --git a/src/tcpconns.c b/src/tcpconns.c
index 5a3fd4ef9a76193c4d627197d00b5c3a7855f745..d01bcd2363e9692ef3a248209592cd789b24b37f 100644 (file)
--- a/src/tcpconns.c
+++ b/src/tcpconns.c
@@ -59,8 +59,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if defined(__OpenBSD__)
 #define HAVE_KVM_GETFILES 1

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index 567e5fb8a2586e20265033ccf75b342661d197d2..1ab6e4bf4ea5bbcd8b3750db1805bad4c07446ee 100644 (file)
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -23,8 +23,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <arpa/inet.h>
 #include <netdb.h>

diff --git a/src/ted.c b/src/ted.c
index b5fa4c1ece7c86ed9e59583ec481d3c905d0fb4e..e1b48fd6d0f91916bc26557dd7e3360ece0b88c9 100644 (file)
--- a/src/ted.c
+++ b/src/ted.c
@@ -36,8 +36,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_TERMIOS_H && HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>

diff --git a/src/thermal.c b/src/thermal.c
index 959fec64e9a389c77af1e05a5aad0056c201a198..5f448363de9b9f9c51c7db9e43be5cf7e06d2290 100644 (file)
--- a/src/thermal.c
+++ b/src/thermal.c
@@ -21,9 +21,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 #if !KERNEL_LINUX
 #error "This module is for Linux only."

diff --git a/src/threshold.c b/src/threshold.c
index 9d343630aae4427572f8bad227a791388fc83906..a3d865bac973fae6354faa1be3d95669fe7b57fa 100644 (file)
--- a/src/threshold.c
+++ b/src/threshold.c
@@ -25,9 +25,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 #include "utils_threshold.h"
 

diff --git a/src/tokyotyrant.c b/src/tokyotyrant.c
index aca0a4e36e506fa878791805dbf4415c11e18ab8..59b7a3422d5ba2883cc2ed784031e85781a51067 100644 (file)
--- a/src/tokyotyrant.c
+++ b/src/tokyotyrant.c
@@ -21,8 +21,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 
 #include <tcrdb.h>

diff --git a/src/turbostat.c b/src/turbostat.c
index 4a7af4c75dd98224f4adce044efa0a3fe9c761fa..deb16e0cda78f48c083002de0794d98501d9f28f 100644 (file)
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -37,8 +37,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_time.h"
 
 #include "msr-index.h"

diff --git a/src/unixsock.c b/src/unixsock.c
index 8c08e18a3a8d94c3caa65e713558af571bbfc056..6ff54997c5c8d88a3527576c981eb0e35d9002a7 100644 (file)
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -26,15 +26,15 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-
-#include "utils_cmd_flush.h"
-#include "utils_cmd_getthreshold.h"
-#include "utils_cmd_getval.h"
-#include "utils_cmd_listval.h"
-#include "utils_cmd_putnotif.h"
-#include "utils_cmd_putval.h"
+#include "utils/common/common.h"
+
+#include "utils/cmds/flush.h"
+#include "utils/cmds/getthreshold.h"
+#include "utils/cmds/getval.h"
+#include "utils/cmds/listval.h"
+#include "utils/cmds/putnotif.h"
+#include "utils/cmds/putval.h"
 
 #include <sys/stat.h>
 #include <sys/un.h>

diff --git a/src/uptime.c b/src/uptime.c
index 43d72e53d35fe1f8bc411e01bcba15f68629d49a..dd33ab38dd1467d57f7c046fd4bb6a835164b845 100644 (file)
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -21,8 +21,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if KERNEL_LINUX
 #include <sys/sysinfo.h>

diff --git a/src/users.c b/src/users.c
index 6bc7cc34e79f680316862f40b9780b0c010c801b..fc03ba2ce1e3f0d50ff45d9d43c30e6da5da07c5 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -27,8 +27,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_STATGRAB_H
 #include <statgrab.h>

diff --git a/src/daemon/utils_avltree.c b/src/utils/avltree/avltree.c
similarity index 99%
rename from src/daemon/utils_avltree.c
rename to src/utils/avltree/avltree.c
index 568d68c13d230d0d29f3b297edeffa768e62cf9d..af6efed95ac32bc89f61ea04ad1f745f2088d59c 100644 (file)
--- a/src/daemon/utils_avltree.c
+++ b/src/utils/avltree/avltree.c
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
 
 #define BALANCE(n)                                                             \
   ((((n)->left == NULL) ? 0 : (n)->left->height) -                             \

diff --git a/src/daemon/utils_avltree.h b/src/utils/avltree/avltree.h
similarity index 100%
rename from src/daemon/utils_avltree.h
rename to src/utils/avltree/avltree.h

diff --git a/src/daemon/utils_avltree_test.c b/src/utils/avltree/avltree_test.c
similarity index 98%
rename from src/daemon/utils_avltree_test.c
rename to src/utils/avltree/avltree_test.c
index 4be49416d7ef0d3f273c6e475c3fe5d8e8b97e10..8cbcb13ce4f2435e33b1ecc59ec039599a59c230 100644 (file)
--- a/src/daemon/utils_avltree_test.c
+++ b/src/utils/avltree/avltree_test.c
@@ -25,10 +25,10 @@
  */
 
 #include "collectd.h"
-#include "common.h" /* STATIC_ARRAY_SIZE */
+#include "utils/common/common.h" /* STATIC_ARRAY_SIZE */
 
 #include "testing.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
 
 static int compare_total_count;
 

diff --git a/src/utils_cmds.c b/src/utils/cmds/cmds.c
similarity index 97%
rename from src/utils_cmds.c
rename to src/utils/cmds/cmds.c
index 88fdfc7f9df3b762b5281ff398153973756bcb70..036cefa17de89633d92d5e5677f6c96b88409afa 100644 (file)
--- a/src/utils_cmds.c
+++ b/src/utils/cmds/cmds.c
@@ -26,13 +26,13 @@
  *   Sebastian 'tokkee' Harl <sh at tokkee.org>
  **/
 
-#include "daemon/common.h"
-#include "utils_cmd_flush.h"
-#include "utils_cmd_getval.h"
-#include "utils_cmd_listval.h"
-#include "utils_cmd_putval.h"
-#include "utils_cmds.h"
-#include "utils_parse_option.h"
+#include "utils/cmds/cmds.h"
+#include "utils/cmds/flush.h"
+#include "utils/cmds/getval.h"
+#include "utils/cmds/listval.h"
+#include "utils/cmds/parse_option.h"
+#include "utils/cmds/putval.h"
+#include "utils/common/common.h"
 
 #include <stdbool.h>
 #include <string.h>

diff --git a/src/utils_cmds.h b/src/utils/cmds/cmds.h
similarity index 100%
rename from src/utils_cmds.h
rename to src/utils/cmds/cmds.h

diff --git a/src/utils_cmds_test.c b/src/utils/cmds/cmds_test.c
similarity index 99%
rename from src/utils_cmds_test.c
rename to src/utils/cmds/cmds_test.c
index 93bf5129af874eb5fe6e2aa2be7462ab7e6179c3..713f03241e09a09f76ade51faf518f29cf81dc06 100644 (file)
--- a/src/utils_cmds_test.c
+++ b/src/utils/cmds/cmds_test.c
@@ -24,9 +24,9 @@
  *   Sebastian 'tokkee' Harl <sh at tokkee.org>
  **/
 
-#include "common.h"
 #include "testing.h"
-#include "utils_cmds.h"
+#include "utils/cmds/cmds.h"
+#include "utils/common/common.h"
 
 static void error_cb(void *ud, cmd_status_t status, const char *format,
                      va_list ap) {

diff --git a/src/utils_cmd_flush.c b/src/utils/cmds/flush.c
similarity index 98%
rename from src/utils_cmd_flush.c
rename to src/utils/cmds/flush.c
index b180a5019780e037ab2c90e86581f0eb90af1fcc..d080d48119c1bde80b855f8ef0ec253a34113464 100644 (file)
--- a/src/utils_cmd_flush.c
+++ b/src/utils/cmds/flush.c
@@ -28,9 +28,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_cmd_flush.h"
+#include "utils/cmds/flush.h"
+#include "utils/common/common.h"
 
 cmd_status_t cmd_parse_flush(size_t argc, char **argv, cmd_flush_t *ret_flush,
                              const cmd_options_t *opts,

diff --git a/src/utils_cmd_flush.h b/src/utils/cmds/flush.h
similarity index 98%
rename from src/utils_cmd_flush.h
rename to src/utils/cmds/flush.h
index 129aa85e51823918859951b08764a5370969126c..794ac1c9e89d2af74f480fa91608bc0811208df6 100644 (file)
--- a/src/utils_cmd_flush.h
+++ b/src/utils/cmds/flush.h
@@ -27,7 +27,7 @@
 #ifndef UTILS_CMD_FLUSH_H
 #define UTILS_CMD_FLUSH_H 1
 
-#include "utils_cmds.h"
+#include "utils/cmds/cmds.h"
 
 #include <stdio.h>
 

diff --git a/src/utils_cmd_getthreshold.c b/src/utils/cmds/getthreshold.c
similarity index 97%
rename from src/utils_cmd_getthreshold.c
rename to src/utils/cmds/getthreshold.c
index c1f3f562ca4c924b7794759fc505e72664e24e3f..0d4e2f1f1592723e300150706637798a95780281 100644 (file)
--- a/src/utils_cmd_getthreshold.c
+++ b/src/utils/cmds/getthreshold.c
@@ -26,12 +26,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
-#include "utils_avltree.h"
-#include "utils_cmd_getthreshold.h"
-#include "utils_parse_option.h" /* for `parse_string' */
+#include "utils/avltree/avltree.h"
+#include "utils/cmds/getthreshold.h"
+#include "utils/cmds/parse_option.h" /* for `parse_string' */
 #include "utils_threshold.h"
 
 #define print_to_socket(fh, ...)                                               \

diff --git a/src/utils_cmd_getthreshold.h b/src/utils/cmds/getthreshold.h
similarity index 100%
rename from src/utils_cmd_getthreshold.h
rename to src/utils/cmds/getthreshold.h

diff --git a/src/utils_cmd_getval.c b/src/utils/cmds/getval.c
similarity index 98%
rename from src/utils_cmd_getval.c
rename to src/utils/cmds/getval.c
index f747d5b862e8cf0770698d5e3ebf7d63f8b43ebb..f2586e126ba6e7077a790fdcb7ea421f2eb817e6 100644 (file)
--- a/src/utils_cmd_getval.c
+++ b/src/utils/cmds/getval.c
@@ -26,12 +26,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
+#include "utils/cmds/getval.h"
+#include "utils/cmds/parse_option.h"
 #include "utils_cache.h"
-#include "utils_cmd_getval.h"
-#include "utils_parse_option.h"
 
 cmd_status_t cmd_parse_getval(size_t argc, char **argv,
                               cmd_getval_t *ret_getval,

diff --git a/src/utils_cmd_getval.h b/src/utils/cmds/getval.h
similarity index 98%
rename from src/utils_cmd_getval.h
rename to src/utils/cmds/getval.h
index 5c03fa4cdbc3e858f1b9fcbf917e69d46e4267f2..f2f1c2eb3ae8ef3e1a8d05c78889bf3b3e854e87 100644 (file)
--- a/src/utils_cmd_getval.h
+++ b/src/utils/cmds/getval.h
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 
-#include "utils_cmds.h"
+#include "utils/cmds/cmds.h"
 
 cmd_status_t cmd_parse_getval(size_t argc, char **argv,
                               cmd_getval_t *ret_getval,

diff --git a/src/utils_cmd_listval.c b/src/utils/cmds/listval.c
similarity index 97%
rename from src/utils_cmd_listval.c
rename to src/utils/cmds/listval.c
index 24ec942144e48a89726810dedb4eeb0c409b3633..287786bb3babcc9b530e1f1837ee2011b32712ec 100644 (file)
--- a/src/utils_cmd_listval.c
+++ b/src/utils/cmds/listval.c
@@ -26,12 +26,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
+#include "utils/cmds/listval.h"
+#include "utils/cmds/parse_option.h"
 #include "utils_cache.h"
-#include "utils_cmd_listval.h"
-#include "utils_parse_option.h"
 
 cmd_status_t cmd_parse_listval(size_t argc, char **argv,
                                const cmd_options_t *opts

diff --git a/src/utils_cmd_listval.h b/src/utils/cmds/listval.h
similarity index 98%
rename from src/utils_cmd_listval.h
rename to src/utils/cmds/listval.h
index 6dbaabcbaf08148eaea3cff4b5eb31d9708835da..6fff019ec15cab2330dd8f6d4cc3f14d4ac5628b 100644 (file)
--- a/src/utils_cmd_listval.h
+++ b/src/utils/cmds/listval.h
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 
-#include "utils_cmds.h"
+#include "utils/cmds/cmds.h"
 
 cmd_status_t cmd_parse_listval(size_t argc, char **argv,
                                const cmd_options_t *opts,

diff --git a/src/utils_parse_option.c b/src/utils/cmds/parse_option.c
similarity index 99%
rename from src/utils_parse_option.c
rename to src/utils/cmds/parse_option.c
index 005715c9b1b4c81e7fa2a83e5441970255799ab0..e6b516d6699e6b3393fa9b4c5a09852390133126 100644 (file)
--- a/src/utils_parse_option.c
+++ b/src/utils/cmds/parse_option.c
@@ -26,7 +26,7 @@
 
 #include "collectd.h"
 
-#include "utils_parse_option.h"
+#include "utils/cmds/parse_option.h"
 
 int parse_string(char **ret_buffer, char **ret_string) {
   char *buffer;

diff --git a/src/utils_parse_option.h b/src/utils/cmds/parse_option.h
similarity index 100%
rename from src/utils_parse_option.h
rename to src/utils/cmds/parse_option.h

diff --git a/src/utils_cmd_putnotif.c b/src/utils/cmds/putnotif.c
similarity index 98%
rename from src/utils_cmd_putnotif.c
rename to src/utils/cmds/putnotif.c
index 75a8fae8bf7694f342d151121965ba0a77838ebe..e1fecf8463f980490780ba75e42f3aec5da2aeda 100644 (file)
--- a/src/utils_cmd_putnotif.c
+++ b/src/utils/cmds/putnotif.c
@@ -26,11 +26,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
-#include "utils_cmd_putnotif.h"
-#include "utils_parse_option.h"
+#include "utils/cmds/parse_option.h"
+#include "utils/cmds/putnotif.h"
 
 #define print_to_socket(fh, ...)                                               \
   do {                                                                         \

diff --git a/src/utils_cmd_putnotif.h b/src/utils/cmds/putnotif.h
similarity index 100%
rename from src/utils_cmd_putnotif.h
rename to src/utils/cmds/putnotif.h

diff --git a/src/utils_cmd_putval.c b/src/utils/cmds/putval.c
similarity index 99%
rename from src/utils_cmd_putval.c
rename to src/utils/cmds/putval.c
index b5b9065be16ddd96f09e7a17b1498c9ee7af217f..b6d5ccc67ca9745bf4cade937d4fb82bf44e4a83 100644 (file)
--- a/src/utils_cmd_putval.c
+++ b/src/utils/cmds/putval.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "utils_cmd_putval.h"
+#include "utils/cmds/putval.h"
+#include "utils/common/common.h"
 
 /*
  * private helper functions

diff --git a/src/utils_cmd_putval.h b/src/utils/cmds/putval.h
similarity index 98%
rename from src/utils_cmd_putval.h
rename to src/utils/cmds/putval.h
index bc6e193eeb9e1db340e2eabd99dd70fc26b632c0..f6c3e3b87cbbb17470df53189288436b19516660 100644 (file)
--- a/src/utils_cmd_putval.h
+++ b/src/utils/cmds/putval.h
@@ -28,7 +28,7 @@
 #define UTILS_CMD_PUTVAL_H 1
 
 #include "plugin.h"
-#include "utils_cmds.h"
+#include "utils/cmds/cmds.h"
 
 #include <stdio.h>
 

diff --git a/src/daemon/common.c b/src/utils/common/common.c
similarity index 99%
rename from src/daemon/common.c
rename to src/utils/common/common.c
index b5a1c980f549e517052a345e38dc3f88ea4cac20..d15f9b7c771c708d5e30b00f90d253ffc1e58e08 100644 (file)
--- a/src/daemon/common.c
+++ b/src/utils/common/common.c
@@ -29,8 +29,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 
 /* for getaddrinfo */

diff --git a/src/daemon/common.h b/src/utils/common/common.h
similarity index 100%
rename from src/daemon/common.h
rename to src/utils/common/common.h

diff --git a/src/daemon/common_test.c b/src/utils/common/common_test.c
similarity index 99%
rename from src/daemon/common_test.c
rename to src/utils/common/common_test.c
index 93a19d1b0db8b5af795f491d5cf4b69cbfd8ed04..426082fa38322413427831dbe7bafbff5173eb65 100644 (file)
--- a/src/daemon/common_test.c
+++ b/src/utils/common/common_test.c
@@ -24,8 +24,8 @@
  *   Florian octo Forster <octo at collectd.org>
  */
 
-#include "common.h"
 #include "testing.h"
+#include "utils/common/common.h"
 
 #if HAVE_KSTAT_H
 #include <kstat.h>

diff --git a/src/utils_config_cores.c b/src/utils/config_cores/config_cores.c
similarity index 99%
rename from src/utils_config_cores.c
rename to src/utils/config_cores/config_cores.c
index 94657459f225ed5b83436200cee57b24ee9347b5..13ea687809971e1ec58f06c58af350b4d3e3667f 100644 (file)
--- a/src/utils_config_cores.c
+++ b/src/utils/config_cores/config_cores.c
@@ -27,9 +27,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 
-#include "utils_config_cores.h"
+#include "utils/config_cores/config_cores.h"
 
 #define UTIL_NAME "utils_config_cores"
 

diff --git a/src/utils_config_cores.h b/src/utils/config_cores/config_cores.h
similarity index 100%
rename from src/utils_config_cores.h
rename to src/utils/config_cores/config_cores.h

diff --git a/src/utils_config_cores_test.c b/src/utils/config_cores/config_cores_test.c
similarity index 99%
rename from src/utils_config_cores_test.c
rename to src/utils/config_cores/config_cores_test.c
index 2c6f5b602efcd8ede70854765792370e2f2bd123..8b4f4c4cf81f1b9ab84bb351a7f4d0a42213422a 100644 (file)
--- a/src/utils_config_cores_test.c
+++ b/src/utils/config_cores/config_cores_test.c
@@ -28,7 +28,7 @@
 #include "collectd.h"
 
 #include "testing.h"
-#include "utils_config_cores.c" /* sic */
+#include "utils/config_cores/config_cores.c" /* sic */
 
 oconfig_value_t test_cfg_values[] = {{{"0"}, OCONFIG_TYPE_STRING},
                                      {{"1-2"}, OCONFIG_TYPE_STRING},

diff --git a/src/utils_crc32.c b/src/utils/crc32/crc32.c
similarity index 100%
rename from src/utils_crc32.c
rename to src/utils/crc32/crc32.c

diff --git a/src/utils_crc32.h b/src/utils/crc32/crc32.h
similarity index 100%
rename from src/utils_crc32.h
rename to src/utils/crc32/crc32.h

diff --git a/src/utils_curl_stats.c b/src/utils/curl_stats/curl_stats.c
similarity index 99%
rename from src/utils_curl_stats.c
rename to src/utils/curl_stats/curl_stats.c
index 09856599b090672f2f05fff356a6e905d7d30fdc..a897171945b486916ecef0d2cfecc8c87f95cd67 100644 (file)
--- a/src/utils_curl_stats.c
+++ b/src/utils/curl_stats/curl_stats.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "utils_curl_stats.h"
+#include "utils/common/common.h"
+#include "utils/curl_stats/curl_stats.h"
 
 #include <stdbool.h>
 #include <stddef.h>

diff --git a/src/utils_curl_stats.h b/src/utils/curl_stats/curl_stats.h
similarity index 100%
rename from src/utils_curl_stats.h
rename to src/utils/curl_stats/curl_stats.h

diff --git a/src/utils_db_query.c b/src/utils/db_query/db_query.c
similarity index 99%
rename from src/utils_db_query.c
rename to src/utils/db_query/db_query.c
index 73c1b45ea0465055fa78bcb6cd17b2eb4ab93d42..392bd56fdf5dbcf09b0c91be6002f3da9f0f6fa4 100644 (file)
--- a/src/utils_db_query.c
+++ b/src/utils/db_query/db_query.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_db_query.h"
+#include "utils/common/common.h"
+#include "utils/db_query/db_query.h"
 
 /*
  * Data types

diff --git a/src/utils_db_query.h b/src/utils/db_query/db_query.h
similarity index 100%
rename from src/utils_db_query.h
rename to src/utils/db_query/db_query.h

diff --git a/src/utils_deq.h b/src/utils/deq/deq.h
similarity index 100%
rename from src/utils_deq.h
rename to src/utils/deq/deq.h

diff --git a/src/utils_dns.c b/src/utils/dns/dns.c
similarity index 99%
rename from src/utils_dns.c
rename to src/utils/dns/dns.c
index 7b20e139c4cb0ac862f52b96608d56100834cab5..2ea919b765be83f3219bd615fa8e7ef3c3d6f022 100644 (file)
--- a/src/utils_dns.c
+++ b/src/utils/dns/dns.c
@@ -38,8 +38,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_NET_IF_ARP_H
 #include <net/if_arp.h>
@@ -128,7 +128,7 @@
 #define HAVE_IPV6 1
 #endif
 
-#include "utils_dns.h"
+#include "utils/dns/dns.h"
 
 /*
  * Type definitions

diff --git a/src/utils_dns.h b/src/utils/dns/dns.h
similarity index 100%
rename from src/utils_dns.h
rename to src/utils/dns/dns.h

diff --git a/src/utils_dpdk.c b/src/utils/dpdk/dpdk.c
similarity index 99%
rename from src/utils_dpdk.c
rename to src/utils/dpdk/dpdk.c
index 3591eae1d3e30c18e1c907782edc61012bf860aa..5e38ab364020da772bf57f5b1698835cafe56883 100644 (file)
--- a/src/utils_dpdk.c
+++ b/src/utils/dpdk/dpdk.c
@@ -40,8 +40,8 @@
 #include <rte_eal.h>
 #include <rte_ethdev.h>
 
-#include "common.h"
-#include "utils_dpdk.h"
+#include "utils/common/common.h"
+#include "utils/dpdk/dpdk.h"
 
 #if RTE_VERSION <= RTE_VERSION_NUM(18, 5, 0, 0)
 #define DPDK_DEFAULT_RTE_CONFIG "/var/run/.rte_config"

diff --git a/src/utils_dpdk.h b/src/utils/dpdk/dpdk.h
similarity index 100%
rename from src/utils_dpdk.h
rename to src/utils/dpdk/dpdk.h

diff --git a/src/utils_format_graphite.c b/src/utils/format_graphite/format_graphite.c
similarity index 99%
rename from src/utils_format_graphite.c
rename to src/utils/format_graphite/format_graphite.c
index de3f0c2e7c8833ead031ddb5e77e4cbb23a47a64..d0e047ff81aa257daae97ef207c998b4fee808ce 100644 (file)
--- a/src/utils_format_graphite.c
+++ b/src/utils/format_graphite/format_graphite.c
@@ -23,11 +23,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
+#include "utils/format_graphite/format_graphite.h"
 #include "utils_cache.h"
-#include "utils_format_graphite.h"
 
 #define GRAPHITE_FORBIDDEN " \t\"\\:!/()\n\r"
 

diff --git a/src/utils_format_graphite.h b/src/utils/format_graphite/format_graphite.h
similarity index 100%
rename from src/utils_format_graphite.h
rename to src/utils/format_graphite/format_graphite.h

diff --git a/src/utils_format_graphite_test.c b/src/utils/format_graphite/format_graphite_test.c
similarity index 98%
rename from src/utils_format_graphite_test.c
rename to src/utils/format_graphite/format_graphite_test.c
index 42efa681654deb06774d1048d39892621d8d44d9..2c14d01050bcca8b73db935f19633dc82f3edd7e 100644 (file)
--- a/src/utils_format_graphite_test.c
+++ b/src/utils/format_graphite/format_graphite_test.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h" /* for STATIC_ARRAY_SIZE */
 #include "testing.h"
-#include "utils_format_graphite.h"
+#include "utils/common/common.h" /* for STATIC_ARRAY_SIZE */
+#include "utils/format_graphite/format_graphite.h"
 
 static data_set_t ds_single = {
     .type = "single",

diff --git a/src/utils_format_json.c b/src/utils/format_json/format_json.c
similarity index 99%
rename from src/utils_format_json.c
rename to src/utils/format_json/format_json.c
index 25cbb0a7b000998a414ca3406f03f7e307cbdd38..b82f21dcb29b96b2d143fae344de9fe9a3840c98 100644 (file)
--- a/src/utils_format_json.c
+++ b/src/utils/format_json/format_json.c
@@ -26,10 +26,10 @@
 
 #include "collectd.h"
 
-#include "utils_format_json.h"
+#include "utils/format_json/format_json.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 
 #if HAVE_LIBYAJL

diff --git a/src/utils_format_json.h b/src/utils/format_json/format_json.h
similarity index 100%
rename from src/utils_format_json.h
rename to src/utils/format_json/format_json.h

diff --git a/src/utils_format_json_test.c b/src/utils/format_json/format_json_test.c
similarity index 97%
rename from src/utils_format_json_test.c
rename to src/utils/format_json/format_json_test.c
index b230ef351739abb7aa127a4fa30cb4f8883bc331..d04160491fbeae494ec43de61a0bd36a0f297198 100644 (file)
--- a/src/utils_format_json_test.c
+++ b/src/utils/format_json/format_json_test.c
@@ -38,9 +38,9 @@
 
 #include "collectd.h"
 
-#include "common.h" /* for STATIC_ARRAY_SIZE */
 #include "testing.h"
-#include "utils_format_json.h"
+#include "utils/common/common.h" /* for STATIC_ARRAY_SIZE */
+#include "utils/format_json/format_json.h"
 
 #include <yajl/yajl_common.h>
 #include <yajl/yajl_parse.h>

diff --git a/src/utils_format_kairosdb.c b/src/utils/format_kairosdb/format_kairosdb.c
similarity index 99%
rename from src/utils_format_kairosdb.c
rename to src/utils/format_kairosdb/format_kairosdb.c
index d957bc800e8a8d8b20860ca90cc22b3e53728984..3f29fcd963b590fbe3ad8420e4d4b44b4984c3a6 100644 (file)
--- a/src/utils_format_kairosdb.c
+++ b/src/utils/format_kairosdb/format_kairosdb.c
@@ -26,11 +26,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
+#include "utils/format_kairosdb/format_kairosdb.h"
 #include "utils_cache.h"
-#include "utils_format_kairosdb.h"
 
 /* This is the KAIROSDB format for write_http output
  *

diff --git a/src/utils_format_kairosdb.h b/src/utils/format_kairosdb/format_kairosdb.h
similarity index 100%
rename from src/utils_format_kairosdb.h
rename to src/utils/format_kairosdb/format_kairosdb.h

diff --git a/src/utils_format_stackdriver.c b/src/utils/format_stackdriver/format_stackdriver.c
similarity index 99%
rename from src/utils_format_stackdriver.c
rename to src/utils/format_stackdriver/format_stackdriver.c
index afaa8ed810e0ff420a5b50963d28e3ed24f99880..80b85ae44cfd7608b736b07e37221d082a3d4914 100644 (file)
--- a/src/utils_format_stackdriver.c
+++ b/src/utils/format_stackdriver/format_stackdriver.c
@@ -22,11 +22,11 @@
 
 #include "collectd.h"
 
-#include "utils_format_stackdriver.h"
+#include "utils/format_stackdriver/format_stackdriver.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 #include "utils_time.h"
 

diff --git a/src/utils_format_stackdriver.h b/src/utils/format_stackdriver/format_stackdriver.h
similarity index 100%
rename from src/utils_format_stackdriver.h
rename to src/utils/format_stackdriver/format_stackdriver.h

diff --git a/src/utils_format_stackdriver_test.c b/src/utils/format_stackdriver/format_stackdriver_test.c
similarity index 97%
rename from src/utils_format_stackdriver_test.c
rename to src/utils/format_stackdriver/format_stackdriver_test.c
index 1e96b65e748e5cb11f423b032df20808c4aab0cc..d4935a318be01d80e57981ac172cd0833dd594ac 100644 (file)
--- a/src/utils_format_stackdriver_test.c
+++ b/src/utils/format_stackdriver/format_stackdriver_test.c
@@ -23,7 +23,7 @@
 #include "collectd.h"
 
 #include "testing.h"
-#include "utils_format_stackdriver.h"
+#include "utils/format_stackdriver/format_stackdriver.h"
 
 DEF_TEST(sd_format_metric_descriptor) {
   value_list_t vl = {

diff --git a/src/utils_gce.c b/src/utils/gce/gce.c
similarity index 98%
rename from src/utils_gce.c
rename to src/utils/gce/gce.c
index d43d1de502fb8fb1435a3ea7f7a6037cff955345..80927656e0e6c2a0dad9259cc85e52769744c7e3 100644 (file)
--- a/src/utils_gce.c
+++ b/src/utils/gce/gce.c
@@ -22,10 +22,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_gce.h"
-#include "utils_oauth.h"
+#include "utils/common/common.h"
+#include "utils/gce/gce.h"
+#include "utils/oauth/oauth.h"
 #include "utils_time.h"
 
 #include <curl/curl.h>

diff --git a/src/utils_gce.h b/src/utils/gce/gce.h
similarity index 100%
rename from src/utils_gce.h
rename to src/utils/gce/gce.h

diff --git a/src/daemon/utils_heap.c b/src/utils/heap/heap.c
similarity index 99%
rename from src/daemon/utils_heap.c
rename to src/utils/heap/heap.c
index 3cecd8930f2984fc3806e1a4fa16c2c2929c97fb..2fe2bcb78243af8f2ae8fc93b6479a2b86203d55 100644 (file)
--- a/src/daemon/utils_heap.c
+++ b/src/utils/heap/heap.c
@@ -31,7 +31,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 
-#include "utils_heap.h"
+#include "utils/heap/heap.h"
 
 struct c_heap_s {
   pthread_mutex_t lock;

diff --git a/src/daemon/utils_heap.h b/src/utils/heap/heap.h
similarity index 100%
rename from src/daemon/utils_heap.h
rename to src/utils/heap/heap.h

diff --git a/src/daemon/utils_heap_test.c b/src/utils/heap/heap_test.c
similarity index 98%
rename from src/daemon/utils_heap_test.c
rename to src/utils/heap/heap_test.c
index 827c090f512ddc51c9d3ab285d5b4926d32f5923..169824e71459782f84f7cfd8c94f0e8904fa861f 100644 (file)
--- a/src/daemon/utils_heap_test.c
+++ b/src/utils/heap/heap_test.c
@@ -27,7 +27,7 @@
 #include "collectd.h"
 
 #include "testing.h"
-#include "utils_heap.h"
+#include "utils/heap/heap.h"
 
 static int compare(void const *v0, void const *v1) {
   int const *i0 = v0;

diff --git a/src/utils_ignorelist.c b/src/utils/ignorelist/ignorelist.c
similarity index 99%
rename from src/utils_ignorelist.c
rename to src/utils/ignorelist/ignorelist.c
index b3851026a8dffd04a98d9bed0755fb89331a5b26..9e1b9e3a2ed0c0519f3ecc3c0b1fdef20f8d91a1 100644 (file)
--- a/src/utils_ignorelist.c
+++ b/src/utils/ignorelist/ignorelist.c
@@ -52,9 +52,9 @@
 #include "config.h"
 #endif
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 
 /*
  * private prototypes

diff --git a/src/utils_ignorelist.h b/src/utils/ignorelist/ignorelist.h
similarity index 100%
rename from src/utils_ignorelist.h
rename to src/utils/ignorelist/ignorelist.h

diff --git a/src/utils_latency.c b/src/utils/latency/latency.c
similarity index 99%
rename from src/utils_latency.c
rename to src/utils/latency/latency.c
index 6e4f87328e0fb6b1a8a164b261bb9131609d9172..12ff2ca1db33eba3d59da6ebf2324cccaa408602 100644 (file)
--- a/src/utils_latency.c
+++ b/src/utils/latency/latency.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_latency.h"
+#include "utils/common/common.h"
+#include "utils/latency/latency.h"
 
 #include <limits.h>
 #include <math.h>

diff --git a/src/utils_latency.h b/src/utils/latency/latency.h
similarity index 100%
rename from src/utils_latency.h
rename to src/utils/latency/latency.h

diff --git a/src/utils_latency_config.c b/src/utils/latency/latency_config.c
similarity index 98%
rename from src/utils_latency_config.c
rename to src/utils/latency/latency_config.c
index 9a91f113da4b8c75c195ced04a03d31c852e6fc2..a5ae4719a83e5887c13867c2ceb4cbbbe40b5f5e 100644 (file)
--- a/src/utils_latency_config.c
+++ b/src/utils/latency/latency_config.c
@@ -26,8 +26,8 @@
  */
 
 #include "collectd.h"
-#include "common.h"
-#include "utils_latency_config.h"
+#include "utils/common/common.h"
+#include "utils/latency/latency_config.h"
 
 static int latency_config_add_percentile(latency_config_t *conf,
                                          oconfig_item_t *ci) {

diff --git a/src/utils_latency_config.h b/src/utils/latency/latency_config.h
similarity index 100%
rename from src/utils_latency_config.h
rename to src/utils/latency/latency_config.h

diff --git a/src/utils_latency_test.c b/src/utils/latency/latency_test.c
similarity index 98%
rename from src/utils_latency_test.c
rename to src/utils/latency/latency_test.c
index 42a6e87ec79eab12c9fdc42148695f1a51a14d1e..132501747ba2225359d550e22ae70254e36e976f 100644 (file)
--- a/src/utils_latency_test.c
+++ b/src/utils/latency/latency_test.c
@@ -27,10 +27,10 @@
 #define DBL_PRECISION 1e-6
 
 #include "collectd.h"
-#include "common.h" /* for STATIC_ARRAY_SIZE */
+#include "utils/common/common.h" /* for STATIC_ARRAY_SIZE */
 
 #include "testing.h"
-#include "utils_latency.h"
+#include "utils/latency/latency.h"
 #include "utils_time.h"
 
 DEF_TEST(simple) {

diff --git a/src/utils_vl_lookup.c b/src/utils/lookup/vl_lookup.c
similarity index 99%
rename from src/utils_vl_lookup.c
rename to src/utils/lookup/vl_lookup.c
index 03e61f80ffd0159efcc7cc4ea20fafaf7618ff71..38d81ca4fe9b2b74c1aaf11db657295c39e4261f 100644 (file)
--- a/src/utils_vl_lookup.c
+++ b/src/utils/lookup/vl_lookup.c
@@ -29,9 +29,9 @@
 #include <pthread.h>
 #include <regex.h>
 
-#include "common.h"
-#include "utils_avltree.h"
-#include "utils_vl_lookup.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
+#include "utils/lookup/vl_lookup.h"
 
 #if HAVE_KSTAT_H
 #include <kstat.h>

diff --git a/src/utils_vl_lookup.h b/src/utils/lookup/vl_lookup.h
similarity index 100%
rename from src/utils_vl_lookup.h
rename to src/utils/lookup/vl_lookup.h

diff --git a/src/utils_vl_lookup_test.c b/src/utils/lookup/vl_lookup_test.c
similarity index 99%
rename from src/utils_vl_lookup_test.c
rename to src/utils/lookup/vl_lookup_test.c
index 1cb7b65bfda6b3b6d44e38cfc9d4a5a8b3349879..2dd53ce3fc41a05a35418e60a46d004cdb8a0189 100644 (file)
--- a/src/utils_vl_lookup_test.c
+++ b/src/utils/lookup/vl_lookup_test.c
@@ -27,7 +27,7 @@
 #include "collectd.h"
 
 #include "testing.h"
-#include "utils_vl_lookup.h"
+#include "utils/lookup/vl_lookup.h"
 
 static bool expect_new_obj;
 static bool have_new_obj;

diff --git a/src/utils_match.c b/src/utils/match/match.c
similarity index 99%
rename from src/utils_match.c
rename to src/utils/match/match.c
index d3edb57ccbaeac885a429fdc0eb435f54df0b165..ca6f1aaa7779a86b2a54da95636b3ab52e56f6aa 100644 (file)
--- a/src/utils_match.c
+++ b/src/utils/match/match.c
@@ -26,10 +26,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
-#include "utils_match.h"
+#include "utils/match/match.h"
 
 #include <regex.h>
 

diff --git a/src/utils_match.h b/src/utils/match/match.h
similarity index 99%
rename from src/utils_match.h
rename to src/utils/match/match.h
index 1cff1eb755092a4734bcb9291e6ed79729af8341..c4aee0a1c871f1f112f857344cec35e637496f35 100644 (file)
--- a/src/utils_match.h
+++ b/src/utils/match/match.h
@@ -28,7 +28,7 @@
 #define UTILS_MATCH_H 1
 
 #include "plugin.h"
-#include "utils_latency.h"
+#include "utils/latency/latency.h"
 
 /*
  * Each type may have 12 sub-types

diff --git a/src/daemon/meta_data.c b/src/utils/metadata/meta_data.c
similarity index 99%
rename from src/daemon/meta_data.c
rename to src/utils/metadata/meta_data.c
index 08f682e96dac393b814caf6b901ca3a4ab0bdd40..963aebbe9d55baca3911fb5b1c81d21395aeceb2 100644 (file)
--- a/src/daemon/meta_data.c
+++ b/src/utils/metadata/meta_data.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "meta_data.h"
 #include "plugin.h"
+#include "utils/common/common.h"
+#include "utils/metadata/meta_data.h"
 
 #define MD_MAX_NONSTRING_CHARS 128
 

diff --git a/src/daemon/meta_data.h b/src/utils/metadata/meta_data.h
similarity index 100%
rename from src/daemon/meta_data.h
rename to src/utils/metadata/meta_data.h

diff --git a/src/daemon/meta_data_test.c b/src/utils/metadata/meta_data_test.c
similarity index 97%
rename from src/daemon/meta_data_test.c
rename to src/utils/metadata/meta_data_test.c
index ca80836441f30b029803924814085a82bd7bee2a..b9ff86d5f97521c035974e4d1d9208dc337575a2 100644 (file)
--- a/src/daemon/meta_data_test.c
+++ b/src/utils/metadata/meta_data_test.c
@@ -26,10 +26,10 @@
 
 #include "collectd.h"
 
-#include "common.h" /* for STATIC_ARRAY_SIZE */
+#include "utils/common/common.h" /* for STATIC_ARRAY_SIZE */
 
-#include "meta_data.h"
 #include "testing.h"
+#include "utils/metadata/meta_data.h"
 
 DEF_TEST(base) {
   meta_data_t *m;

diff --git a/src/utils_mount.c b/src/utils/mount/mount.c
similarity index 99%
rename from src/utils_mount.c
rename to src/utils/mount/mount.c
index 279f8e2f8b8abddab3383eac010b047034cba83c..319c624882bb5a1aef7ba925ea5f63ee8d67858f 100644 (file)
--- a/src/utils_mount.c
+++ b/src/utils/mount/mount.c
@@ -28,7 +28,7 @@
 
 #include "collectd.h"
 
-#include "utils_mount.h"
+#include "utils/mount/mount.h"
 
 #if HAVE_XFS_XQM_H
 #include <xfs/xqm.h>
@@ -36,8 +36,8 @@
 #define XFS_SUPER_MAGIC2_STR "BSFX"
 #endif
 
-#include "common.h" /* sstrncpy() et alii */
-#include "plugin.h" /* ERROR() macro */
+#include "plugin.h"              /* ERROR() macro */
+#include "utils/common/common.h" /* sstrncpy() et alii */
 
 #if HAVE_GETVFSSTAT
 #if HAVE_SYS_TYPES_H

diff --git a/src/utils_mount.h b/src/utils/mount/mount.h
similarity index 100%
rename from src/utils_mount.h
rename to src/utils/mount/mount.h

diff --git a/src/utils_mount_test.c b/src/utils/mount/mount_test.c
similarity index 98%
rename from src/utils_mount_test.c
rename to src/utils/mount/mount_test.c
index e8f3009423706622988853b351932d730941d463..e34e677caf638a139c8c816a0626f8dcce281760 100644 (file)
--- a/src/utils_mount_test.c
+++ b/src/utils/mount/mount_test.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "testing.h"
-#include "utils_mount.h"
+#include "utils/common/common.h"
+#include "utils/mount/mount.h"
 
 #if HAVE_KSTAT_H
 #include <kstat.h>

diff --git a/src/utils_oauth.c b/src/utils/oauth/oauth.c
similarity index 99%
rename from src/utils_oauth.c
rename to src/utils/oauth/oauth.c
index d804b51a0ffa04f02b593689a27ef879940b6c66..671de84da7657f131fb463537aa8967910ce6876 100644 (file)
--- a/src/utils_oauth.c
+++ b/src/utils/oauth/oauth.c
@@ -22,9 +22,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_oauth.h"
+#include "utils/common/common.h"
+#include "utils/oauth/oauth.h"
 
 #include <curl/curl.h>
 

diff --git a/src/utils_oauth.h b/src/utils/oauth/oauth.h
similarity index 100%
rename from src/utils_oauth.h
rename to src/utils/oauth/oauth.h

diff --git a/src/utils_oauth_test.c b/src/utils/oauth/oauth_test.c
similarity index 99%
rename from src/utils_oauth_test.c
rename to src/utils/oauth/oauth_test.c
index 791564fbbf2dbefe0346aa7b422bdb96b5024e7b..aa6e99a3856f40eb0a81bd1c3cf4b4c1720d3e3e 100644 (file)
--- a/src/utils_oauth_test.c
+++ b/src/utils/oauth/oauth_test.c
@@ -25,7 +25,7 @@
  **/
 
 #include "testing.h"
-#include "utils_oauth.h"
+#include "utils/oauth/oauth.h"
 
 struct {
   char *json;

diff --git a/src/utils_ovs.c b/src/utils/ovs/ovs.c
similarity index 99%
rename from src/utils_ovs.c
rename to src/utils/ovs/ovs.c
index 6fe6fe764e439a6d0fcdd014b5cadffc023f82df..46c2c2696d19cb62b95f76c770cdbac5fc1c0a74 100644 (file)
--- a/src/utils_ovs.c
+++ b/src/utils/ovs/ovs.c
@@ -70,10 +70,10 @@
 /* collectd headers */
 #include "collectd.h"
 
-#include "common.h"
+#include "utils/common/common.h"
 
 /* private headers */
-#include "utils_ovs.h"
+#include "utils/ovs/ovs.h"
 
 /* system libraries */
 #if HAVE_NETDB_H

diff --git a/src/utils_ovs.h b/src/utils/ovs/ovs.h
similarity index 94%
rename from src/utils_ovs.h
rename to src/utils/ovs/ovs.h
index 52c2f915ce62f55e65d6e001638cee2b5740048d..c93322eaf53f13cc93e6a91109fe0273ad221cd4 100644 (file)
--- a/src/utils_ovs.h
+++ b/src/utils/ovs/ovs.h
@@ -3,15 +3,15 @@
  *
  * Copyright(c) 2016 Intel Corporation. All rights reserved.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

diff --git a/src/utils_rrdcreate.c b/src/utils/rrdcreate/rrdcreate.c
similarity index 99%
rename from src/utils_rrdcreate.c
rename to src/utils/rrdcreate/rrdcreate.c
index 7f1f235441f8b28106d1ebd99a8bc0086f047755..ef01234381f0745bd9db1ed5dd4a2742addfbc06 100644 (file)
--- a/src/utils_rrdcreate.c
+++ b/src/utils/rrdcreate/rrdcreate.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "utils_rrdcreate.h"
+#include "utils/common/common.h"
+#include "utils/rrdcreate/rrdcreate.h"
 
 #include <pthread.h>
 #include <rrd.h>

diff --git a/src/utils_rrdcreate.h b/src/utils/rrdcreate/rrdcreate.h
similarity index 100%
rename from src/utils_rrdcreate.h
rename to src/utils/rrdcreate/rrdcreate.h

diff --git a/src/utils_tail.c b/src/utils/tail/tail.c
similarity index 98%
rename from src/utils_tail.c
rename to src/utils/tail/tail.c
index 365bf558b55065fdae6327401495e5b1751ef878..db34a72b10ad9a8cc76da3c51b953e54b1776a58 100644 (file)
--- a/src/utils_tail.c
+++ b/src/utils/tail/tail.c
@@ -32,8 +32,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "utils_tail.h"
+#include "utils/common/common.h"
+#include "utils/tail/tail.h"
 
 struct cu_tail_s {
   char *file;

diff --git a/src/utils_tail.h b/src/utils/tail/tail.h
similarity index 100%
rename from src/utils_tail.h
rename to src/utils/tail/tail.h

diff --git a/src/utils_taskstats.c b/src/utils/taskstats/taskstats.c
similarity index 99%
rename from src/utils_taskstats.c
rename to src/utils/taskstats/taskstats.c
index f0d7333488374ece03c9e32d186558f51b332a2d..b020c06c0080258019d71375412b9d68b7d8c30c 100644 (file)
--- a/src/utils_taskstats.c
+++ b/src/utils/taskstats/taskstats.c
@@ -21,10 +21,10 @@
  */
 
 #include "collectd.h"
-#include "utils_taskstats.h"
+#include "utils/taskstats/taskstats.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_time.h"
 
 #include <libmnl/libmnl.h>

diff --git a/src/utils_taskstats.h b/src/utils/taskstats/taskstats.h
similarity index 100%
rename from src/utils_taskstats.h
rename to src/utils/taskstats/taskstats.h

diff --git a/src/utils_fbhash.c b/src/utils_fbhash.c
index 0713463520879232eee5e9dff6091d93d9a63633..7c342e53c3715295078f58a36a8a9a6d1d067251 100644 (file)
--- a/src/utils_fbhash.c
+++ b/src/utils_fbhash.c
@@ -28,7 +28,7 @@
 
 #include "plugin.h"
 
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
 #include "utils_fbhash.h"
 
 struct fbhash_s {

diff --git a/src/utils_lua.c b/src/utils_lua.c
index 11ac001061733ecd396cc0277d358928d5143b0d..d0de9085b66a721b5be102ec89be9491fcbd2932 100644 (file)
--- a/src/utils_lua.c
+++ b/src/utils_lua.c
@@ -24,7 +24,7 @@
  *   Florian Forster <octo at collectd.org>
  **/
 
-#include "common.h"
+#include "utils/common/common.h"
 #include "utils_lua.h"
 
 static int ltoc_values(lua_State *L, /* {{{ */

diff --git a/src/utils_tail_match.c b/src/utils_tail_match.c
index ccab5acedf6171ba3f5d2ea940451701392f4809..0e5a861141e768ec3f1329af4b59d79f927c06b1 100644 (file)
--- a/src/utils_tail_match.c
+++ b/src/utils_tail_match.c
@@ -31,11 +31,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_latency_config.h"
-#include "utils_match.h"
-#include "utils_tail.h"
+#include "utils/common/common.h"
+#include "utils/latency/latency_config.h"
+#include "utils/match/match.h"
+#include "utils/tail/tail.h"
 #include "utils_tail_match.h"
 
 struct cu_tail_match_simple_s {

diff --git a/src/utils_tail_match.h b/src/utils_tail_match.h
index 2d4c2531ffd6dda11f072e380903c5915f4d0bef..0217a7e80f5433ba20c795108b710e210bc91413 100644 (file)
--- a/src/utils_tail_match.h
+++ b/src/utils_tail_match.h
@@ -33,8 +33,8 @@
  *   regular expressions.
  */
 
-#include "utils_latency_config.h"
-#include "utils_match.h"
+#include "utils/latency/latency_config.h"
+#include "utils/match/match.h"
 
 struct cu_tail_match_s;
 typedef struct cu_tail_match_s cu_tail_match_t;

diff --git a/src/uuid.c b/src/uuid.c
index c7878c74dd54a7836bfdc08329e0ae77ab6aa639..60d09b513c32d7a960c7990eef43dfeabc02f245 100644 (file)
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>

diff --git a/src/varnish.c b/src/varnish.c
index b515be8909474450b5e306036c16596fe2c6baca..b4ae43857e7c2edd0023a7f634421083055eaf99 100644 (file)
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if HAVE_VARNISH_V4 || HAVE_VARNISH_V5
 #include <vapi/vsc.h>

diff --git a/src/virt.c b/src/virt.c
index a3f94051464f3743a5a424e8c852da7f40e01783..fd20c77ebd0a4b4e1ca02183c28e6f855adc32e5 100644 (file)
--- a/src/virt.c
+++ b/src/virt.c
@@ -22,10 +22,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
 #include "utils_complain.h"
-#include "utils_ignorelist.h"
 
 #include <libgen.h> /* for basename(3) */
 #include <libvirt/libvirt.h>

diff --git a/src/vmem.c b/src/vmem.c
index c7229756032b7837ca6d0275594e55d346e23885..2ab7dda79906cc534ad8c35a544d149f449ba212 100644 (file)
--- a/src/vmem.c
+++ b/src/vmem.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if KERNEL_LINUX
 static const char *config_keys[] = {"Verbose"};

diff --git a/src/vserver.c b/src/vserver.c
index 3c6d58cd867011355939005cbae0b9affc3cc274..e1d1b352909f0e8c89df84092f1a0414b7c3ed26 100644 (file)
--- a/src/vserver.c
+++ b/src/vserver.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <dirent.h>
 #include <sys/types.h>

diff --git a/src/wireless.c b/src/wireless.c
index 4208d366f3ec45e095aa22647ca61e2876820aa5..d49f1d30cff4d16e012bf1e7e5e192a7dd87837a 100644 (file)
--- a/src/wireless.c
+++ b/src/wireless.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #if KERNEL_LINUX
 #include <linux/if.h>

diff --git a/src/write_graphite.c b/src/write_graphite.c
index 7624e2433da69a358bb38ca1ef29ea0e2f847545..000b62ed9bdd5d83483e2fd892534c67c32ac62e 100644 (file)
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -45,11 +45,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
+#include "utils/format_graphite/format_graphite.h"
 #include "utils_complain.h"
-#include "utils_format_graphite.h"
 
 #include <netdb.h>
 

diff --git a/src/write_http.c b/src/write_http.c
index ad0cb5e419e4c1ba665e62da34a794f9e07f288a..74fdaca05303d2f3674c4cf3b894767036ed9ae3 100644 (file)
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -25,10 +25,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_format_json.h"
-#include "utils_format_kairosdb.h"
+#include "utils/common/common.h"
+#include "utils/format_json/format_json.h"
+#include "utils/format_kairosdb/format_kairosdb.h"
 
 #include <curl/curl.h>
 

diff --git a/src/write_kafka.c b/src/write_kafka.c
index 04e67b92fc82f407530e8fa088edf2e7ef38a40f..4c7a4715b230914554c0df337d219d9a08cd0a1f 100644 (file)
--- a/src/write_kafka.c
+++ b/src/write_kafka.c
@@ -26,11 +26,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_cmd_putval.h"
-#include "utils_format_graphite.h"
-#include "utils_format_json.h"
+#include "utils/cmds/putval.h"
+#include "utils/common/common.h"
+#include "utils/format_graphite/format_graphite.h"
+#include "utils/format_json/format_json.h"
 #include "utils_random.h"
 
 #include <errno.h>

diff --git a/src/write_log.c b/src/write_log.c
index 52ad61044e5c206d86125f1bde0a10f02de9359d..3e143168e8746b938a217bed7bb38d3a36b50cc4 100644 (file)
--- a/src/write_log.c
+++ b/src/write_log.c
@@ -27,11 +27,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
-#include "utils_format_graphite.h"
-#include "utils_format_json.h"
+#include "utils/format_graphite/format_graphite.h"
+#include "utils/format_json/format_json.h"
 
 #include <netdb.h>
 

diff --git a/src/write_mongodb.c b/src/write_mongodb.c
index 9cddc9167fc4fcdeace97ad4df0bd725d264c298..0cb1e02f5076a1adb43c257a87eb6b91b6f32a31 100644 (file)
--- a/src/write_mongodb.c
+++ b/src/write_mongodb.c
@@ -32,8 +32,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 
 #include <mongoc.h>

diff --git a/src/write_prometheus.c b/src/write_prometheus.c
index 3b32ac092e77915657ad91f1081bae43a0feedb8..b109d42284ce0c49a7cc0c0c1a84212a375e1182 100644 (file)
--- a/src/write_prometheus.c
+++ b/src/write_prometheus.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
 #include "utils_complain.h"
 #include "utils_time.h"
 

diff --git a/src/write_redis.c b/src/write_redis.c
index 72cb5946e962050d1569c33912232557fae71d0d..324999c16fbd077f640c3080ee1f5fd8fe1968e7 100644 (file)
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <hiredis/hiredis.h>
 #include <sys/time.h>

diff --git a/src/write_riemann.c b/src/write_riemann.c
index b35d10eec16dc1d59bae0f0aa0da81886776cd2d..62ddc67ce68e70c68ed69113ca5b9a60c13798c9 100644 (file)
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -30,8 +30,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 #include "utils_complain.h"
 #include "write_riemann_threshold.h"

diff --git a/src/write_riemann_threshold.c b/src/write_riemann_threshold.c
index 9d8267dcafd184c611f3465c2c4c9dcf1b29f9a2..041ed7d5ad7de462300179ab22a6a24498a77ae8 100644 (file)
--- a/src/write_riemann_threshold.c
+++ b/src/write_riemann_threshold.c
@@ -27,9 +27,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 #include "utils_threshold.h"
 #include "write_riemann_threshold.h"

diff --git a/src/write_sensu.c b/src/write_sensu.c
index 6ea8106c8e73c9ef7d45a6b0fc08d91e87a80fb9..1bff27b31c69918144204cde748176a0b5392682 100644 (file)
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -28,8 +28,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 #include <arpa/inet.h>
 #include <errno.h>

diff --git a/src/write_stackdriver.c b/src/write_stackdriver.c
index a1341d9d2c2b6290fa64e2767437bdb7fae76bdd..fd0192a064aef60da5fa8f87d58ca5a81879dcd2 100644 (file)
--- a/src/write_stackdriver.c
+++ b/src/write_stackdriver.c
@@ -22,12 +22,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "configfile.h"
 #include "plugin.h"
-#include "utils_format_stackdriver.h"
-#include "utils_gce.h"
-#include "utils_oauth.h"
+#include "utils/common/common.h"
+#include "utils/format_stackdriver/format_stackdriver.h"
+#include "utils/gce/gce.h"
+#include "utils/oauth/oauth.h"
 
 #include <curl/curl.h>
 #include <pthread.h>

diff --git a/src/write_tsdb.c b/src/write_tsdb.c
index 42f5d65b66e0439a7d20b20d6d833bf40d528dbb..f8f4cb9104efb1753a875402510ecabc0eb1adc3 100644 (file)
--- a/src/write_tsdb.c
+++ b/src/write_tsdb.c
@@ -43,8 +43,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 #include "utils_random.h"
 

diff --git a/src/xencpu.c b/src/xencpu.c
index 8f177803ad8bd802be743c616b3d46a114d2f1f3..e63a7664775f5f5b4af0c3f91bced8b56bba93cb 100644 (file)
--- a/src/xencpu.c
+++ b/src/xencpu.c
@@ -21,8 +21,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <xenctrl.h>
 

diff --git a/src/xmms.c b/src/xmms.c
index 3e3a3c3c50b8fb45cc5e6f901a2d13f059c0966b..2d550b4212288bf0527a09acc27dd3fae8938431 100644 (file)
--- a/src/xmms.c
+++ b/src/xmms.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <xmms/xmmsctrl.h>
 

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index d1ee111bb637f70db05bf8fd5b3186bdb4995c87..d18a93f76136fda29a5ab2e395921e14a59990f8 100644 (file)
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -29,8 +29,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 /*
  * Global variables

diff --git a/src/zone.c b/src/zone.c
index 16df4043203ad2dfd73d74dd38453ad8753373b1..cd804f7474db086eb5935e12f91899113db93efa 100644 (file)
--- a/src/zone.c
+++ b/src/zone.c
@@ -33,13 +33,13 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <procfs.h>
 #include <zone.h>
 
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
 
 #define MAX_PROCFS_PATH 40
 #define FRC2PCT(pp) (((float)(pp)) / 0x8000 * 100)

diff --git a/src/zookeeper.c b/src/zookeeper.c
index a99bbc01cd668d7fdf9e342fb2eb5103db706773..9c70ea573f8f68988e1a350adeb45f4916c98193 100644 (file)
--- a/src/zookeeper.c
+++ b/src/zookeeper.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <netdb.h>
 #include <netinet/in.h>