Fix freebsd compilation (#19677)
Fix config_get_boolean_ondemand --> inicfg_get_boolean_ondemand on freebsd
Stelios Fragkakis committed
Feb 19, 2025 at 23:11 UTC
a1a5b94127f20bb64f1d1e7e2a0d2c23b1196532
4 files changed
+59
-59
src/collectors/freebsd.plugin/freebsd_devstat.c
+21
-21
@@ -195,30 +195,30 @@ int do_kern_devstat(int update_every, usec_t dt) {
195
static SIMPLE_PATTERN *excluded_disks = NULL;
196
197
if (unlikely(enable_new_disks == -1)) {
198
- enable_new_disks = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT,
198
+ enable_new_disks = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT,
199
"enable new disks detected at runtime", CONFIG_BOOLEAN_AUTO);
200
201
- enable_pass_devices = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT,
201
+ enable_pass_devices = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT,
202
"performance metrics for pass devices", CONFIG_BOOLEAN_AUTO);
203
204
- do_system_io = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "total bandwidth for all disks",
204
+ do_system_io = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "total bandwidth for all disks",
205
CONFIG_BOOLEAN_YES);
206
207
- do_io = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "bandwidth for all disks",
207
+ do_io = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "bandwidth for all disks",
208
CONFIG_BOOLEAN_AUTO);
209
- do_ops = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "operations for all disks",
209
+ do_ops = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "operations for all disks",
210
CONFIG_BOOLEAN_AUTO);
211
- do_qops = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "queued operations for all disks",
211
+ do_qops = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "queued operations for all disks",
212
CONFIG_BOOLEAN_AUTO);
213
- do_util = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "utilization percentage for all disks",
213
+ do_util = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "utilization percentage for all disks",
214
CONFIG_BOOLEAN_AUTO);
215
- do_iotime = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "i/o time for all disks",
215
+ do_iotime = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "i/o time for all disks",
216
CONFIG_BOOLEAN_AUTO);
217
- do_await = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "average completed i/o time for all disks",
217
+ do_await = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "average completed i/o time for all disks",
218
CONFIG_BOOLEAN_AUTO);
219
- do_avagsz = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "average completed i/o bandwidth for all disks",
219
+ do_avagsz = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "average completed i/o bandwidth for all disks",
220
CONFIG_BOOLEAN_AUTO);
221
- do_svctm = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "average service time for all disks",
221
+ do_svctm = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "average service time for all disks",
222
CONFIG_BOOLEAN_AUTO);
223
224
excluded_disks = simple_pattern_create(
@@ -302,18 +302,18 @@ int do_kern_devstat(int update_every, usec_t dt) {
302
dm->enabled = !simple_pattern_matches(excluded_disks, disk);
303
304
snprintfz(var_name, 4096, "%s:%s", CONFIG_SECTION_KERN_DEVSTAT, disk);
305
- dm->enabled = config_get_boolean_ondemand(var_name, "enabled", dm->enabled);
306
-
307
- dm->do_io = config_get_boolean_ondemand(var_name, "bandwidth", do_io);
308
- dm->do_ops = config_get_boolean_ondemand(var_name, "operations", do_ops);
309
- dm->do_qops = config_get_boolean_ondemand(var_name, "queued operations", do_qops);
310
- dm->do_util = config_get_boolean_ondemand(var_name, "utilization percentage", do_util);
311
- dm->do_iotime = config_get_boolean_ondemand(var_name, "i/o time", do_iotime);
312
- dm->do_await = config_get_boolean_ondemand(var_name, "average completed i/o time",
305
+ dm->enabled = inicfg_get_boolean_ondemand(&netdata_config, var_name, "enabled", dm->enabled);
306
+
307
+ dm->do_io = inicfg_get_boolean_ondemand(&netdata_config, var_name, "bandwidth", do_io);
308
+ dm->do_ops = inicfg_get_boolean_ondemand(&netdata_config, var_name, "operations", do_ops);
309
+ dm->do_qops = inicfg_get_boolean_ondemand(&netdata_config, var_name, "queued operations", do_qops);
310
+ dm->do_util = inicfg_get_boolean_ondemand(&netdata_config, var_name, "utilization percentage", do_util);
311
+ dm->do_iotime = inicfg_get_boolean_ondemand(&netdata_config, var_name, "i/o time", do_iotime);
312
+ dm->do_await = inicfg_get_boolean_ondemand(&netdata_config, var_name, "average completed i/o time",
313
do_await);
314
- dm->do_avagsz = config_get_boolean_ondemand(var_name, "average completed i/o bandwidth",
314
+ dm->do_avagsz = inicfg_get_boolean_ondemand(&netdata_config, var_name, "average completed i/o bandwidth",
315
do_avagsz);
316
- dm->do_svctm = config_get_boolean_ondemand(var_name, "average service time", do_svctm);
316
+ dm->do_svctm = inicfg_get_boolean_ondemand(&netdata_config, var_name, "average service time", do_svctm);
317
318
// initialise data for differential charts
319
src/collectors/freebsd.plugin/freebsd_getifaddrs.c
+16
-16
@@ -153,27 +153,27 @@ int do_getifaddrs(int update_every, usec_t dt) {
153
static SIMPLE_PATTERN *excluded_interfaces = NULL, *physical_interfaces = NULL;
154
155
if (unlikely(enable_new_interfaces == -1)) {
156
- enable_new_interfaces = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS,
156
+ enable_new_interfaces = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS,
157
"enable new interfaces detected at runtime",
158
CONFIG_BOOLEAN_AUTO);
159
160
- do_bandwidth_net = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total bandwidth for physical interfaces",
160
+ do_bandwidth_net = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "total bandwidth for physical interfaces",
161
CONFIG_BOOLEAN_AUTO);
162
- do_packets_net = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total packets for physical interfaces",
162
+ do_packets_net = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "total packets for physical interfaces",
163
CONFIG_BOOLEAN_AUTO);
164
- do_bandwidth_ipv4 = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total bandwidth for ipv4 interfaces",
164
+ do_bandwidth_ipv4 = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "total bandwidth for ipv4 interfaces",
165
CONFIG_BOOLEAN_AUTO);
166
- do_bandwidth_ipv6 = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total bandwidth for ipv6 interfaces",
166
+ do_bandwidth_ipv6 = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "total bandwidth for ipv6 interfaces",
167
CONFIG_BOOLEAN_AUTO);
168
- do_bandwidth = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "bandwidth for all interfaces",
168
+ do_bandwidth = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "bandwidth for all interfaces",
169
CONFIG_BOOLEAN_AUTO);
170
- do_packets = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "packets for all interfaces",
170
+ do_packets = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "packets for all interfaces",
171
CONFIG_BOOLEAN_AUTO);
172
- do_errors = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "errors for all interfaces",
172
+ do_errors = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "errors for all interfaces",
173
CONFIG_BOOLEAN_AUTO);
174
- do_drops = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "drops for all interfaces",
174
+ do_drops = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "drops for all interfaces",
175
CONFIG_BOOLEAN_AUTO);
176
- do_events = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "collisions for all interfaces",
176
+ do_events = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "collisions for all interfaces",
177
CONFIG_BOOLEAN_AUTO);
178
179
excluded_interfaces = simple_pattern_create(
@@ -406,16 +406,16 @@ int do_getifaddrs(int update_every, usec_t dt) {
406
ifm->enabled = !simple_pattern_matches(excluded_interfaces, ifa->ifa_name);
407
408
snprintfz(var_name, 4096, "%s:%s", CONFIG_SECTION_GETIFADDRS, ifa->ifa_name);
409
- ifm->enabled = config_get_boolean_ondemand(var_name, "enabled", ifm->enabled);
409
+ ifm->enabled = inicfg_get_boolean_ondemand(&netdata_config, var_name, "enabled", ifm->enabled);
410
411
if (unlikely(ifm->enabled == CONFIG_BOOLEAN_NO))
412
continue;
413
414
- ifm->do_bandwidth = config_get_boolean_ondemand(var_name, "bandwidth", do_bandwidth);
415
- ifm->do_packets = config_get_boolean_ondemand(var_name, "packets", do_packets);
416
- ifm->do_errors = config_get_boolean_ondemand(var_name, "errors", do_errors);
417
- ifm->do_drops = config_get_boolean_ondemand(var_name, "drops", do_drops);
418
- ifm->do_events = config_get_boolean_ondemand(var_name, "events", do_events);
414
+ ifm->do_bandwidth = inicfg_get_boolean_ondemand(&netdata_config, var_name, "bandwidth", do_bandwidth);
415
+ ifm->do_packets = inicfg_get_boolean_ondemand(&netdata_config, var_name, "packets", do_packets);
416
+ ifm->do_errors = inicfg_get_boolean_ondemand(&netdata_config, var_name, "errors", do_errors);
417
+ ifm->do_drops = inicfg_get_boolean_ondemand(&netdata_config, var_name, "drops", do_drops);
418
+ ifm->do_events = inicfg_get_boolean_ondemand(&netdata_config, var_name, "events", do_events);
419
}
420
421
if (unlikely(!ifm->enabled))
src/collectors/freebsd.plugin/freebsd_getmntinfo.c
+6
-6
@@ -135,12 +135,12 @@ int do_getmntinfo(int update_every, usec_t dt) {
135
static SIMPLE_PATTERN *excluded_filesystems = NULL;
136
137
if (unlikely(enable_new_mount_points == -1)) {
138
- enable_new_mount_points = config_get_boolean_ondemand(CONFIG_SECTION_GETMNTINFO,
138
+ enable_new_mount_points = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETMNTINFO,
139
"enable new mount points detected at runtime",
140
CONFIG_BOOLEAN_AUTO);
141
142
- do_space = config_get_boolean_ondemand(CONFIG_SECTION_GETMNTINFO, "space usage for all disks", CONFIG_BOOLEAN_AUTO);
143
- do_inodes = config_get_boolean_ondemand(CONFIG_SECTION_GETMNTINFO, "inodes usage for all disks", CONFIG_BOOLEAN_AUTO);
142
+ do_space = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETMNTINFO, "space usage for all disks", CONFIG_BOOLEAN_AUTO);
143
+ do_inodes = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETMNTINFO, "inodes usage for all disks", CONFIG_BOOLEAN_AUTO);
144
145
excluded_mountpoints = simple_pattern_create(
146
inicfg_get(&netdata_config, CONFIG_SECTION_GETMNTINFO, "exclude space metrics on paths", DEFAULT_EXCLUDED_PATHS),
@@ -195,13 +195,13 @@ int do_getmntinfo(int update_every, usec_t dt) {
195
|| simple_pattern_matches(excluded_filesystems, mntbuf[i].f_fstypename));
196
197
snprintfz(var_name, 4096, "%s:%s", CONFIG_SECTION_GETMNTINFO, mntbuf[i].f_mntonname);
198
- m->enabled = config_get_boolean_ondemand(var_name, "enabled", m->enabled);
198
+ m->enabled = inicfg_get_boolean_ondemand(&netdata_config, var_name, "enabled", m->enabled);
199
200
if (unlikely(m->enabled == CONFIG_BOOLEAN_NO))
201
continue;
202
203
- m->do_space = config_get_boolean_ondemand(var_name, "space usage", do_space);
204
- m->do_inodes = config_get_boolean_ondemand(var_name, "inodes usage", do_inodes);
203
+ m->do_space = inicfg_get_boolean_ondemand(&netdata_config, var_name, "space usage", do_space);
204
+ m->do_inodes = inicfg_get_boolean_ondemand(&netdata_config, var_name, "inodes usage", do_inodes);
205
}
206
207
if (unlikely(!m->enabled))
src/collectors/freebsd.plugin/freebsd_sysctl.c
+16
-16
@@ -1662,15 +1662,15 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1662
do_tcp_packets = inicfg_get_boolean(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP packets", 1);
1663
do_tcp_errors = inicfg_get_boolean(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP errors", 1);
1664
do_tcp_handshake = inicfg_get_boolean(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP handshake issues", 1);
1665
- do_tcpext_connaborts = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP connection aborts",
1665
+ do_tcpext_connaborts = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "TCP connection aborts",
1666
CONFIG_BOOLEAN_AUTO);
1667
- do_tcpext_ofo = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP out-of-order queue",
1667
+ do_tcpext_ofo = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "TCP out-of-order queue",
1668
CONFIG_BOOLEAN_AUTO);
1669
- do_tcpext_syncookies = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP SYN cookies",
1669
+ do_tcpext_syncookies = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "TCP SYN cookies",
1670
CONFIG_BOOLEAN_AUTO);
1671
- do_tcpext_listen = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP listen issues",
1671
+ do_tcpext_listen = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "TCP listen issues",
1672
CONFIG_BOOLEAN_AUTO);
1673
- do_ecn = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "ECN packets",
1673
+ do_ecn = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "ECN packets",
1674
CONFIG_BOOLEAN_AUTO);
1675
}
1676
@@ -2415,13 +2415,13 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2415
static int do_ip6_packets = -1, do_ip6_fragsout = -1, do_ip6_fragsin = -1, do_ip6_errors = -1;
2416
2417
if (unlikely(do_ip6_packets == -1)) {
2418
- do_ip6_packets = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 packets",
2418
+ do_ip6_packets = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.ip6.stats", "ipv6 packets",
2419
CONFIG_BOOLEAN_AUTO);
2420
- do_ip6_fragsout = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 fragments sent",
2420
+ do_ip6_fragsout = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.ip6.stats", "ipv6 fragments sent",
2421
CONFIG_BOOLEAN_AUTO);
2422
- do_ip6_fragsin = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 fragments assembly",
2422
+ do_ip6_fragsin = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.ip6.stats", "ipv6 fragments assembly",
2423
CONFIG_BOOLEAN_AUTO);
2424
- do_ip6_errors = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 errors",
2424
+ do_ip6_errors = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.ip6.stats", "ipv6 errors",
2425
CONFIG_BOOLEAN_AUTO);
2426
}
2427
@@ -2604,19 +2604,19 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2604
do_icmp6_neighbor = -1, do_icmp6_types = -1;
2605
2606
if (unlikely(do_icmp6 == -1)) {
2607
- do_icmp6 = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp",
2607
+ do_icmp6 = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.icmp6.stats", "icmp",
2608
CONFIG_BOOLEAN_AUTO);
2609
- do_icmp6_redir = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp redirects",
2609
+ do_icmp6_redir = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.icmp6.stats", "icmp redirects",
2610
CONFIG_BOOLEAN_AUTO);
2611
- do_icmp6_errors = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp errors",
2611
+ do_icmp6_errors = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.icmp6.stats", "icmp errors",
2612
CONFIG_BOOLEAN_AUTO);
2613
- do_icmp6_echos = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp echos",
2613
+ do_icmp6_echos = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.icmp6.stats", "icmp echos",
2614
CONFIG_BOOLEAN_AUTO);
2615
- do_icmp6_router = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp router",
2615
+ do_icmp6_router = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.icmp6.stats", "icmp router",
2616
CONFIG_BOOLEAN_AUTO);
2617
- do_icmp6_neighbor = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp neighbor",
2617
+ do_icmp6_neighbor = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.icmp6.stats", "icmp neighbor",
2618
CONFIG_BOOLEAN_AUTO);
2619
- do_icmp6_types = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp types",
2619
+ do_icmp6_types = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.icmp6.stats", "icmp types",
2620
CONFIG_BOOLEAN_AUTO);
2621
}
2622