Minimize reallocz usage in FreeBSD plugin
Vladimir Kobal committed
Mar 23, 2017 at 20:40 UTC
507c108cf177dfff4f96bebb1410118c47d08964
1 file changed
+51
-12
src/freebsd_sysctl.c
+51
-12
@@ -311,8 +311,10 @@ int do_kern_cp_times(int update_every, usec_t dt) {
311
static int mib[2] = {0, 0};
312
long cp_time[CPUSTATES];
313
static long *pcpu_cp_time = NULL;
314
+ static int old_number_of_cpus = 0;
315
315
- pcpu_cp_time = reallocz(pcpu_cp_time, sizeof(cp_time) * number_of_cpus);
316
+ if(unlikely(number_of_cpus != old_number_of_cpus))
317
+ pcpu_cp_time = reallocz(pcpu_cp_time, sizeof(cp_time) * number_of_cpus);
318
if (unlikely(GETSYSCTL_WSIZE("kern.cp_times", mib, pcpu_cp_time, sizeof(cp_time) * number_of_cpus))) {
319
error("DISABLED: cpu.cpuXX charts");
320
error("DISABLED: kern.cp_times module");
@@ -331,12 +333,10 @@ int do_kern_cp_times(int update_every, usec_t dt) {
333
RRDDIM *rd_interrupt;
334
RRDDIM *rd_idle;
335
} *all_cpu_charts = NULL;
334
- static int old_number_of_cpus = 0;
336
337
if(unlikely(number_of_cpus > old_number_of_cpus)) {
338
all_cpu_charts = reallocz(all_cpu_charts, sizeof(struct cpu_chart) * number_of_cpus);
339
memset(&all_cpu_charts[old_number_of_cpus], 0, sizeof(struct cpu_chart) * (number_of_cpus - old_number_of_cpus));
339
- old_number_of_cpus = number_of_cpus;
340
}
341
342
for (i = 0; i < number_of_cpus; i++) {
@@ -375,6 +375,8 @@ int do_kern_cp_times(int update_every, usec_t dt) {
375
rrdset_done(all_cpu_charts[i].st);
376
}
377
}
378
+
379
+ old_number_of_cpus = number_of_cpus;
380
}
381
382
return 0;
@@ -396,11 +398,13 @@ int do_hw_intcnt(int update_every, usec_t dt) {
398
return 1;
399
} else {
400
unsigned long nintr = 0;
401
+ static unsigned long old_nintr = 0;
402
static unsigned long *intrcnt = NULL;
403
unsigned long long totalintr = 0;
404
405
nintr = intrcnt_size / sizeof(u_long);
403
- intrcnt = reallocz(intrcnt, nintr * sizeof(u_long));
406
+ if (unlikely(nintr != old_nintr))
407
+ intrcnt = reallocz(intrcnt, nintr * sizeof(u_long));
408
if (unlikely(GETSYSCTL_WSIZE("hw.intrcnt", mib_hw_intrcnt, intrcnt, nintr * sizeof(u_long)))) {
409
error("DISABLED: system.intr chart");
410
error("DISABLED: system.interrupts chart");
@@ -443,7 +447,8 @@ int do_hw_intcnt(int update_every, usec_t dt) {
447
static char *intrnames = NULL;
448
449
size = nintr * (MAXCOMLEN + 1);
446
- intrnames = reallocz(intrnames, size);
450
+ if (unlikely(nintr != old_nintr))
451
+ intrnames = reallocz(intrnames, size);
452
if (unlikely(GETSYSCTL_WSIZE("hw.intrnames", mib_hw_intrnames, intrnames, size))) {
453
error("DISABLED: system.intr chart");
454
error("DISABLED: system.interrupts chart");
@@ -484,6 +489,8 @@ int do_hw_intcnt(int update_every, usec_t dt) {
489
rrdset_done(st_interrupts);
490
}
491
}
492
+
493
+ old_nintr = nintr;
494
}
495
496
return 0;
@@ -931,8 +938,12 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
938
return 1;
939
} else {
940
static struct semid_kernel *ipc_sem_data = NULL;
941
+ static int old_semmni = 0;
942
935
- ipc_sem_data = reallocz(ipc_sem_data, sizeof(struct semid_kernel) * ipc_sem.semmni);
943
+ if (unlikely(ipc_sem.semmni != old_semmni)) {
944
+ ipc_sem_data = reallocz(ipc_sem_data, sizeof(struct semid_kernel) * ipc_sem.semmni);
945
+ old_semmni = ipc_sem.semmni;
946
+ }
947
if (unlikely(GETSYSCTL_WSIZE("kern.ipc.sema", mib_sema, ipc_sem_data, sizeof(struct semid_kernel) * ipc_sem.semmni))) {
948
error("DISABLED: system.ipc_semaphores chart");
949
error("DISABLED: system.ipc_semaphore_arrays chart");
@@ -1019,8 +1030,12 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1030
return 1;
1031
} else {
1032
static struct shmid_kernel *ipc_shm_data = NULL;
1033
+ static u_long old_shmmni = 0;
1034
1023
- ipc_shm_data = reallocz(ipc_shm_data, sizeof(struct shmid_kernel) * ipc_shm.shmmni);
1035
+ if (unlikely(ipc_shm.shmmni != old_shmmni)) {
1036
+ ipc_shm_data = reallocz(ipc_shm_data, sizeof(struct shmid_kernel) * ipc_shm.shmmni);
1037
+ old_shmmni = ipc_shm.shmmni;
1038
+ }
1039
if (unlikely(
1040
GETSYSCTL_WSIZE("kern.ipc.shmsegs", mib_shmsegs, ipc_shm_data, sizeof(struct shmid_kernel) * ipc_shm.shmmni))) {
1041
error("DISABLED: system.ipc_shared_mem_segs chart");
@@ -1111,8 +1126,12 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1126
return 1;
1127
} else {
1128
static struct msqid_kernel *ipc_msq_data = NULL;
1129
+ static int old_msgmni = 0;
1130
1115
- ipc_msq_data = reallocz(ipc_msq_data, sizeof(struct msqid_kernel) * ipc_msq.msgmni);
1131
+ if (unlikely(ipc_msq.msgmni != old_msgmni)) {
1132
+ ipc_msq_data = reallocz(ipc_msq_data, sizeof(struct msqid_kernel) * ipc_msq.msgmni);
1133
+ old_msgmni = ipc_msq.msgmni;
1134
+ }
1135
if (unlikely(
1136
GETSYSCTL_WSIZE("kern.ipc.msqids", mib_msqids, ipc_msq_data, sizeof(struct msqid_kernel) * ipc_msq.msgmni))) {
1137
error("DISABLED: system.ipc_msq_queues chart");
@@ -1276,14 +1295,25 @@ int do_net_isr(int update_every, usec_t dt) {
1295
} else if (unlikely(GETSYSCTL_SIZE("net.isr.work", mib_work, netisr_work_size))) {
1296
common_error = 1;
1297
} else {
1298
+ static size_t old_netisr_workstream_size = 0;
1299
+
1300
num_netisr_workstreams = netisr_workstream_size / sizeof(struct sysctl_netisr_workstream);
1280
- netisr_workstream = reallocz(netisr_workstream, num_netisr_workstreams * sizeof(struct sysctl_netisr_workstream));
1301
+ if (unlikely(netisr_workstream_size != old_netisr_workstream_size)) {
1302
+ netisr_workstream = reallocz(netisr_workstream,
1303
+ num_netisr_workstreams * sizeof(struct sysctl_netisr_workstream));
1304
+ old_netisr_workstream_size = netisr_workstream_size;
1305
+ }
1306
if (unlikely(GETSYSCTL_WSIZE("net.isr.workstream", mib_workstream, netisr_workstream,
1307
num_netisr_workstreams * sizeof(struct sysctl_netisr_workstream)))){
1308
common_error = 1;
1309
} else {
1310
+ static size_t old_netisr_work_size = 0;
1311
+
1312
num_netisr_works = netisr_work_size / sizeof(struct sysctl_netisr_work);
1286
- netisr_work = reallocz(netisr_work, num_netisr_works * sizeof(struct sysctl_netisr_work));
1313
+ if (unlikely(netisr_work_size != old_netisr_work_size)) {
1314
+ netisr_work = reallocz(netisr_work, num_netisr_works * sizeof(struct sysctl_netisr_work));
1315
+ old_netisr_work_size = netisr_work_size;
1316
+ }
1317
if (unlikely(GETSYSCTL_WSIZE("net.isr.work", mib_work, netisr_work,
1318
num_netisr_works * sizeof(struct sysctl_netisr_work)))){
1319
common_error = 1;
@@ -1301,8 +1331,12 @@ int do_net_isr(int update_every, usec_t dt) {
1331
} else {
1332
unsigned long i, n;
1333
int j;
1334
+ static int old_number_of_cpus = 0;
1335
1305
- netisr_stats = reallocz(netisr_stats, (number_of_cpus + 1) * sizeof(struct netisr_stats));
1336
+ if (unlikely(number_of_cpus != old_number_of_cpus)) {
1337
+ netisr_stats = reallocz(netisr_stats, (number_of_cpus + 1) * sizeof(struct netisr_stats));
1338
+ old_number_of_cpus = number_of_cpus;
1339
+ }
1340
memset(netisr_stats, 0, (number_of_cpus + 1) * sizeof(struct netisr_stats));
1341
for (i = 0; i < num_netisr_workstreams; i++) {
1342
for (n = 0; n < num_netisr_works; n++) {
@@ -3418,8 +3452,13 @@ int do_kern_devstat(int update_every, usec_t dt) {
3452
} else {
3453
static int mib_devstat[3] = {0, 0, 0};
3454
static void *devstat_data = NULL;
3455
+ static int old_numdevs = 0;
3456
3422
- devstat_data = reallocz(devstat_data, sizeof(long) + sizeof(struct devstat) * numdevs); // there is generation number before devstat structures
3457
+ if (unlikely(numdevs != old_numdevs)) {
3458
+ devstat_data = reallocz(devstat_data, sizeof(long) + sizeof(struct devstat) *
3459
+ numdevs); // there is generation number before devstat structures
3460
+ old_numdevs = numdevs;
3461
+ }
3462
if (unlikely(GETSYSCTL_WSIZE("kern.devstat.all", mib_devstat, devstat_data,
3463
sizeof(long) + sizeof(struct devstat) * numdevs))) {
3464
common_error = 1;