From 6378ec288f34ff250b2971a1452338a2b34c240a Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 18 Oct 2018 17:03:47 +0200 Subject: [PATCH] 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. --- Makefile.am | 212 ++++++++++----------- src/aggregation.c | 6 +- src/amqp.c | 8 +- src/amqp1.c | 10 +- src/apache.c | 2 +- src/apcups.c | 4 +- src/apple_sensors.c | 2 +- src/aquaero.c | 2 +- src/ascent.c | 2 +- src/barometer.c | 2 +- src/battery.c | 2 +- src/battery_statefs.c | 4 +- src/bind.c | 2 +- src/ceph.c | 2 +- src/cgroups.c | 6 +- src/chrony.c | 4 +- src/collectd-tg.c | 2 +- src/conntrack.c | 2 +- src/contextswitch.c | 2 +- src/cpu.c | 2 +- src/cpufreq.c | 2 +- src/cpusleep.c | 4 +- src/csv.c | 2 +- src/curl.c | 6 +- src/curl_json.c | 6 +- src/curl_xml.c | 4 +- src/daemon/cmd.c | 2 +- src/daemon/collectd.c | 2 +- src/daemon/configfile.c | 2 +- src/daemon/filter_chain.c | 2 +- src/daemon/globals.c | 2 +- src/daemon/plugin.c | 6 +- src/daemon/plugin.h | 2 +- src/daemon/types_list.c | 2 +- src/daemon/utils_cache.c | 6 +- src/daemon/utils_subst.c | 2 +- src/daemon/utils_subst_test.c | 2 +- src/daemon/utils_threshold.c | 4 +- src/daemon/utils_time.c | 2 +- src/dbi.c | 4 +- src/df.c | 6 +- src/disk.c | 4 +- src/dns.c | 4 +- src/dpdkevents.c | 4 +- src/dpdkstat.c | 4 +- src/drbd.c | 2 +- src/email.c | 2 +- src/entropy.c | 2 +- src/ethstat.c | 4 +- src/exec.c | 6 +- src/fhcount.c | 2 +- src/filecount.c | 2 +- src/fscache.c | 4 +- src/gmond.c | 4 +- src/gps.c | 2 +- src/gpu_nvidia.c | 2 +- src/grpc.cc | 2 +- src/hddtemp.c | 2 +- src/hugepages.c | 4 +- src/intel_pmu.c | 4 +- src/intel_rdt.c | 4 +- src/interface.c | 4 +- src/ipc.c | 2 +- src/ipmi.c | 4 +- src/iptables.c | 2 +- src/ipvs.c | 2 +- src/irq.c | 4 +- src/java.c | 2 +- src/load.c | 2 +- src/log_logstash.c | 2 +- src/logfile.c | 2 +- src/lpar.c | 2 +- src/lua.c | 2 +- src/lvm.c | 2 +- src/madwifi.c | 4 +- src/match_empty_counter.c | 2 +- src/match_hashed.c | 2 +- src/match_regex.c | 4 +- src/match_timediff.c | 2 +- src/match_value.c | 2 +- src/mbmon.c | 2 +- src/mcelog.c | 2 +- src/md.c | 4 +- src/memcachec.c | 4 +- src/memcached.c | 2 +- src/memory.c | 2 +- src/mic.c | 4 +- src/modbus.c | 2 +- src/mqtt.c | 2 +- src/multimeter.c | 2 +- src/mysql.c | 2 +- src/netapp.c | 4 +- src/netlink.c | 2 +- src/network.c | 2 +- src/nfs.c | 2 +- src/nginx.c | 2 +- src/notify_desktop.c | 2 +- src/notify_email.c | 2 +- src/notify_nagios.c | 2 +- src/ntpd.c | 2 +- src/numa.c | 2 +- src/nut.c | 2 +- src/olsrd.c | 2 +- src/onewire.c | 4 +- src/openldap.c | 2 +- src/openvpn.c | 2 +- src/oracle.c | 4 +- src/ovs_events.c | 4 +- src/ovs_stats.c | 11 +- src/pcie_errors.c | 2 +- src/perl.c | 2 +- src/pf.c | 2 +- src/pinba.c | 2 +- src/ping.c | 2 +- src/postgresql.c | 4 +- src/powerdns.c | 2 +- src/processes.c | 4 +- src/protocols.c | 4 +- src/pyconfig.c | 2 +- src/python.c | 2 +- src/pyvalues.c | 2 +- src/redis.c | 2 +- src/routeros.c | 2 +- src/rrdcached.c | 4 +- src/rrdtool.c | 6 +- src/sensors.c | 4 +- src/serial.c | 2 +- src/sigrok.c | 2 +- src/smart.c | 4 +- src/snmp.c | 4 +- src/snmp_agent.c | 4 +- src/statsd.c | 6 +- src/swap.c | 2 +- src/synproxy.c | 2 +- src/syslog.c | 2 +- src/table.c | 2 +- src/tail.c | 4 +- src/tail_csv.c | 6 +- src/tape.c | 2 +- src/target_notification.c | 2 +- src/target_replace.c | 2 +- src/target_scale.c | 2 +- src/target_set.c | 4 +- src/target_v5upgrade.c | 2 +- src/tcpconns.c | 2 +- src/teamspeak2.c | 2 +- src/ted.c | 2 +- src/thermal.c | 4 +- src/threshold.c | 4 +- src/tokyotyrant.c | 2 +- src/turbostat.c | 2 +- src/unixsock.c | 16 +- src/uptime.c | 2 +- src/users.c | 2 +- .../utils_avltree.c => utils/avltree/avltree.c} | 2 +- .../utils_avltree.h => utils/avltree/avltree.h} | 0 .../avltree/avltree_test.c} | 4 +- src/{utils_cmds.c => utils/cmds/cmds.c} | 14 +- src/{utils_cmds.h => utils/cmds/cmds.h} | 0 src/{utils_cmds_test.c => utils/cmds/cmds_test.c} | 4 +- src/{utils_cmd_flush.c => utils/cmds/flush.c} | 4 +- src/{utils_cmd_flush.h => utils/cmds/flush.h} | 2 +- .../cmds/getthreshold.c} | 8 +- .../cmds/getthreshold.h} | 0 src/{utils_cmd_getval.c => utils/cmds/getval.c} | 6 +- src/{utils_cmd_getval.h => utils/cmds/getval.h} | 2 +- src/{utils_cmd_listval.c => utils/cmds/listval.c} | 6 +- src/{utils_cmd_listval.h => utils/cmds/listval.h} | 2 +- .../cmds/parse_option.c} | 2 +- .../cmds/parse_option.h} | 0 .../cmds/putnotif.c} | 6 +- .../cmds/putnotif.h} | 0 src/{utils_cmd_putval.c => utils/cmds/putval.c} | 4 +- src/{utils_cmd_putval.h => utils/cmds/putval.h} | 2 +- src/{daemon => utils/common}/common.c | 2 +- src/{daemon => utils/common}/common.h | 0 src/{daemon => utils/common}/common_test.c | 2 +- .../config_cores/config_cores.c} | 4 +- .../config_cores/config_cores.h} | 0 .../config_cores/config_cores_test.c} | 2 +- src/{utils_crc32.c => utils/crc32/crc32.c} | 0 src/{utils_crc32.h => utils/crc32/crc32.h} | 0 .../curl_stats/curl_stats.c} | 4 +- .../curl_stats/curl_stats.h} | 0 .../db_query/db_query.c} | 4 +- .../db_query/db_query.h} | 0 src/{utils_deq.h => utils/deq/deq.h} | 0 src/{utils_dns.c => utils/dns/dns.c} | 4 +- src/{utils_dns.h => utils/dns/dns.h} | 0 src/{utils_dpdk.c => utils/dpdk/dpdk.c} | 4 +- src/{utils_dpdk.h => utils/dpdk/dpdk.h} | 0 .../format_graphite/format_graphite.c} | 4 +- .../format_graphite/format_graphite.h} | 0 .../format_graphite/format_graphite_test.c} | 4 +- .../format_json/format_json.c} | 4 +- .../format_json/format_json.h} | 0 .../format_json/format_json_test.c} | 4 +- .../format_kairosdb/format_kairosdb.c} | 4 +- .../format_kairosdb/format_kairosdb.h} | 0 .../format_stackdriver/format_stackdriver.c} | 6 +- .../format_stackdriver/format_stackdriver.h} | 0 .../format_stackdriver/format_stackdriver_test.c} | 2 +- src/{utils_gce.c => utils/gce/gce.c} | 6 +- src/{utils_gce.h => utils/gce/gce.h} | 0 src/{daemon/utils_heap.c => utils/heap/heap.c} | 2 +- src/{daemon/utils_heap.h => utils/heap/heap.h} | 0 .../utils_heap_test.c => utils/heap/heap_test.c} | 2 +- .../ignorelist/ignorelist.c} | 4 +- .../ignorelist/ignorelist.h} | 0 src/{utils_latency.c => utils/latency/latency.c} | 4 +- src/{utils_latency.h => utils/latency/latency.h} | 0 .../latency/latency_config.c} | 4 +- .../latency/latency_config.h} | 0 .../latency/latency_test.c} | 4 +- .../lookup/vl_lookup.c} | 6 +- .../lookup/vl_lookup.h} | 0 .../lookup/vl_lookup_test.c} | 2 +- src/{utils_match.c => utils/match/match.c} | 4 +- src/{utils_match.h => utils/match/match.h} | 2 +- src/{daemon => utils/metadata}/meta_data.c | 4 +- src/{daemon => utils/metadata}/meta_data.h | 0 src/{daemon => utils/metadata}/meta_data_test.c | 4 +- src/{utils_mount.c => utils/mount/mount.c} | 6 +- src/{utils_mount.h => utils/mount/mount.h} | 0 .../mount/mount_test.c} | 4 +- src/{utils_oauth.c => utils/oauth/oauth.c} | 4 +- src/{utils_oauth.h => utils/oauth/oauth.h} | 0 .../oauth/oauth_test.c} | 2 +- src/{utils_ovs.c => utils/ovs/ovs.c} | 4 +- src/{utils_ovs.h => utils/ovs/ovs.h} | 18 +- .../rrdcreate/rrdcreate.c} | 4 +- .../rrdcreate/rrdcreate.h} | 0 src/{utils_tail.c => utils/tail/tail.c} | 4 +- src/{utils_tail.h => utils/tail/tail.h} | 0 .../taskstats/taskstats.c} | 4 +- .../taskstats/taskstats.h} | 0 src/utils_fbhash.c | 2 +- src/utils_lua.c | 2 +- src/utils_tail_match.c | 8 +- src/utils_tail_match.h | 4 +- src/uuid.c | 2 +- src/varnish.c | 2 +- src/virt.c | 4 +- src/vmem.c | 2 +- src/vserver.c | 2 +- src/wireless.c | 2 +- src/write_graphite.c | 4 +- src/write_http.c | 6 +- src/write_kafka.c | 8 +- src/write_log.c | 6 +- src/write_mongodb.c | 2 +- src/write_prometheus.c | 4 +- src/write_redis.c | 2 +- src/write_riemann.c | 2 +- src/write_riemann_threshold.c | 4 +- src/write_sensu.c | 2 +- src/write_stackdriver.c | 8 +- src/write_tsdb.c | 2 +- src/xencpu.c | 2 +- src/xmms.c | 2 +- src/zfs_arc.c | 2 +- src/zone.c | 4 +- src/zookeeper.c | 2 +- 263 files changed, 498 insertions(+), 495 deletions(-) rename src/{daemon/utils_avltree.c => utils/avltree/avltree.c} (99%) rename src/{daemon/utils_avltree.h => utils/avltree/avltree.h} (100%) rename src/{daemon/utils_avltree_test.c => utils/avltree/avltree_test.c} (98%) rename src/{utils_cmds.c => utils/cmds/cmds.c} (97%) rename src/{utils_cmds.h => utils/cmds/cmds.h} (100%) rename src/{utils_cmds_test.c => utils/cmds/cmds_test.c} (99%) rename src/{utils_cmd_flush.c => utils/cmds/flush.c} (98%) rename src/{utils_cmd_flush.h => utils/cmds/flush.h} (98%) rename src/{utils_cmd_getthreshold.c => utils/cmds/getthreshold.c} (97%) rename src/{utils_cmd_getthreshold.h => utils/cmds/getthreshold.h} (100%) rename src/{utils_cmd_getval.c => utils/cmds/getval.c} (98%) rename src/{utils_cmd_getval.h => utils/cmds/getval.h} (98%) rename src/{utils_cmd_listval.c => utils/cmds/listval.c} (97%) rename src/{utils_cmd_listval.h => utils/cmds/listval.h} (98%) rename src/{utils_parse_option.c => utils/cmds/parse_option.c} (99%) rename src/{utils_parse_option.h => utils/cmds/parse_option.h} (100%) rename src/{utils_cmd_putnotif.c => utils/cmds/putnotif.c} (98%) rename src/{utils_cmd_putnotif.h => utils/cmds/putnotif.h} (100%) rename src/{utils_cmd_putval.c => utils/cmds/putval.c} (99%) rename src/{utils_cmd_putval.h => utils/cmds/putval.h} (98%) rename src/{daemon => utils/common}/common.c (99%) rename src/{daemon => utils/common}/common.h (100%) rename src/{daemon => utils/common}/common_test.c (99%) rename src/{utils_config_cores.c => utils/config_cores/config_cores.c} (99%) rename src/{utils_config_cores.h => utils/config_cores/config_cores.h} (100%) rename src/{utils_config_cores_test.c => utils/config_cores/config_cores_test.c} (99%) rename src/{utils_crc32.c => utils/crc32/crc32.c} (100%) rename src/{utils_crc32.h => utils/crc32/crc32.h} (100%) rename src/{utils_curl_stats.c => utils/curl_stats/curl_stats.c} (99%) rename src/{utils_curl_stats.h => utils/curl_stats/curl_stats.h} (100%) rename src/{utils_db_query.c => utils/db_query/db_query.c} (99%) rename src/{utils_db_query.h => utils/db_query/db_query.h} (100%) rename src/{utils_deq.h => utils/deq/deq.h} (100%) rename src/{utils_dns.c => utils/dns/dns.c} (99%) rename src/{utils_dns.h => utils/dns/dns.h} (100%) rename src/{utils_dpdk.c => utils/dpdk/dpdk.c} (99%) rename src/{utils_dpdk.h => utils/dpdk/dpdk.h} (100%) rename src/{utils_format_graphite.c => utils/format_graphite/format_graphite.c} (99%) rename src/{utils_format_graphite.h => utils/format_graphite/format_graphite.h} (100%) rename src/{utils_format_graphite_test.c => utils/format_graphite/format_graphite_test.c} (98%) rename src/{utils_format_json.c => utils/format_json/format_json.c} (99%) rename src/{utils_format_json.h => utils/format_json/format_json.h} (100%) rename src/{utils_format_json_test.c => utils/format_json/format_json_test.c} (97%) rename src/{utils_format_kairosdb.c => utils/format_kairosdb/format_kairosdb.c} (99%) rename src/{utils_format_kairosdb.h => utils/format_kairosdb/format_kairosdb.h} (100%) rename src/{utils_format_stackdriver.c => utils/format_stackdriver/format_stackdriver.c} (99%) rename src/{utils_format_stackdriver.h => utils/format_stackdriver/format_stackdriver.h} (100%) rename src/{utils_format_stackdriver_test.c => utils/format_stackdriver/format_stackdriver_test.c} (97%) rename src/{utils_gce.c => utils/gce/gce.c} (98%) rename src/{utils_gce.h => utils/gce/gce.h} (100%) rename src/{daemon/utils_heap.c => utils/heap/heap.c} (99%) rename src/{daemon/utils_heap.h => utils/heap/heap.h} (100%) rename src/{daemon/utils_heap_test.c => utils/heap/heap_test.c} (98%) rename src/{utils_ignorelist.c => utils/ignorelist/ignorelist.c} (99%) rename src/{utils_ignorelist.h => utils/ignorelist/ignorelist.h} (100%) rename src/{utils_latency.c => utils/latency/latency.c} (99%) rename src/{utils_latency.h => utils/latency/latency.h} (100%) rename src/{utils_latency_config.c => utils/latency/latency_config.c} (98%) rename src/{utils_latency_config.h => utils/latency/latency_config.h} (100%) rename src/{utils_latency_test.c => utils/latency/latency_test.c} (98%) rename src/{utils_vl_lookup.c => utils/lookup/vl_lookup.c} (99%) rename src/{utils_vl_lookup.h => utils/lookup/vl_lookup.h} (100%) rename src/{utils_vl_lookup_test.c => utils/lookup/vl_lookup_test.c} (99%) rename src/{utils_match.c => utils/match/match.c} (99%) rename src/{utils_match.h => utils/match/match.h} (99%) rename src/{daemon => utils/metadata}/meta_data.c (99%) rename src/{daemon => utils/metadata}/meta_data.h (100%) rename src/{daemon => utils/metadata}/meta_data_test.c (97%) rename src/{utils_mount.c => utils/mount/mount.c} (99%) rename src/{utils_mount.h => utils/mount/mount.h} (100%) rename src/{utils_mount_test.c => utils/mount/mount_test.c} (98%) rename src/{utils_oauth.c => utils/oauth/oauth.c} (99%) rename src/{utils_oauth.h => utils/oauth/oauth.h} (100%) rename src/{utils_oauth_test.c => utils/oauth/oauth_test.c} (99%) rename src/{utils_ovs.c => utils/ovs/ovs.c} (99%) rename src/{utils_ovs.h => utils/ovs/ovs.h} (94%) rename src/{utils_rrdcreate.c => utils/rrdcreate/rrdcreate.c} (99%) rename src/{utils_rrdcreate.h => utils/rrdcreate/rrdcreate.h} (100%) rename src/{utils_tail.c => utils/tail/tail.c} (98%) rename src/{utils_tail.h => utils/tail/tail.h} (100%) rename src/{utils_taskstats.c => utils/taskstats/taskstats.c} (99%) rename src/{utils_taskstats.h => utils/taskstats/taskstats.h} (100%) diff --git a/Makefile.am b/Makefile.am index 9bb22fc5..83613b0b 100644 --- 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 a8021996..089ff1da 100644 --- 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 281130b1..9eb51653 100644 --- 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 #include diff --git a/src/amqp1.c b/src/amqp1.c index 87bb50cf..a7fd26be 100644 --- 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 diff --git a/src/apache.c b/src/apache.c index 5c67a388..d64e5471 100644 --- 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 diff --git a/src/apcups.c b/src/apcups.c index 2931d2c0..83a5c87a 100644 --- 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 diff --git a/src/apple_sensors.c b/src/apple_sensors.c index f78c3da2..ad6e6c03 100644 --- 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 diff --git a/src/aquaero.c b/src/aquaero.c index 937742b0..dfa2804d 100644 --- 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 diff --git a/src/ascent.c b/src/ascent.c index 22358658..e5589bf6 100644 --- 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 #include diff --git a/src/barometer.c b/src/barometer.c index b6f2bc00..468a2371 100644 --- 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 diff --git a/src/battery.c b/src/battery.c index a74e7b64..8e6c4b29 100644 --- 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 diff --git a/src/battery_statefs.c b/src/battery_statefs.c index 149512b9..d2c1ed9d 100644 --- 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 diff --git a/src/bind.c b/src/bind.c index fe3480d0..29f65d40 100644 --- 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 diff --git a/src/ceph.c b/src/ceph.c index 26cf2155..19a09d86 100644 --- 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 #include diff --git a/src/cgroups.c b/src/cgroups.c index 9304216d..89252398 100644 --- 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 913aab94..65e3c4c8 100644 --- 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 /* struct addrinfo */ diff --git a/src/collectd-tg.c b/src/collectd-tg.c index 5210a221..92d1f012 100644 --- a/src/collectd-tg.c +++ b/src/collectd-tg.c @@ -43,7 +43,7 @@ #include #include -#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 29c7003e..7b61eef0 100644 --- 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 35ac5a39..acf3a74d 100644 --- 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 diff --git a/src/cpu.c b/src/cpu.c index 2a697129..e7f3c187 100644 --- 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 diff --git a/src/cpufreq.c b/src/cpufreq.c index 21b6429a..35ec07fb 100644 --- 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 aa14cc12..b5cbe660 100644 --- a/src/cpusleep.c +++ b/src/cpusleep.c @@ -32,9 +32,9 @@ #include "collectd.h" -#include -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" +#include 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 88726bba..953473fc 100644 --- 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 4925ad09..9ad3dc83 100644 --- 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 diff --git a/src/curl_json.c b/src/curl_json.c index 3b2fffe0..a26664f0 100644 --- 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 #include diff --git a/src/curl_xml.c b/src/curl_xml.c index 0bed05a5..ed70f698 100644 --- 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 diff --git a/src/daemon/cmd.c b/src/daemon/cmd.c index 7b779955..49f9272c 100644 --- 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 static void *do_flush(void __attribute__((unused)) * arg) { diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c index f1a49237..28fa7155 100644 --- 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 #include diff --git a/src/daemon/configfile.c b/src/daemon/configfile.c index 95cb32fc..8bf6b8d7 100644 --- 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 diff --git a/src/daemon/filter_chain.c b/src/daemon/filter_chain.c index a0a76876..d5e14a34 100644 --- 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 5c6749ff..a76a44c4 100644 --- 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 diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c index de04665a..b4e5ae72 100644 --- 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 616889ad..6b3a030c 100644 --- 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 diff --git a/src/daemon/types_list.c b/src/daemon/types_list.c index c3f590c1..9c610409 100644 --- 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 cdb76422..c53e5d14 100644 --- 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 diff --git a/src/daemon/utils_subst.c b/src/daemon/utils_subst.c index 28924e44..0b5f00d1 100644 --- 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 20560966..0e582306 100644 --- 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 8c033411..52af648f 100644 --- 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 diff --git a/src/daemon/utils_time.c b/src/daemon/utils_time.c index 4637122e..5dd7d0e1 100644 --- 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 899c802c..8466bd11 100644 --- 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 diff --git a/src/df.c b/src/df.c index 8877b740..5b3fbd28 100644 --- 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 7ceb95a6..e73a5c08 100644 --- 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 diff --git a/src/dns.c b/src/dns.c index bd6820fa..7fa297b8 100644 --- 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 #include diff --git a/src/dpdkevents.c b/src/dpdkevents.c index 2a44b2c1..4cdf01df 100644 --- 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 diff --git a/src/dpdkstat.c b/src/dpdkstat.c index 59ab9760..0005d091 100644 --- 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 #include diff --git a/src/drbd.c b/src/drbd.c index 69dc4ef9..0f54dd5e 100644 --- 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 f8a94fb6..deb66006 100644 --- 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 diff --git a/src/entropy.c b/src/entropy.c index c7b5b3f3..94a291ec 100644 --- 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 0d4c7e15..f8bc5b54 100644 --- 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 26b8fa7e..7e161677 100644 --- 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 #include diff --git a/src/fhcount.c b/src/fhcount.c index 9bcb9115..93ad903e 100644 --- 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 9091ff55..5acd47b3 100644 --- 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 #include diff --git a/src/fscache.c b/src/fscache.c index dd36b8b9..e875da8d 100644 --- a/src/fscache.c +++ b/src/fscache.c @@ -21,11 +21,11 @@ #include "collectd.h" +#include "plugin.h" +#include "utils/common/common.h" #include /* a header needed for FILE */ #include /* used for atoi */ #include /* 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 3312f96e..b14dee3b 100644 --- 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 diff --git a/src/gps.c b/src/gps.c index b22c3a2e..4d651768 100644 --- 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 812cfeb0..d76e503d 100644 --- 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 #include diff --git a/src/grpc.cc b/src/grpc.cc index 17168ec2..1e9cb20c 100644 --- a/src/grpc.cc +++ b/src/grpc.cc @@ -41,8 +41,8 @@ extern "C" { #include #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 80daf15b..96b4f0c5 100644 --- 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 #include /* for basename */ diff --git a/src/hugepages.c b/src/hugepages.c index dd897356..e066300b 100644 --- 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 ff92beed..f04f8871 100644 --- 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 #include diff --git a/src/intel_rdt.c b/src/intel_rdt.c index df9c9c44..d9491147 100644 --- 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 diff --git a/src/interface.c b/src/interface.c index 86110b0c..0e139708 100644 --- 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 diff --git a/src/ipc.c b/src/ipc.c index 6e888c46..ab4b214d 100644 --- 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 58dfb411..d78ffa95 100644 --- 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 #include diff --git a/src/iptables.c b/src/iptables.c index 225ed2c1..e1d83dfc 100644 --- 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 #include diff --git a/src/ipvs.c b/src/ipvs.c index 0afc7494..0259df80 100644 --- 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 diff --git a/src/irq.c b/src/irq.c index eeea058a..91563560 100644 --- 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 0a5336a5..cf301c6b 100644 --- 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 diff --git a/src/load.c b/src/load.c index 858d9bea..da7fe58f 100644 --- 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 diff --git a/src/log_logstash.c b/src/log_logstash.c index d115ae56..b04aaddd 100644 --- 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 #include diff --git a/src/logfile.c b/src/logfile.c index fa56a1bc..3a25319e 100644 --- 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 df18b525..dc3739b8 100644 --- 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 #include diff --git a/src/lua.c b/src/lua.c index f66d8526..d91676c9 100644 --- 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 3ec79dea..c30489cb 100644 --- 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 diff --git a/src/madwifi.c b/src/madwifi.c index 60ac3c8c..85454c3f 100644 --- 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 #include diff --git a/src/match_empty_counter.c b/src/match_empty_counter.c index 27817fe5..fd87b384 100644 --- 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 c0554b23..4911ee2c 100644 --- 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 20445cc1..4052ad55 100644 --- 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 diff --git a/src/match_timediff.c b/src/match_timediff.c index c80694de..172b3126 100644 --- 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 44cea268..7b9da693 100644 --- 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 63a300de..50955f3c 100644 --- 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 #include diff --git a/src/mcelog.c b/src/mcelog.c index 4e514004..0cce0c60 100644 --- 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 diff --git a/src/md.c b/src/md.c index 0a015c7b..643dabd7 100644 --- 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 diff --git a/src/memcachec.c b/src/memcachec.c index f293aa1b..eefcfb73 100644 --- 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 diff --git a/src/memcached.c b/src/memcached.c index 4ff70f7c..0baf6c22 100644 --- 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 #include diff --git a/src/memory.c b/src/memory.c index cc95496a..4a3a7723 100644 --- 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 diff --git a/src/mic.c b/src/mic.c index 4f4a9bac..6924eaf7 100644 --- 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 #include diff --git a/src/modbus.c b/src/modbus.c index 0a4f40ca..ed53319f 100644 --- 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 #include diff --git a/src/mqtt.c b/src/mqtt.c index 48c34edc..630114e4 100644 --- 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 diff --git a/src/multimeter.c b/src/multimeter.c index ca9b15d4..5a7d5a2a 100644 --- 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 diff --git a/src/mysql.c b/src/mysql.c index e7ffb489..7399fe21 100644 --- 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 diff --git a/src/netapp.c b/src/netapp.c index 0c1fe31d..1b510d2a 100644 --- 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 #include diff --git a/src/netlink.c b/src/netlink.c index a1f52a45..37c2e294 100644 --- 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 diff --git a/src/network.c b/src/network.c index af23d485..f6f0ac15 100644 --- 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 481aa79e..320caa4a 100644 --- 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 diff --git a/src/nginx.c b/src/nginx.c index e5ca89c0..7bb307a3 100644 --- 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 diff --git a/src/notify_desktop.c b/src/notify_desktop.c index e391cf27..849b1d4c 100644 --- 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 #include diff --git a/src/notify_email.c b/src/notify_email.c index bb36ff27..dddb8b26 100644 --- 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 #include diff --git a/src/notify_nagios.c b/src/notify_nagios.c index 68f6e2a7..79926b52 100644 --- 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 0b824ba2..33acc69f 100644 --- 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 diff --git a/src/numa.c b/src/numa.c index c68fb869..dfe7a6dc 100644 --- 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 997d1a50..ae48692b 100644 --- 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 diff --git a/src/olsrd.c b/src/olsrd.c index df052889..c8b8b7a9 100644 --- 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 #include diff --git a/src/onewire.c b/src/onewire.c index 575a6820..a0a546b2 100644 --- 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 #include diff --git a/src/openldap.c b/src/openldap.c index 3897cd16..5659c69f 100644 --- 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 193a9b43..4d4a878f 100644 --- 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 f54b285a..3f28110f 100644 --- 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 diff --git a/src/ovs_events.c b/src/ovs_events.c index ba3238b6..0f9a57ca 100644 --- 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 eca7329e..fe1953f2 100644 --- a/src/ovs_stats.c +++ b/src/ovs_stats.c @@ -28,9 +28,9 @@ * Taras Chornyi */ -#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 b239a8c5..63996050 100644 --- 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 diff --git a/src/perl.c b/src/perl.c index fffbc21d..09e6e5aa 100644 --- 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 88a4c2d0..9681d366 100644 --- 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 diff --git a/src/pinba.c b/src/pinba.c index 9f571d04..61d226c4 100644 --- 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 #include diff --git a/src/ping.c b/src/ping.c index ffb16910..203d2230 100644 --- 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 diff --git a/src/postgresql.c b/src/postgresql.c index e6278062..8e4328fa 100644 --- 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 #include diff --git a/src/powerdns.c b/src/powerdns.c index b2cebbf8..a5b45a19 100644 --- 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 diff --git a/src/processes.c b/src/processes.c index 2e3b927e..ac5ec604 100644 --- 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 36b1d83b..65b450c9 100644 --- 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 4ba7e0d2..5f51b937 100644 --- 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 2f08bd34..9d47d701 100644 --- 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 301df442..967fecfd 100644 --- 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 e24abd54..37dc8d68 100644 --- 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 #include diff --git a/src/routeros.c b/src/routeros.c index 1286805f..70dd75ee 100644 --- 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 diff --git a/src/rrdcached.c b/src/rrdcached.c index 8b742bb5..b5f0970b 100644 --- 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 diff --git a/src/rrdtool.c b/src/rrdtool.c index 605a16cc..d0849d12 100644 --- 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 diff --git a/src/sensors.c b/src/sensors.c index b800e98f..8d1ece9a 100644 --- 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 diff --git a/src/serial.c b/src/serial.c index 2b865370..aae99789 100644 --- 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 eeab8c95..a8b67afe 100644 --- 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 #include diff --git a/src/smart.c b/src/smart.c index 62cbb4f1..2dfb924f 100644 --- 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 #include diff --git a/src/snmp.c b/src/snmp.c index fb1b83c3..c921e028 100644 --- 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 #include diff --git a/src/snmp_agent.c b/src/snmp_agent.c index 2dfa6613..cbd33664 100644 --- 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 diff --git a/src/statsd.c b/src/statsd.c index 1558ec84..6c7820a1 100644 --- 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 #include diff --git a/src/swap.c b/src/swap.c index 929df6db..9e58919e 100644 --- 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 diff --git a/src/synproxy.c b/src/synproxy.c index 6c6b997d..d51077f2 100644 --- 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 beb82456..a600f30e 100644 --- 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 diff --git a/src/table.c b/src/table.c index 492bea61..f181de94 100644 --- 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 df94580c..8c9dfbe5 100644 --- 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 4c589716..e1d473eb 100644 --- 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 #include diff --git a/src/tape.c b/src/tape.c index 26bd969a..ccf88255 100644 --- 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 f83a904a..6d8059ea 100644 --- 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 887507e1..62928c09 100644 --- 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 diff --git a/src/target_scale.c b/src/target_scale.c index 1cc5d793..4a9e9df4 100644 --- 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 9629e0ed..4bbd2c0d 100644 --- 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 650f9a5e..c2fe1922 100644 --- 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 5a3fd4ef..d01bcd23 100644 --- 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 567e5fb8..1ab6e4bf 100644 --- 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 #include diff --git a/src/ted.c b/src/ted.c index b5fa4c1e..e1b48fd6 100644 --- 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 diff --git a/src/thermal.c b/src/thermal.c index 959fec64..5f448363 100644 --- 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 9d343630..a3d865ba 100644 --- 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 aca0a4e3..59b7a342 100644 --- 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 diff --git a/src/turbostat.c b/src/turbostat.c index 4a7af4c7..deb16e0c 100644 --- 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 8c08e18a..6ff54997 100644 --- 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 #include diff --git a/src/uptime.c b/src/uptime.c index 43d72e53..dd33ab38 100644 --- 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 diff --git a/src/users.c b/src/users.c index 6bc7cc34..fc03ba2c 100644 --- 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 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 568d68c1..af6efed9 100644 --- a/src/daemon/utils_avltree.c +++ b/src/utils/avltree/avltree.c @@ -27,7 +27,7 @@ #include #include -#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 4be49416..8cbcb13c 100644 --- 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 88fdfc7f..036cefa1 100644 --- a/src/utils_cmds.c +++ b/src/utils/cmds/cmds.c @@ -26,13 +26,13 @@ * Sebastian 'tokkee' Harl **/ -#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 #include 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 93bf5129..713f0324 100644 --- a/src/utils_cmds_test.c +++ b/src/utils/cmds/cmds_test.c @@ -24,9 +24,9 @@ * Sebastian 'tokkee' Harl **/ -#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 b180a501..d080d481 100644 --- 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 129aa85e..794ac1c9 100644 --- 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 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 c1f3f562..0d4e2f1f 100644 --- 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 f747d5b8..f2586e12 100644 --- 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 5c03fa4c..f2f1c2eb 100644 --- a/src/utils_cmd_getval.h +++ b/src/utils/cmds/getval.h @@ -29,7 +29,7 @@ #include -#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 24ec9421..287786bb 100644 --- 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 6dbaabcb..6fff019e 100644 --- a/src/utils_cmd_listval.h +++ b/src/utils/cmds/listval.h @@ -29,7 +29,7 @@ #include -#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 005715c9..e6b516d6 100644 --- 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 75a8fae8..e1fecf84 100644 --- 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 b5b9065b..b6d5ccc6 100644 --- 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 bc6e193e..f6c3e3b8 100644 --- 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 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 b5a1c980..d15f9b7c 100644 --- 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 93a19d1b..426082fa 100644 --- a/src/daemon/common_test.c +++ b/src/utils/common/common_test.c @@ -24,8 +24,8 @@ * Florian octo Forster */ -#include "common.h" #include "testing.h" +#include "utils/common/common.h" #if HAVE_KSTAT_H #include 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 94657459..13ea6878 100644 --- 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 2c6f5b60..8b4f4c4c 100644 --- 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 09856599..a8971719 100644 --- 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 #include 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 73c1b45e..392bd56f 100644 --- 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 7b20e139..2ea919b7 100644 --- 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 @@ -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 3591eae1..5e38ab36 100644 --- a/src/utils_dpdk.c +++ b/src/utils/dpdk/dpdk.c @@ -40,8 +40,8 @@ #include #include -#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 de3f0c2e..d0e047ff 100644 --- 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 42efa681..2c14d010 100644 --- 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 25cbb0a7..b82f21dc 100644 --- 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 b230ef35..d0416049 100644 --- 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 #include 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 d957bc80..3f29fcd9 100644 --- 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 afaa8ed8..80b85ae4 100644 --- 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 1e96b65e..d4935a31 100644 --- 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 d43d1de5..80927656 100644 --- 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 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 3cecd893..2fe2bcb7 100644 --- a/src/daemon/utils_heap.c +++ b/src/utils/heap/heap.c @@ -31,7 +31,7 @@ #include #include -#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 827c090f..169824e7 100644 --- 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 b3851026..9e1b9e3a 100644 --- 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 6e4f8732..12ff2ca1 100644 --- 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 #include 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 9a91f113..a5ae4719 100644 --- 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 42a6e87e..13250174 100644 --- 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 03e61f80..38d81ca4 100644 --- a/src/utils_vl_lookup.c +++ b/src/utils/lookup/vl_lookup.c @@ -29,9 +29,9 @@ #include #include -#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 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 1cb7b65b..2dd53ce3 100644 --- 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 d3edb57c..ca6f1aaa 100644 --- 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 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 1cff1eb7..c4aee0a1 100644 --- 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 08f682e9..963aebbe 100644 --- 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 ca808364..b9ff86d5 100644 --- 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 279f8e2f..319c6248 100644 --- 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 @@ -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 e8f30094..e34e677c 100644 --- 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 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 d804b51a..671de84d 100644 --- 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 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 791564fb..aa6e99a3 100644 --- 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 6fe6fe76..46c2c269 100644 --- 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 52c2f915..c93322ea 100644 --- 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 7f1f2354..ef012343 100644 --- 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 #include 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 365bf558..db34a72b 100644 --- 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 f0d73334..b020c06c 100644 --- 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 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 07134635..7c342e53 100644 --- 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 11ac0010..d0de9085 100644 --- a/src/utils_lua.c +++ b/src/utils_lua.c @@ -24,7 +24,7 @@ * Florian Forster **/ -#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 ccab5ace..0e5a8611 100644 --- 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 2d4c2531..0217a7e8 100644 --- 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 c7878c74..60d09b51 100644 --- 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 diff --git a/src/varnish.c b/src/varnish.c index b515be89..b4ae4385 100644 --- 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 diff --git a/src/virt.c b/src/virt.c index a3f94051..fd20c77e 100644 --- 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 /* for basename(3) */ #include diff --git a/src/vmem.c b/src/vmem.c index c7229756..2ab7dda7 100644 --- 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 3c6d58cd..e1d1b352 100644 --- 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 #include diff --git a/src/wireless.c b/src/wireless.c index 4208d366..d49f1d30 100644 --- 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 diff --git a/src/write_graphite.c b/src/write_graphite.c index 7624e243..000b62ed 100644 --- 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 diff --git a/src/write_http.c b/src/write_http.c index ad0cb5e4..74fdaca0 100644 --- 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 diff --git a/src/write_kafka.c b/src/write_kafka.c index 04e67b92..4c7a4715 100644 --- 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 diff --git a/src/write_log.c b/src/write_log.c index 52ad6104..3e143168 100644 --- 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 diff --git a/src/write_mongodb.c b/src/write_mongodb.c index 9cddc916..0cb1e02f 100644 --- 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 diff --git a/src/write_prometheus.c b/src/write_prometheus.c index 3b32ac09..b109d422 100644 --- 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 72cb5946..324999c1 100644 --- 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 #include diff --git a/src/write_riemann.c b/src/write_riemann.c index b35d10ee..62ddc67c 100644 --- 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 9d8267dc..041ed7d5 100644 --- 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 6ea8106c..1bff27b3 100644 --- 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 #include diff --git a/src/write_stackdriver.c b/src/write_stackdriver.c index a1341d9d..fd0192a0 100644 --- 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 #include diff --git a/src/write_tsdb.c b/src/write_tsdb.c index 42f5d65b..f8f4cb91 100644 --- 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 8f177803..e63a7664 100644 --- 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 diff --git a/src/xmms.c b/src/xmms.c index 3e3a3c3c..2d550b42 100644 --- 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 diff --git a/src/zfs_arc.c b/src/zfs_arc.c index d1ee111b..d18a93f7 100644 --- 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 16df4043..cd804f74 100644 --- 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 #include -#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 a99bbc01..9c70ea57 100644 --- 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 #include -- 2.11.0