@cryptotaxi247 / netdata-1 / commits / 2d5f3acf7

Do not force internal collectors to call rrdset_next. (#13926)

* Remove calls to rrdset_next(). * Rm checks plugin * Update documentantion * Call rrdset_next from within rrdset_done This wraps up the removal of rrdset_next from internal collectors, which removes a lot of unecessary code and the need for if/else clauses in every place. The pluginsd parser is the only component that calls rrdset_next*() functions because it's not strictly speaking a collector but more of a collector manager/proxy. With the current changes it's possible to simplify the API we expose from RRD significantly, but this will be follow-up work in the future. * Remove stale reference to checks.plugin * Fix RRD unit test rrdset_next is not meant to be called from these tests. * Fix db engine unit test. * Schedule rrdset_next when we have completed at least one collection. * Mark chart creation clauses as unlikely. * Add missing brace to fix FreeBSD plugin.

vkalintiris committed Nov 22, 2022 at 04:52 UTC 2d5f3acf71f0c759056a3269987fee484566bc4c
68 files changed +278 -1805
CMakeLists.txt
-5
@@ -525,10 +525,6 @@ target_include_directories(libnetdata BEFORE PUBLIC ${GENERATED_CONFIG_H_DIR})
525 set(APPS_PLUGIN_FILES
526 collectors/apps.plugin/apps_plugin.c)
527
528 -set(CHECKS_PLUGIN_FILES
529 - collectors/checks.plugin/plugin_checks.c
530 - )
531 -
528 set(FREEBSD_PLUGIN_FILES
529 collectors/freebsd.plugin/plugin_freebsd.c
530 collectors/freebsd.plugin/plugin_freebsd.h
@@ -1059,7 +1055,6 @@ set(NETDATA_FILES
1055 ${DAEMON_FILES}
1056 ${API_PLUGIN_FILES}
1057 ${EXPORTING_ENGINE_FILES}
1062 - ${CHECKS_PLUGIN_FILES}
1058 ${HEALTH_PLUGIN_FILES}
1059 ${IDLEJITTER_PLUGIN_FILES}
1060 ${ML_FILES}
Makefile.am
-5
@@ -203,10 +203,6 @@ APPS_PLUGIN_FILES = \
203 $(LIBNETDATA_FILES) \
204 $(NULL)
205
206 -CHECKS_PLUGIN_FILES = \
207 - collectors/checks.plugin/plugin_checks.c \
208 - $(NULL)
209 -
206 FREEBSD_PLUGIN_FILES = \
207 collectors/freebsd.plugin/plugin_freebsd.c \
208 collectors/freebsd.plugin/plugin_freebsd.h \
@@ -918,7 +914,6 @@ NETDATA_FILES = \
914 $(LIBNETDATA_FILES) \
915 $(API_PLUGIN_FILES) \
916 $(EXPORTING_ENGINE_FILES) \
921 - $(CHECKS_PLUGIN_FILES) \
917 $(HEALTH_PLUGIN_FILES) \
918 $(ML_FILES) \
919 $(ML_TESTS_FILES) \
aclk/aclk_stats.c
+11 -20
@@ -39,8 +39,7 @@ static void aclk_stats_collect(struct aclk_metrics_per_sample *per_sample, struc
39 "connected", "netdata", "stats", 200000, localhost->rrd_update_every, RRDSET_TYPE_LINE);
40
41 rd_online_status = rrddim_add(st_aclkstats, "online", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
42 - } else
43 - rrdset_next(st_aclkstats);
42 + }
43
44 rrddim_set_by_pointer(st_aclkstats, rd_online_status, per_sample->offline_during_sample ? 0 : permanent->online);
45
@@ -60,8 +59,7 @@ static void aclk_stats_query_queue(struct aclk_metrics_per_sample *per_sample)
59
60 rd_queued = rrddim_add(st_query_thread, "added", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
61 rd_dispatched = rrddim_add(st_query_thread, "dispatched", NULL, -1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
63 - } else
64 - rrdset_next(st_query_thread);
62 + }
63
64 rrddim_set_by_pointer(st_query_thread, rd_queued, per_sample->queries_queued);
65 rrddim_set_by_pointer(st_query_thread, rd_dispatched, per_sample->queries_dispatched);
@@ -83,8 +81,8 @@ static void aclk_stats_latency(struct aclk_metrics_per_sample *per_sample)
81
82 rd_avg = rrddim_add(st, "avg", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
83 rd_max = rrddim_add(st, "max", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
86 - } else
87 - rrdset_next(st);
84 + }
85 +
86 if(per_sample->latency_count)
87 rrddim_set_by_pointer(st, rd_avg, roundf((float)per_sample->latency_total / per_sample->latency_count));
88 else
@@ -109,8 +107,7 @@ static void aclk_stats_cloud_req(struct aclk_metrics_per_sample *per_sample)
107
108 rd_rq_rcvd = rrddim_add(st, "received", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
109 rd_rq_err = rrddim_add(st, "malformed", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
112 - } else
113 - rrdset_next(st);
110 + }
111
112 rrddim_set_by_pointer(st, rd_rq_rcvd, per_sample->cloud_req_recvd - per_sample->cloud_req_err);
113 rrddim_set_by_pointer(st, rd_rq_err, per_sample->cloud_req_err);
@@ -131,8 +128,7 @@ static void aclk_stats_cloud_req_type(struct aclk_metrics_per_sample *per_sample
128 for (int i = 0; i < ACLK_QUERY_TYPE_COUNT; i++)
129 dims[i] = rrddim_add(st, aclk_query_get_name(i, 1), NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
130
134 - } else
135 - rrdset_next(st);
131 + }
132
133 for (int i = 0; i < ACLK_QUERY_TYPE_COUNT; i++)
134 rrddim_set_by_pointer(st, dims[i], per_sample->queries_per_type[i]);
@@ -171,8 +167,7 @@ static void aclk_stats_cloud_req_http_type(struct aclk_metrics_per_sample *per_s
167
168 for (int i = 0; i < ACLK_STATS_CLOUD_HTTP_REQ_TYPE_CNT; i++)
169 rd_rq_types[i] = rrddim_add(st, cloud_req_http_type_names[i], NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
174 - } else
175 - rrdset_next(st);
170 + }
171
172 for (int i = 0; i < ACLK_STATS_CLOUD_HTTP_REQ_TYPE_CNT; i++)
173 rrddim_set_by_pointer(st, rd_rq_types[i], per_sample->cloud_req_http_by_type[i]);
@@ -197,8 +192,7 @@ static void aclk_stats_query_threads(uint32_t *queries_per_thread)
192 error("snprintf encoding error");
193 aclk_qt_data[i].dim = rrddim_add(st, dim_name, NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
194 }
200 - } else
201 - rrdset_next(st);
195 + }
196
197 for (int i = 0; i < aclk_stats_cfg.query_thread_count; i++) {
198 rrddim_set_by_pointer(st, aclk_qt_data[i].dim, queries_per_thread[i]);
@@ -222,8 +216,7 @@ static void aclk_stats_query_time(struct aclk_metrics_per_sample *per_sample)
216 rd_rq_avg = rrddim_add(st, "avg", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
217 rd_rq_max = rrddim_add(st, "max", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
218 rd_rq_total = rrddim_add(st, "total", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
225 - } else
226 - rrdset_next(st);
219 + }
220
221 if(per_sample->cloud_q_process_count)
222 rrddim_set_by_pointer(st, rd_rq_avg, roundf((float)per_sample->cloud_q_process_total / per_sample->cloud_q_process_count));
@@ -248,8 +241,7 @@ static void aclk_stats_newproto_rx(uint32_t *rx_msgs_sample)
241 for (unsigned int i = 0; i < aclk_stats_cfg.proto_hdl_cnt; i++) {
242 aclk_stats_cfg.rx_msg_dims[i] = rrddim_add(st, rx_handler_get_name(i), NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
243 }
251 - } else
252 - rrdset_next(st);
244 + }
245
246 for (unsigned int i = 0; i < aclk_stats_cfg.proto_hdl_cnt; i++)
247 rrddim_set_by_pointer(st, aclk_stats_cfg.rx_msg_dims[i], rx_msgs_sample[i]);
@@ -275,8 +267,7 @@ static void aclk_stats_mqtt_wss(struct mqtt_wss_stats *stats)
267
268 rd_sent = rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
269 rd_recvd = rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
278 - } else
279 - rrdset_next(st);
270 + }
271
272 rrddim_set_by_pointer(st, rd_sent, sent);
273 rrddim_set_by_pointer(st, rd_recvd, recvd);
collectors/COLLECTORS.md
-1
@@ -514,6 +514,5 @@ default. To use a third-party collector, visit their GitHub/documentation page a
514
515 ## Etc
516
517 -- [checks.plugin](checks.plugin/README.md): A debugging collector, disabled by default.
517 - [charts.d example](charts.d.plugin/example/README.md): An example `charts.d` collector.
518 - [python.d example](python.d.plugin/example/README.md): An example `python.d` collector.
collectors/Makefile.am
-1
@@ -7,7 +7,6 @@ SUBDIRS = \
7 apps.plugin \
8 cgroups.plugin \
9 charts.d.plugin \
10 - checks.plugin \
10 cups.plugin \
11 diskspace.plugin \
12 timex.plugin \
collectors/REFERENCE.md
-5
@@ -148,11 +148,6 @@ collect_data() {
148 // attach a metric to it
149 rd = rrddim_add(st, "id", "name", multiplier, divider, algorithm);
150 }
151 - else {
152 - // this chart is already created
153 - // let Netdata know we start a new iteration on it
154 - rrdset_next(st);
155 - }
151
152 // give the collected value(s) to the chart
153 rrddim_set_by_pointer(st, rd, collected_value);
collectors/cgroups.plugin/sys_fs_cgroup.c
+76 -222
@@ -1447,7 +1447,6 @@ static inline void cgroup2_read_pressure(struct pressure *res) {
1447 return;
1448 }
1449
1450 -
1450 res->some.share_time.value10 = strtod(procfile_lineword(ff, 0, 2), NULL);
1451 res->some.share_time.value60 = strtod(procfile_lineword(ff, 0, 4), NULL);
1452 res->some.share_time.value300 = strtod(procfile_lineword(ff, 0, 6), NULL);
@@ -2847,57 +2846,45 @@ void update_systemd_services_charts(
2846
2847 // create the charts
2848
2850 - if(likely(do_cpu)) {
2851 - if(unlikely(!st_cpu)) {
2852 - char title[CHART_TITLE_MAX + 1];
2853 - snprintfz(title, CHART_TITLE_MAX, "Systemd Services CPU utilization (100%% = 1 core)");
2854 -
2855 - st_cpu = rrdset_create_localhost(
2856 - "services"
2857 - , "cpu"
2858 - , NULL
2859 - , "cpu"
2860 - , "services.cpu"
2861 - , title
2862 - , "percentage"
2863 - , PLUGIN_CGROUPS_NAME
2864 - , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
2865 - , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD
2866 - , update_every
2867 - , RRDSET_TYPE_STACKED
2868 - );
2869 -
2870 - }
2871 - else
2872 - rrdset_next(st_cpu);
2849 + if (unlikely(do_cpu && !st_cpu)) {
2850 + char title[CHART_TITLE_MAX + 1];
2851 + snprintfz(title, CHART_TITLE_MAX, "Systemd Services CPU utilization (100%% = 1 core)");
2852 +
2853 + st_cpu = rrdset_create_localhost(
2854 + "services"
2855 + , "cpu"
2856 + , NULL
2857 + , "cpu"
2858 + , "services.cpu"
2859 + , title
2860 + , "percentage"
2861 + , PLUGIN_CGROUPS_NAME
2862 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
2863 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD
2864 + , update_every
2865 + , RRDSET_TYPE_STACKED
2866 + );
2867 }
2868
2875 - if(likely(do_mem_usage)) {
2876 - if(unlikely(!st_mem_usage)) {
2877 -
2878 - st_mem_usage = rrdset_create_localhost(
2879 - "services"
2880 - , "mem_usage"
2881 - , NULL
2882 - , "mem"
2883 - , "services.mem_usage"
2884 - , "Systemd Services Used Memory"
2885 - , "MiB"
2886 - , PLUGIN_CGROUPS_NAME
2887 - , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
2888 - , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 10
2889 - , update_every
2890 - , RRDSET_TYPE_STACKED
2891 - );
2892 -
2893 - }
2894 - else
2895 - rrdset_next(st_mem_usage);
2869 + if (unlikely(do_mem_usage && !st_mem_usage)) {
2870 + st_mem_usage = rrdset_create_localhost(
2871 + "services"
2872 + , "mem_usage"
2873 + , NULL
2874 + , "mem"
2875 + , "services.mem_usage"
2876 + , "Systemd Services Used Memory"
2877 + , "MiB"
2878 + , PLUGIN_CGROUPS_NAME
2879 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
2880 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 10
2881 + , update_every
2882 + , RRDSET_TYPE_STACKED
2883 + );
2884 }
2885
2886 if(likely(do_mem_detailed)) {
2887 if(unlikely(!st_mem_detailed_rss)) {
2900 -
2888 st_mem_detailed_rss = rrdset_create_localhost(
2889 "services"
2890 , "mem_rss"
@@ -2912,13 +2899,9 @@ void update_systemd_services_charts(
2899 , update_every
2900 , RRDSET_TYPE_STACKED
2901 );
2915 -
2902 }
2917 - else
2918 - rrdset_next(st_mem_detailed_rss);
2903
2904 if(unlikely(!st_mem_detailed_mapped)) {
2921 -
2905 st_mem_detailed_mapped = rrdset_create_localhost(
2906 "services"
2907 , "mem_mapped"
@@ -2933,13 +2916,9 @@ void update_systemd_services_charts(
2916 , update_every
2917 , RRDSET_TYPE_STACKED
2918 );
2936 -
2919 }
2938 - else
2939 - rrdset_next(st_mem_detailed_mapped);
2920
2921 if(unlikely(!st_mem_detailed_cache)) {
2942 -
2922 st_mem_detailed_cache = rrdset_create_localhost(
2923 "services"
2924 , "mem_cache"
@@ -2954,13 +2933,9 @@ void update_systemd_services_charts(
2933 , update_every
2934 , RRDSET_TYPE_STACKED
2935 );
2957 -
2936 }
2959 - else
2960 - rrdset_next(st_mem_detailed_cache);
2937
2938 if(unlikely(!st_mem_detailed_writeback)) {
2963 -
2939 st_mem_detailed_writeback = rrdset_create_localhost(
2940 "services"
2941 , "mem_writeback"
@@ -2977,11 +2952,8 @@ void update_systemd_services_charts(
2952 );
2953
2954 }
2980 - else
2981 - rrdset_next(st_mem_detailed_writeback);
2955
2956 if(unlikely(!st_mem_detailed_pgfault)) {
2984 -
2957 st_mem_detailed_pgfault = rrdset_create_localhost(
2958 "services"
2959 , "mem_pgfault"
@@ -2997,11 +2969,8 @@ void update_systemd_services_charts(
2969 , RRDSET_TYPE_STACKED
2970 );
2971 }
3000 - else
3001 - rrdset_next(st_mem_detailed_pgfault);
2972
2973 if(unlikely(!st_mem_detailed_pgmajfault)) {
3004 -
2974 st_mem_detailed_pgmajfault = rrdset_create_localhost(
2975 "services"
2976 , "mem_pgmajfault"
@@ -3016,13 +2985,9 @@ void update_systemd_services_charts(
2985 , update_every
2986 , RRDSET_TYPE_STACKED
2987 );
3019 -
2988 }
3021 - else
3022 - rrdset_next(st_mem_detailed_pgmajfault);
2989
2990 if(unlikely(!st_mem_detailed_pgpgin)) {
3025 -
2991 st_mem_detailed_pgpgin = rrdset_create_localhost(
2992 "services"
2993 , "mem_pgpgin"
@@ -3039,11 +3004,8 @@ void update_systemd_services_charts(
3004 );
3005
3006 }
3042 - else
3043 - rrdset_next(st_mem_detailed_pgpgin);
3007
3008 if(unlikely(!st_mem_detailed_pgpgout)) {
3046 -
3009 st_mem_detailed_pgpgout = rrdset_create_localhost(
3010 "services"
3011 , "mem_pgpgout"
@@ -3058,61 +3020,45 @@ void update_systemd_services_charts(
3020 , update_every
3021 , RRDSET_TYPE_STACKED
3022 );
3061 -
3023 }
3063 - else
3064 - rrdset_next(st_mem_detailed_pgpgout);
3024 }
3025
3067 - if(likely(do_mem_failcnt)) {
3068 - if(unlikely(!st_mem_failcnt)) {
3069 -
3070 - st_mem_failcnt = rrdset_create_localhost(
3071 - "services"
3072 - , "mem_failcnt"
3073 - , NULL
3074 - , "mem"
3075 - , "services.mem_failcnt"
3076 - , "Systemd Services Memory Limit Failures"
3077 - , "failures"
3078 - , PLUGIN_CGROUPS_NAME
3079 - , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
3080 - , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 110
3081 - , update_every
3082 - , RRDSET_TYPE_STACKED
3083 - );
3084 -
3085 - }
3086 - else
3087 - rrdset_next(st_mem_failcnt);
3026 + if(unlikely(do_mem_failcnt && !st_mem_failcnt)) {
3027 + st_mem_failcnt = rrdset_create_localhost(
3028 + "services"
3029 + , "mem_failcnt"
3030 + , NULL
3031 + , "mem"
3032 + , "services.mem_failcnt"
3033 + , "Systemd Services Memory Limit Failures"
3034 + , "failures"
3035 + , PLUGIN_CGROUPS_NAME
3036 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
3037 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 110
3038 + , update_every
3039 + , RRDSET_TYPE_STACKED
3040 + );
3041 }
3042
3090 - if(likely(do_swap_usage)) {
3091 - if(unlikely(!st_swap_usage)) {
3092 -
3093 - st_swap_usage = rrdset_create_localhost(
3094 - "services"
3095 - , "swap_usage"
3096 - , NULL
3097 - , "swap"
3098 - , "services.swap_usage"
3099 - , "Systemd Services Swap Memory Used"
3100 - , "MiB"
3101 - , PLUGIN_CGROUPS_NAME
3102 - , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
3103 - , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 100
3104 - , update_every
3105 - , RRDSET_TYPE_STACKED
3106 - );
3107 -
3108 - }
3109 - else
3110 - rrdset_next(st_swap_usage);
3043 + if (do_swap_usage && !st_swap_usage) {
3044 + st_swap_usage = rrdset_create_localhost(
3045 + "services"
3046 + , "swap_usage"
3047 + , NULL
3048 + , "swap"
3049 + , "services.swap_usage"
3050 + , "Systemd Services Swap Memory Used"
3051 + , "MiB"
3052 + , PLUGIN_CGROUPS_NAME
3053 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
3054 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 100
3055 + , update_every
3056 + , RRDSET_TYPE_STACKED
3057 + );
3058 }
3059
3060 if(likely(do_io)) {
3061 if(unlikely(!st_io_read)) {
3115 -
3062 st_io_read = rrdset_create_localhost(
3063 "services"
3064 , "io_read"
@@ -3127,13 +3073,9 @@ void update_systemd_services_charts(
3073 , update_every
3074 , RRDSET_TYPE_STACKED
3075 );
3130 -
3076 }
3132 - else
3133 - rrdset_next(st_io_read);
3077
3078 if(unlikely(!st_io_write)) {
3136 -
3079 st_io_write = rrdset_create_localhost(
3080 "services"
3081 , "io_write"
@@ -3148,15 +3090,11 @@ void update_systemd_services_charts(
3090 , update_every
3091 , RRDSET_TYPE_STACKED
3092 );
3151 -
3093 }
3153 - else
3154 - rrdset_next(st_io_write);
3094 }
3095
3096 if(likely(do_io_ops)) {
3097 if(unlikely(!st_io_serviced_read)) {
3159 -
3098 st_io_serviced_read = rrdset_create_localhost(
3099 "services"
3100 , "io_ops_read"
@@ -3171,13 +3109,9 @@ void update_systemd_services_charts(
3109 , update_every
3110 , RRDSET_TYPE_STACKED
3111 );
3174 -
3112 }
3176 - else
3177 - rrdset_next(st_io_serviced_read);
3113
3114 if(unlikely(!st_io_serviced_write)) {
3180 -
3115 st_io_serviced_write = rrdset_create_localhost(
3116 "services"
3117 , "io_ops_write"
@@ -3192,10 +3126,7 @@ void update_systemd_services_charts(
3126 , update_every
3127 , RRDSET_TYPE_STACKED
3128 );
3195 -
3129 }
3197 - else
3198 - rrdset_next(st_io_serviced_write);
3130 }
3131
3132 if(likely(do_throttle_io)) {
@@ -3217,11 +3148,8 @@ void update_systemd_services_charts(
3148 );
3149
3150 }
3220 - else
3221 - rrdset_next(st_throttle_io_read);
3151
3152 if(unlikely(!st_throttle_io_write)) {
3224 -
3153 st_throttle_io_write = rrdset_create_localhost(
3154 "services"
3155 , "throttle_io_write"
@@ -3236,15 +3164,11 @@ void update_systemd_services_charts(
3164 , update_every
3165 , RRDSET_TYPE_STACKED
3166 );
3239 -
3167 }
3241 - else
3242 - rrdset_next(st_throttle_io_write);
3168 }
3169
3170 if(likely(do_throttle_ops)) {
3171 if(unlikely(!st_throttle_ops_read)) {
3247 -
3172 st_throttle_ops_read = rrdset_create_localhost(
3173 "services"
3174 , "throttle_io_ops_read"
@@ -3259,13 +3183,9 @@ void update_systemd_services_charts(
3183 , update_every
3184 , RRDSET_TYPE_STACKED
3185 );
3262 -
3186 }
3264 - else
3265 - rrdset_next(st_throttle_ops_read);
3187
3188 if(unlikely(!st_throttle_ops_write)) {
3268 -
3189 st_throttle_ops_write = rrdset_create_localhost(
3190 "services"
3191 , "throttle_io_ops_write"
@@ -3280,15 +3200,11 @@ void update_systemd_services_charts(
3200 , update_every
3201 , RRDSET_TYPE_STACKED
3202 );
3283 -
3203 }
3285 - else
3286 - rrdset_next(st_throttle_ops_write);
3204 }
3205
3206 if(likely(do_queued_ops)) {
3207 if(unlikely(!st_queued_ops_read)) {
3291 -
3208 st_queued_ops_read = rrdset_create_localhost(
3209 "services"
3210 , "queued_io_ops_read"
@@ -3303,10 +3219,7 @@ void update_systemd_services_charts(
3219 , update_every
3220 , RRDSET_TYPE_STACKED
3221 );
3306 -
3222 }
3308 - else
3309 - rrdset_next(st_queued_ops_read);
3223
3224 if(unlikely(!st_queued_ops_write)) {
3225
@@ -3324,15 +3237,11 @@ void update_systemd_services_charts(
3237 , update_every
3238 , RRDSET_TYPE_STACKED
3239 );
3327 -
3240 }
3329 - else
3330 - rrdset_next(st_queued_ops_write);
3241 }
3242
3243 if(likely(do_merged_ops)) {
3244 if(unlikely(!st_merged_ops_read)) {
3335 -
3245 st_merged_ops_read = rrdset_create_localhost(
3246 "services"
3247 , "merged_io_ops_read"
@@ -3347,13 +3256,9 @@ void update_systemd_services_charts(
3256 , update_every
3257 , RRDSET_TYPE_STACKED
3258 );
3350 -
3259 }
3352 - else
3353 - rrdset_next(st_merged_ops_read);
3260
3261 if(unlikely(!st_merged_ops_write)) {
3356 -
3262 st_merged_ops_write = rrdset_create_localhost(
3263 "services"
3264 , "merged_io_ops_write"
@@ -3368,10 +3273,7 @@ void update_systemd_services_charts(
3273 , update_every
3274 , RRDSET_TYPE_STACKED
3275 );
3371 -
3276 }
3373 - else
3374 - rrdset_next(st_merged_ops_write);
3277 }
3278
3279 // update the values
@@ -3828,8 +3730,6 @@ void update_cgroup_charts(int update_every) {
3730 rrddim_add(cg->st_cpu, "system", NULL, 100, 1000000, RRD_ALGORITHM_INCREMENTAL);
3731 }
3732 }
3831 - else
3832 - rrdset_next(cg->st_cpu);
3733
3734 rrddim_set(cg->st_cpu, "user", cg->cpuacct_stat.user);
3735 rrddim_set(cg->st_cpu, "system", cg->cpuacct_stat.system);
@@ -3896,8 +3796,6 @@ void update_cgroup_charts(int update_every) {
3796 rrddim_add(cg->st_cpu_limit, "used", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
3797 cg->prev_cpu_usage = (NETDATA_DOUBLE)(cg->cpuacct_stat.user + cg->cpuacct_stat.system) * 100;
3798 }
3899 - else
3900 - rrdset_next(cg->st_cpu_limit);
3799
3800 NETDATA_DOUBLE cpu_usage = 0;
3801 cpu_usage = (NETDATA_DOUBLE)(cg->cpuacct_stat.user + cg->cpuacct_stat.system) * 100;
@@ -3945,7 +3843,6 @@ void update_cgroup_charts(int update_every) {
3843 rrdset_update_rrdlabels(cg->st_cpu_nr_throttled, cg->chart_labels);
3844 rrddim_add(cg->st_cpu_nr_throttled, "throttled", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
3845 } else {
3948 - rrdset_next(cg->st_cpu_nr_throttled);
3846 rrddim_set(cg->st_cpu_nr_throttled, "throttled", cg->cpuacct_cpu_throttling.nr_throttled_perc);
3847 rrdset_done(cg->st_cpu_nr_throttled);
3848 }
@@ -3971,7 +3868,6 @@ void update_cgroup_charts(int update_every) {
3868 rrdset_update_rrdlabels(cg->st_cpu_throttled_time, cg->chart_labels);
3869 rrddim_add(cg->st_cpu_throttled_time, "duration", NULL, 1, 1000000, RRD_ALGORITHM_INCREMENTAL);
3870 } else {
3974 - rrdset_next(cg->st_cpu_throttled_time);
3871 rrddim_set(cg->st_cpu_throttled_time, "duration", cg->cpuacct_cpu_throttling.throttled_time);
3872 rrdset_done(cg->st_cpu_throttled_time);
3873 }
@@ -3999,7 +3895,6 @@ void update_cgroup_charts(int update_every) {
3895 rrdset_update_rrdlabels(cg->st_cpu_shares, cg->chart_labels);
3896 rrddim_add(cg->st_cpu_shares, "shares", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
3897 } else {
4002 - rrdset_next(cg->st_cpu_shares);
3898 rrddim_set(cg->st_cpu_shares, "shares", cg->cpuacct_cpu_shares.shares);
3899 rrdset_done(cg->st_cpu_shares);
3900 }
@@ -4034,8 +3929,6 @@ void update_cgroup_charts(int update_every) {
3929 rrddim_add(cg->st_cpu_per_core, id, NULL, 100, 1000000000, RRD_ALGORITHM_INCREMENTAL);
3930 }
3931 }
4037 - else
4038 - rrdset_next(cg->st_cpu_per_core);
3932
3933 for(i = 0; i < cg->cpuacct_usage.cpus ;i++) {
3934 snprintfz(id, RRD_ID_LENGTH_MAX, "cpu%u", i);
@@ -4083,8 +3976,6 @@ void update_cgroup_charts(int update_every) {
3976 rrddim_add(cg->st_mem, "file", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
3977 }
3978 }
4086 - else
4087 - rrdset_next(cg->st_mem);
3979
3980 if(!(cg->options & CGROUP_OPTIONS_IS_UNIFIED)) {
3981 rrddim_set(cg->st_mem, "cache", cg->memory.total_cache);
@@ -4130,8 +4021,6 @@ void update_cgroup_charts(int update_every) {
4021
4022 rrddim_add(cg->st_writeback, "writeback", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
4023 }
4133 - else
4134 - rrdset_next(cg->st_writeback);
4024
4025 if(cg->memory.detailed_has_dirty)
4026 rrddim_set(cg->st_writeback, "dirty", cg->memory.total_dirty);
@@ -4163,8 +4052,6 @@ void update_cgroup_charts(int update_every) {
4052 rrddim_add(cg->st_mem_activity, "pgpgin", "in", system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
4053 rrddim_add(cg->st_mem_activity, "pgpgout", "out", -system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
4054 }
4166 - else
4167 - rrdset_next(cg->st_mem_activity);
4055
4056 rrddim_set(cg->st_mem_activity, "pgpgin", cg->memory.total_pgpgin);
4057 rrddim_set(cg->st_mem_activity, "pgpgout", cg->memory.total_pgpgout);
@@ -4194,8 +4081,6 @@ void update_cgroup_charts(int update_every) {
4081 rrddim_add(cg->st_pgfaults, "pgfault", NULL, system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
4082 rrddim_add(cg->st_pgfaults, "pgmajfault", "swap", -system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
4083 }
4197 - else
4198 - rrdset_next(cg->st_pgfaults);
4084
4085 rrddim_set(cg->st_pgfaults, "pgfault", cg->memory.total_pgfault);
4086 rrddim_set(cg->st_pgfaults, "pgmajfault", cg->memory.total_pgmajfault);
@@ -4226,8 +4111,6 @@ void update_cgroup_charts(int update_every) {
4111 rrddim_add(cg->st_mem_usage, "ram", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
4112 rrddim_add(cg->st_mem_usage, "swap", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
4113 }
4229 - else
4230 - rrdset_next(cg->st_mem_usage);
4114
4115 rrddim_set(cg->st_mem_usage, "ram", cg->memory.usage_in_bytes);
4116 if(!(cg->options & CGROUP_OPTIONS_IS_UNIFIED)) {
@@ -4293,8 +4176,6 @@ void update_cgroup_charts(int update_every) {
4176 rrddim_add(cg->st_mem_usage_limit, "available", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
4177 rrddim_add(cg->st_mem_usage_limit, "used", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
4178 }
4296 - else
4297 - rrdset_next(cg->st_mem_usage_limit);
4179
4180 rrdset_isnot_obsolete(cg->st_mem_usage_limit);
4181
@@ -4323,8 +4204,7 @@ void update_cgroup_charts(int update_every) {
4204 rrdset_update_rrdlabels(cg->st_mem_utilization, cg->chart_labels);
4205
4206 rrddim_add(cg->st_mem_utilization, "utilization", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
4326 - } else
4327 - rrdset_next(cg->st_mem_utilization);
4207 + }
4208
4209 if (memory_limit) {
4210 rrdset_isnot_obsolete(cg->st_mem_utilization);
@@ -4373,8 +4253,6 @@ void update_cgroup_charts(int update_every) {
4253
4254 rrddim_add(cg->st_mem_failcnt, "failures", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
4255 }
4376 - else
4377 - rrdset_next(cg->st_mem_failcnt);
4256
4257 rrddim_set(cg->st_mem_failcnt, "failures", cg->memory.failcnt);
4258 rrdset_done(cg->st_mem_failcnt);
@@ -4404,8 +4282,6 @@ void update_cgroup_charts(int update_every) {
4282 rrddim_add(cg->st_io, "read", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
4283 rrddim_add(cg->st_io, "write", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
4284 }
4407 - else
4408 - rrdset_next(cg->st_io);
4285
4286 rrddim_set(cg->st_io, "read", cg->io_service_bytes.Read);
4287 rrddim_set(cg->st_io, "write", cg->io_service_bytes.Write);
@@ -4436,8 +4312,6 @@ void update_cgroup_charts(int update_every) {
4312 rrddim_add(cg->st_serviced_ops, "read", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
4313 rrddim_add(cg->st_serviced_ops, "write", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
4314 }
4439 - else
4440 - rrdset_next(cg->st_serviced_ops);
4315
4316 rrddim_set(cg->st_serviced_ops, "read", cg->io_serviced.Read);
4317 rrddim_set(cg->st_serviced_ops, "write", cg->io_serviced.Write);
@@ -4468,8 +4342,6 @@ void update_cgroup_charts(int update_every) {
4342 rrddim_add(cg->st_throttle_io, "read", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
4343 rrddim_add(cg->st_throttle_io, "write", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
4344 }
4471 - else
4472 - rrdset_next(cg->st_throttle_io);
4345
4346 rrddim_set(cg->st_throttle_io, "read", cg->throttle_io_service_bytes.Read);
4347 rrddim_set(cg->st_throttle_io, "write", cg->throttle_io_service_bytes.Write);
@@ -4500,8 +4372,6 @@ void update_cgroup_charts(int update_every) {
4372 rrddim_add(cg->st_throttle_serviced_ops, "read", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
4373 rrddim_add(cg->st_throttle_serviced_ops, "write", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
4374 }
4503 - else
4504 - rrdset_next(cg->st_throttle_serviced_ops);
4375
4376 rrddim_set(cg->st_throttle_serviced_ops, "read", cg->throttle_io_serviced.Read);
4377 rrddim_set(cg->st_throttle_serviced_ops, "write", cg->throttle_io_serviced.Write);
@@ -4532,8 +4402,6 @@ void update_cgroup_charts(int update_every) {
4402 rrddim_add(cg->st_queued_ops, "read", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
4403 rrddim_add(cg->st_queued_ops, "write", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
4404 }
4535 - else
4536 - rrdset_next(cg->st_queued_ops);
4405
4406 rrddim_set(cg->st_queued_ops, "read", cg->io_queued.Read);
4407 rrddim_set(cg->st_queued_ops, "write", cg->io_queued.Write);
@@ -4564,8 +4432,6 @@ void update_cgroup_charts(int update_every) {
4432 rrddim_add(cg->st_merged_ops, "read", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
4433 rrddim_add(cg->st_merged_ops, "write", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
4434 }
4567 - else
4568 - rrdset_next(cg->st_merged_ops);
4435
4436 rrddim_set(cg->st_merged_ops, "read", cg->io_merged.Read);
4437 rrddim_set(cg->st_merged_ops, "write", cg->io_merged.Write);
@@ -4600,9 +4466,8 @@ void update_cgroup_charts(int update_every) {
4466 pcs->share_time.rd10 = rrddim_add(chart, "some 10", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4467 pcs->share_time.rd60 = rrddim_add(chart, "some 60", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4468 pcs->share_time.rd300 = rrddim_add(chart, "some 300", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4603 - } else {
4604 - rrdset_next(pcs->share_time.st);
4469 }
4470 +
4471 if (unlikely(!pcs->total_time.st)) {
4472 RRDSET *chart;
4473 snprintfz(title, CHART_TITLE_MAX, "CPU some pressure stall time");
@@ -4622,9 +4487,8 @@ void update_cgroup_charts(int update_every) {
4487 );
4488 rrdset_update_rrdlabels(chart = pcs->total_time.st, cg->chart_labels);
4489 pcs->total_time.rdtotal = rrddim_add(chart, "time", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
4625 - } else {
4626 - rrdset_next(pcs->total_time.st);
4490 }
4491 +
4492 update_pressure_charts(pcs);
4493 }
4494 if (likely(res->updated && res->full.enabled)) {
@@ -4652,9 +4516,8 @@ void update_cgroup_charts(int update_every) {
4516 pcs->share_time.rd10 = rrddim_add(chart, "full 10", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4517 pcs->share_time.rd60 = rrddim_add(chart, "full 60", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4518 pcs->share_time.rd300 = rrddim_add(chart, "full 300", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4655 - } else {
4656 - rrdset_next(pcs->share_time.st);
4519 }
4520 +
4521 if (unlikely(!pcs->total_time.st)) {
4522 RRDSET *chart;
4523 snprintfz(title, CHART_TITLE_MAX, "CPU full pressure stall time");
@@ -4674,9 +4537,8 @@ void update_cgroup_charts(int update_every) {
4537 );
4538 rrdset_update_rrdlabels(chart = pcs->total_time.st, cg->chart_labels);
4539 pcs->total_time.rdtotal = rrddim_add(chart, "time", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
4677 - } else {
4678 - rrdset_next(pcs->total_time.st);
4540 }
4541 +
4542 update_pressure_charts(pcs);
4543 }
4544
@@ -4707,9 +4569,8 @@ void update_cgroup_charts(int update_every) {
4569 pcs->share_time.rd10 = rrddim_add(chart, "some 10", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4570 pcs->share_time.rd60 = rrddim_add(chart, "some 60", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4571 pcs->share_time.rd300 = rrddim_add(chart, "some 300", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4710 - } else {
4711 - rrdset_next(pcs->share_time.st);
4572 }
4573 +
4574 if (unlikely(!pcs->total_time.st)) {
4575 RRDSET *chart;
4576 snprintfz(title, CHART_TITLE_MAX, "Memory some pressure stall time");
@@ -4729,9 +4590,8 @@ void update_cgroup_charts(int update_every) {
4590 );
4591 rrdset_update_rrdlabels(chart = pcs->total_time.st, cg->chart_labels);
4592 pcs->total_time.rdtotal = rrddim_add(chart, "time", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
4732 - } else {
4733 - rrdset_next(pcs->total_time.st);
4593 }
4594 +
4595 update_pressure_charts(pcs);
4596 }
4597
@@ -4762,9 +4622,8 @@ void update_cgroup_charts(int update_every) {
4622 pcs->share_time.rd10 = rrddim_add(chart, "full 10", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4623 pcs->share_time.rd60 = rrddim_add(chart, "full 60", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4624 pcs->share_time.rd300 = rrddim_add(chart, "full 300", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4765 - } else {
4766 - rrdset_next(pcs->share_time.st);
4625 }
4626 +
4627 if (unlikely(!pcs->total_time.st)) {
4628 RRDSET *chart;
4629 snprintfz(title, CHART_TITLE_MAX, "Memory full pressure stall time");
@@ -4784,9 +4643,8 @@ void update_cgroup_charts(int update_every) {
4643 );
4644 rrdset_update_rrdlabels(chart = pcs->total_time.st, cg->chart_labels);
4645 pcs->total_time.rdtotal = rrddim_add(chart, "time", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
4787 - } else {
4788 - rrdset_next(pcs->total_time.st);
4646 }
4647 +
4648 update_pressure_charts(pcs);
4649 }
4650
@@ -4817,9 +4675,8 @@ void update_cgroup_charts(int update_every) {
4675 pcs->share_time.rd10 = rrddim_add(chart, "some 10", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4676 pcs->share_time.rd60 = rrddim_add(chart, "some 60", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4677 pcs->share_time.rd300 = rrddim_add(chart, "some 300", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4820 - } else {
4821 - rrdset_next(pcs->share_time.st);
4678 }
4679 +
4680 if (unlikely(!pcs->total_time.st)) {
4681 RRDSET *chart;
4682 snprintfz(title, CHART_TITLE_MAX, "I/O some pressure stall time");
@@ -4839,9 +4696,8 @@ void update_cgroup_charts(int update_every) {
4696 );
4697 rrdset_update_rrdlabels(chart = pcs->total_time.st, cg->chart_labels);
4698 pcs->total_time.rdtotal = rrddim_add(chart, "time", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
4842 - } else {
4843 - rrdset_next(pcs->total_time.st);
4699 }
4700 +
4701 update_pressure_charts(pcs);
4702 }
4703
@@ -4870,9 +4726,8 @@ void update_cgroup_charts(int update_every) {
4726 pcs->share_time.rd10 = rrddim_add(chart, "full 10", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4727 pcs->share_time.rd60 = rrddim_add(chart, "full 60", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4728 pcs->share_time.rd300 = rrddim_add(chart, "full 300", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
4873 - } else {
4874 - rrdset_next(pcs->share_time.st);
4729 }
4730 +
4731 if (unlikely(!pcs->total_time.st)) {
4732 RRDSET *chart;
4733 snprintfz(title, CHART_TITLE_MAX, "I/O full pressure stall time");
@@ -4892,9 +4747,8 @@ void update_cgroup_charts(int update_every) {
4747 );
4748 rrdset_update_rrdlabels(chart = pcs->total_time.st, cg->chart_labels);
4749 pcs->total_time.rdtotal = rrddim_add(chart, "time", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
4895 - } else {
4896 - rrdset_next(pcs->total_time.st);
4750 }
4751 +
4752 update_pressure_charts(pcs);
4753 }
4754 }
collectors/checks.plugin/Makefile.am deleted
-8
@@ -1,8 +0,0 @@
1 -# SPDX-License-Identifier: GPL-3.0-or-later
2 -
3 -AUTOMAKE_OPTIONS = subdir-objects
4 -MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
5 -
6 -dist_noinst_DATA = \
7 - README.md \
8 - $(NULL)
collectors/checks.plugin/README.md deleted
-10
@@ -1,10 +0,0 @@
1 -<!--
2 -title: "checks.plugin"
3 -custom_edit_url: https://github.com/netdata/netdata/edit/master/collectors/checks.plugin/README.md
4 --->
5 -
6 -# checks.plugin
7 -
8 -A debugging plugin (by default it is disabled)
9 -
10 -
collectors/checks.plugin/plugin_checks.c deleted
-128
@@ -1,128 +0,0 @@
1 -// SPDX-License-Identifier: GPL-3.0-or-later
2 -
3 -#include "daemon/common.h"
4 -
5 -static void checks_main_cleanup(void *ptr) {
6 - struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
7 - static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
8 -
9 - info("cleaning up...");
10 -
11 - static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
12 -}
13 -
14 -void *checks_main(void *ptr) {
15 - if (!global_statistics_enabled)
16 - return NULL;
17 -
18 - netdata_thread_cleanup_push(checks_main_cleanup, ptr);
19 -
20 - usec_t usec = 0, susec = localhost->rrd_update_every * USEC_PER_SEC, loop_usec = 0, total_susec = 0;
21 - struct timeval now, last, loop;
22 -
23 - RRDSET *check1, *check2, *check3, *apps_cpu = NULL;
24 -
25 - check1 = rrdset_create_localhost(
26 - "netdata"
27 - , "check1"
28 - , NULL
29 - , "netdata"
30 - , NULL
31 - , "Caller gives microseconds"
32 - , "a million !"
33 - , "checks.plugin"
34 - , ""
35 - , NETDATA_CHART_PRIO_CHECKS
36 - , localhost->rrd_update_every
37 - , RRDSET_TYPE_LINE
38 - );
39 -
40 - rrddim_add(check1, "absolute", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
41 - rrddim_add(check1, "incremental", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
42 -
43 - check2 = rrdset_create_localhost(
44 - "netdata"
45 - , "check2"
46 - , NULL
47 - , "netdata"
48 - , NULL
49 - , "Netdata calcs microseconds"
50 - , "a million !"
51 - , "checks.plugin"
52 - , ""
53 - , NETDATA_CHART_PRIO_CHECKS
54 - , localhost->rrd_update_every
55 - , RRDSET_TYPE_LINE
56 - );
57 - rrddim_add(check2, "absolute", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
58 - rrddim_add(check2, "incremental", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
59 -
60 - check3 = rrdset_create_localhost(
61 - "netdata"
62 - , "checkdt"
63 - , NULL
64 - , "netdata"
65 - , NULL
66 - , "Clock difference"
67 - , "microseconds diff"
68 - , "checks.plugin"
69 - , ""
70 - , NETDATA_CHART_PRIO_CHECKS
71 - , localhost->rrd_update_every
72 - , RRDSET_TYPE_LINE
73 - );
74 - rrddim_add(check3, "caller", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
75 - rrddim_add(check3, "netdata", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
76 - rrddim_add(check3, "apps.plugin", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
77 -
78 - now_realtime_timeval(&last);
79 - while(!netdata_exit) {
80 - usleep(susec);
81 -
82 - // find the time to sleep in order to wait exactly update_every seconds
83 - now_realtime_timeval(&now);
84 - loop_usec = dt_usec(&now, &last);
85 - usec = loop_usec - susec;
86 - debug(D_PROCNETDEV_LOOP, "CHECK: last loop took %llu usec (worked for %llu, slept for %llu).", loop_usec, usec, susec);
87 -
88 - if(usec < (localhost->rrd_update_every * USEC_PER_SEC / 2ULL)) susec = (localhost->rrd_update_every * USEC_PER_SEC) - usec;
89 - else susec = localhost->rrd_update_every * USEC_PER_SEC / 2ULL;
90 -
91 - // --------------------------------------------------------------------
92 - // Calculate loop time
93 -
94 - last.tv_sec = now.tv_sec;
95 - last.tv_usec = now.tv_usec;
96 - total_susec += loop_usec;
97 -
98 - // --------------------------------------------------------------------
99 - // check chart 1
100 -
101 - if(check1->counter_done) rrdset_next_usec(check1, loop_usec);
102 - rrddim_set(check1, "absolute", 1000000);
103 - rrddim_set(check1, "incremental", total_susec);
104 - rrdset_done(check1);
105 -
106 - // --------------------------------------------------------------------
107 - // check chart 2
108 -
109 - if(check2->counter_done) rrdset_next(check2);
110 - rrddim_set(check2, "absolute", 1000000);
111 - rrddim_set(check2, "incremental", total_susec);
112 - rrdset_done(check2);
113 -
114 - // --------------------------------------------------------------------
115 - // check chart 3
116 -
117 - if(!apps_cpu) apps_cpu = rrdset_find_localhost("apps.cpu");
118 - if(check3->counter_done) rrdset_next_usec(check3, loop_usec);
119 - now_realtime_timeval(&loop);
120 - rrddim_set(check3, "caller", (long long) dt_usec(&loop, &check1->last_collected_time));
121 - rrddim_set(check3, "netdata", (long long) dt_usec(&loop, &check2->last_collected_time));
122 - if(apps_cpu) rrddim_set(check3, "apps.plugin", (long long) dt_usec(&loop, &apps_cpu->last_collected_time));
123 - rrdset_done(check3);
124 - }
125 -
126 - netdata_thread_cleanup_pop(1);
127 - return NULL;
128 -}
collectors/diskspace.plugin/plugin_diskspace.c
-10
@@ -204,8 +204,6 @@ static void calculate_values_and_show_charts(
204 error("DISKSPACE: disk inode statistics for '%s' (disk '%s') do not sum up: total = %llu, available = %llu, reserved = %llu, used = %llu", mi->mount_point, disk, (unsigned long long)ftotal, (unsigned long long)favail, (unsigned long long)freserved_root, (unsigned long long)fused);
205 #endif
206
207 - // --------------------------------------------------------------------------
208 -
207 int rendered = 0;
208
209 if(m->do_space == CONFIG_BOOLEAN_YES || (m->do_space == CONFIG_BOOLEAN_AUTO &&
@@ -239,8 +237,6 @@ static void calculate_values_and_show_charts(
237 m->rd_space_used = rrddim_add(m->st_space, "used", NULL, (collected_number)bsize, 1024 * 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
238 m->rd_space_reserved = rrddim_add(m->st_space, "reserved_for_root", "reserved for root", (collected_number)bsize, 1024 * 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
239 }
242 - else
243 - rrdset_next(m->st_space);
240
241 rrddim_set_by_pointer(m->st_space, m->rd_space_avail, (collected_number)bavail);
242 rrddim_set_by_pointer(m->st_space, m->rd_space_used, (collected_number)bused);
@@ -250,8 +246,6 @@ static void calculate_values_and_show_charts(
246 rendered++;
247 }
248
253 - // --------------------------------------------------------------------------
254 -
249 if(m->do_inodes == CONFIG_BOOLEAN_YES || (m->do_inodes == CONFIG_BOOLEAN_AUTO &&
250 (favail || freserved_root || fused ||
251 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -283,8 +277,6 @@ static void calculate_values_and_show_charts(
277 m->rd_inodes_used = rrddim_add(m->st_inodes, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
278 m->rd_inodes_reserved = rrddim_add(m->st_inodes, "reserved_for_root", "reserved for root", 1, 1, RRD_ALGORITHM_ABSOLUTE);
279 }
286 - else
287 - rrdset_next(m->st_inodes);
280
281 rrddim_set_by_pointer(m->st_inodes, m->rd_inodes_avail, (collected_number)favail);
282 rrddim_set_by_pointer(m->st_inodes, m->rd_inodes_used, (collected_number)fused);
@@ -294,8 +286,6 @@ static void calculate_values_and_show_charts(
286 rendered++;
287 }
288
297 - // --------------------------------------------------------------------------
298 -
289 if(likely(rendered))
290 m->collected++;
291 }
collectors/freebsd.plugin/freebsd_devstat.c
+10 -40
@@ -347,8 +347,6 @@ int do_kern_devstat(int update_every, usec_t dt) {
347
348 cur_dstat.busy_time_ms = dstat[i].busy_time.sec * 1000 + dstat[i].busy_time.frac * BINTIME_SCALE;
349
350 - // --------------------------------------------------------------------
351 -
350 if(dm->do_io == CONFIG_BOOLEAN_YES || (dm->do_io == CONFIG_BOOLEAN_AUTO &&
351 (dstat[i].bytes[DEVSTAT_READ] ||
352 dstat[i].bytes[DEVSTAT_WRITE] ||
@@ -375,8 +373,7 @@ int do_kern_devstat(int update_every, usec_t dt) {
373 RRD_ALGORITHM_INCREMENTAL);
374 dm->rd_io_free = rrddim_add(dm->st_io, "frees", NULL, -1, KILO_FACTOR,
375 RRD_ALGORITHM_INCREMENTAL);
378 - } else
379 - rrdset_next(dm->st_io);
376 + }
377
378 rrddim_set_by_pointer(dm->st_io, dm->rd_io_in, dstat[i].bytes[DEVSTAT_READ]);
379 rrddim_set_by_pointer(dm->st_io, dm->rd_io_out, dstat[i].bytes[DEVSTAT_WRITE]);
@@ -384,8 +381,6 @@ int do_kern_devstat(int update_every, usec_t dt) {
381 rrdset_done(dm->st_io);
382 }
383
387 - // --------------------------------------------------------------------
388 -
384 if(dm->do_ops == CONFIG_BOOLEAN_YES || (dm->do_ops == CONFIG_BOOLEAN_AUTO &&
385 (dstat[i].operations[DEVSTAT_READ] ||
386 dstat[i].operations[DEVSTAT_WRITE] ||
@@ -417,8 +412,7 @@ int do_kern_devstat(int update_every, usec_t dt) {
412 RRD_ALGORITHM_INCREMENTAL);
413 dm->rd_ops_free = rrddim_add(dm->st_ops, "frees", NULL, -1, 1,
414 RRD_ALGORITHM_INCREMENTAL);
420 - } else
421 - rrdset_next(dm->st_ops);
415 + }
416
417 rrddim_set_by_pointer(dm->st_ops, dm->rd_ops_in, dstat[i].operations[DEVSTAT_READ]);
418 rrddim_set_by_pointer(dm->st_ops, dm->rd_ops_out, dstat[i].operations[DEVSTAT_WRITE]);
@@ -427,8 +421,6 @@ int do_kern_devstat(int update_every, usec_t dt) {
421 rrdset_done(dm->st_ops);
422 }
423
430 - // --------------------------------------------------------------------
431 -
424 if(dm->do_qops == CONFIG_BOOLEAN_YES || (dm->do_qops == CONFIG_BOOLEAN_AUTO &&
425 (dstat[i].start_count ||
426 dstat[i].end_count ||
@@ -451,15 +443,12 @@ int do_kern_devstat(int update_every, usec_t dt) {
443 rrdset_flag_set(dm->st_qops, RRDSET_FLAG_DETAIL);
444
445 dm->rd_qops = rrddim_add(dm->st_qops, "operations", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
454 - } else
455 - rrdset_next(dm->st_qops);
446 + }
447
448 rrddim_set_by_pointer(dm->st_qops, dm->rd_qops, dstat[i].start_count - dstat[i].end_count);
449 rrdset_done(dm->st_qops);
450 }
451
461 - // --------------------------------------------------------------------
462 -
452 if(dm->do_util == CONFIG_BOOLEAN_YES || (dm->do_util == CONFIG_BOOLEAN_AUTO &&
453 (cur_dstat.busy_time_ms ||
454 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -482,15 +471,12 @@ int do_kern_devstat(int update_every, usec_t dt) {
471
472 dm->rd_util = rrddim_add(dm->st_util, "utilization", NULL, 1, 10,
473 RRD_ALGORITHM_INCREMENTAL);
485 - } else
486 - rrdset_next(dm->st_util);
474 + }
475
476 rrddim_set_by_pointer(dm->st_util, dm->rd_util, cur_dstat.busy_time_ms);
477 rrdset_done(dm->st_util);
478 }
479
492 - // --------------------------------------------------------------------
493 -
480 if(dm->do_iotime == CONFIG_BOOLEAN_YES || (dm->do_iotime == CONFIG_BOOLEAN_AUTO &&
481 (cur_dstat.duration_read_ms ||
482 cur_dstat.duration_write_ms ||
@@ -522,8 +508,7 @@ int do_kern_devstat(int update_every, usec_t dt) {
508 RRD_ALGORITHM_INCREMENTAL);
509 dm->rd_iotime_free = rrddim_add(dm->st_iotime, "frees", NULL, -1, 1,
510 RRD_ALGORITHM_INCREMENTAL);
525 - } else
526 - rrdset_next(dm->st_iotime);
511 + }
512
513 rrddim_set_by_pointer(dm->st_iotime, dm->rd_iotime_in, cur_dstat.duration_read_ms);
514 rrddim_set_by_pointer(dm->st_iotime, dm->rd_iotime_out, cur_dstat.duration_write_ms);
@@ -532,14 +517,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
517 rrdset_done(dm->st_iotime);
518 }
519
535 - // --------------------------------------------------------------------
520 // calculate differential charts
521 // only if this is not the first time we run
522
523 if (likely(dt)) {
540 -
541 - // --------------------------------------------------------------------
542 -
524 if(dm->do_await == CONFIG_BOOLEAN_YES || (dm->do_await == CONFIG_BOOLEAN_AUTO &&
525 (dstat[i].operations[DEVSTAT_READ] ||
526 dstat[i].operations[DEVSTAT_WRITE] ||
@@ -571,8 +552,7 @@ int do_kern_devstat(int update_every, usec_t dt) {
552 RRD_ALGORITHM_ABSOLUTE);
553 dm->rd_await_free = rrddim_add(dm->st_await, "frees", NULL, -1, 1,
554 RRD_ALGORITHM_ABSOLUTE);
574 - } else
575 - rrdset_next(dm->st_await);
555 + }
556
557 rrddim_set_by_pointer(dm->st_await, dm->rd_await_in,
558 (dstat[i].operations[DEVSTAT_READ] -
@@ -605,8 +585,6 @@ int do_kern_devstat(int update_every, usec_t dt) {
585 rrdset_done(dm->st_await);
586 }
587
608 - // --------------------------------------------------------------------
609 -
588 if(dm->do_avagsz == CONFIG_BOOLEAN_YES || (dm->do_avagsz == CONFIG_BOOLEAN_AUTO &&
589 (dstat[i].operations[DEVSTAT_READ] ||
590 dstat[i].operations[DEVSTAT_WRITE] ||
@@ -635,8 +613,7 @@ int do_kern_devstat(int update_every, usec_t dt) {
613 RRD_ALGORITHM_ABSOLUTE);
614 dm->rd_avagsz_free = rrddim_add(dm->st_avagsz, "frees", NULL, -1, KILO_FACTOR,
615 RRD_ALGORITHM_ABSOLUTE);
638 - } else
639 - rrdset_next(dm->st_avagsz);
616 + }
617
618 rrddim_set_by_pointer(dm->st_avagsz, dm->rd_avagsz_in,
619 (dstat[i].operations[DEVSTAT_READ] -
@@ -662,8 +639,6 @@ int do_kern_devstat(int update_every, usec_t dt) {
639 rrdset_done(dm->st_avagsz);
640 }
641
665 - // --------------------------------------------------------------------
666 -
642 if(dm->do_svctm == CONFIG_BOOLEAN_YES || (dm->do_svctm == CONFIG_BOOLEAN_AUTO &&
643 (dstat[i].operations[DEVSTAT_READ] ||
644 dstat[i].operations[DEVSTAT_WRITE] ||
@@ -689,8 +664,7 @@ int do_kern_devstat(int update_every, usec_t dt) {
664
665 dm->rd_svctm = rrddim_add(dm->st_svctm, "svctm", NULL, 1, 1,
666 RRD_ALGORITHM_ABSOLUTE);
692 - } else
693 - rrdset_next(dm->st_svctm);
667 + }
668
669 rrddim_set_by_pointer(dm->st_svctm, dm->rd_svctm,
670 ((dstat[i].operations[DEVSTAT_READ] - dm->prev_dstat.operations_read) +
@@ -706,8 +680,6 @@ int do_kern_devstat(int update_every, usec_t dt) {
680 rrdset_done(dm->st_svctm);
681 }
682
709 - // --------------------------------------------------------------------
710 -
683 dm->prev_dstat.bytes_read = dstat[i].bytes[DEVSTAT_READ];
684 dm->prev_dstat.bytes_write = dstat[i].bytes[DEVSTAT_WRITE];
685 dm->prev_dstat.bytes_free = dstat[i].bytes[DEVSTAT_FREE];
@@ -724,8 +696,6 @@ int do_kern_devstat(int update_every, usec_t dt) {
696 }
697 }
698
727 - // --------------------------------------------------------------------
728 -
699 if (likely(do_system_io)) {
700 static RRDSET *st = NULL;
701 static RRDDIM *rd_in = NULL, *rd_out = NULL;
@@ -747,8 +717,7 @@ int do_kern_devstat(int update_every, usec_t dt) {
717
718 rd_in = rrddim_add(st, "in", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
719 rd_out = rrddim_add(st, "out", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
750 - } else
751 - rrdset_next(st);
720 + }
721
722 rrddim_set_by_pointer(st, rd_in, total_disk_kbytes_read);
723 rrddim_set_by_pointer(st, rd_out, total_disk_kbytes_write);
@@ -756,6 +725,7 @@ int do_kern_devstat(int update_every, usec_t dt) {
725 }
726 }
727 }
728 +
729 if (unlikely(common_error)) {
730 do_system_io = 0;
731 error("DISABLED: system.io chart");
collectors/freebsd.plugin/freebsd_getifaddrs.c
+10 -38
@@ -226,8 +226,6 @@ int do_getifaddrs(int update_every, usec_t dt) {
226 u_long ift_omcasts;
227 } iftot = {0, 0, 0, 0, 0, 0};
228
229 - // --------------------------------------------------------------------
230 -
229 if (likely(do_bandwidth_net)) {
230
231 iftot.ift_ibytes = iftot.ift_obytes = 0;
@@ -260,19 +258,16 @@ int do_getifaddrs(int update_every, usec_t dt) {
258
259 rd_in = rrddim_add(st, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
260 rd_out = rrddim_add(st, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
263 - } else
264 - rrdset_next(st);
261 + }
262
263 rrddim_set_by_pointer(st, rd_in, iftot.ift_ibytes);
264 rrddim_set_by_pointer(st, rd_out, iftot.ift_obytes);
265 rrdset_done(st);
266 }
267
271 - // --------------------------------------------------------------------
272 -
268 if (likely(do_packets_net)) {
274 -
269 iftot.ift_ipackets = iftot.ift_opackets = iftot.ift_imcasts = iftot.ift_omcasts = 0;
270 +
271 for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
272 if (ifa->ifa_addr->sa_family != AF_LINK)
273 continue;
@@ -308,8 +303,7 @@ int do_getifaddrs(int update_every, usec_t dt) {
303 rd_packets_out = rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
304 rd_packets_m_in = rrddim_add(st, "multicast_received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
305 rd_packets_m_out = rrddim_add(st, "multicast_sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
311 - } else
312 - rrdset_next(st);
306 + }
307
308 rrddim_set_by_pointer(st, rd_packets_in, iftot.ift_ipackets);
309 rrddim_set_by_pointer(st, rd_packets_out, iftot.ift_opackets);
@@ -318,8 +312,6 @@ int do_getifaddrs(int update_every, usec_t dt) {
312 rrdset_done(st);
313 }
314
321 - // --------------------------------------------------------------------
322 -
315 if (likely(do_bandwidth_ipv4)) {
316 iftot.ift_ibytes = iftot.ift_obytes = 0;
317 for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
@@ -349,16 +341,13 @@ int do_getifaddrs(int update_every, usec_t dt) {
341
342 rd_in = rrddim_add(st, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
343 rd_out = rrddim_add(st, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
352 - } else
353 - rrdset_next(st);
344 + }
345
346 rrddim_set_by_pointer(st, rd_in, iftot.ift_ibytes);
347 rrddim_set_by_pointer(st, rd_out, iftot.ift_obytes);
348 rrdset_done(st);
349 }
350
360 - // --------------------------------------------------------------------
361 -
351 if (likely(do_bandwidth_ipv6)) {
352 iftot.ift_ibytes = iftot.ift_obytes = 0;
353 for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
@@ -388,16 +377,13 @@ int do_getifaddrs(int update_every, usec_t dt) {
377
378 rd_in = rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
379 rd_out = rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
391 - } else
392 - rrdset_next(st);
380 + }
381
382 rrddim_set_by_pointer(st, rd_in, iftot.ift_ibytes);
383 rrddim_set_by_pointer(st, rd_out, iftot.ift_obytes);
384 rrdset_done(st);
385 }
386
399 - // --------------------------------------------------------------------
400 -
387 network_interfaces_found = 0;
388
389 for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
@@ -437,8 +423,6 @@ int do_getifaddrs(int update_every, usec_t dt) {
423 if (unlikely(!ifm->enabled))
424 continue;
425
440 - // --------------------------------------------------------------------
441 -
426 if (ifm->do_bandwidth == CONFIG_BOOLEAN_YES || (ifm->do_bandwidth == CONFIG_BOOLEAN_AUTO &&
427 (IFA_DATA(ibytes) ||
428 IFA_DATA(obytes) ||
@@ -460,16 +444,13 @@ int do_getifaddrs(int update_every, usec_t dt) {
444
445 ifm->rd_bandwidth_in = rrddim_add(ifm->st_bandwidth, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
446 ifm->rd_bandwidth_out = rrddim_add(ifm->st_bandwidth, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
463 - } else
464 - rrdset_next(ifm->st_bandwidth);
447 + }
448
449 rrddim_set_by_pointer(ifm->st_bandwidth, ifm->rd_bandwidth_in, IFA_DATA(ibytes));
450 rrddim_set_by_pointer(ifm->st_bandwidth, ifm->rd_bandwidth_out, IFA_DATA(obytes));
451 rrdset_done(ifm->st_bandwidth);
452 }
453
471 - // --------------------------------------------------------------------
472 -
454 if (ifm->do_packets == CONFIG_BOOLEAN_YES || (ifm->do_packets == CONFIG_BOOLEAN_AUTO &&
455 (IFA_DATA(ipackets) ||
456 IFA_DATA(opackets) ||
@@ -501,8 +482,7 @@ int do_getifaddrs(int update_every, usec_t dt) {
482 RRD_ALGORITHM_INCREMENTAL);
483 ifm->rd_packets_m_out = rrddim_add(ifm->st_packets, "multicast_sent", NULL, -1, 1,
484 RRD_ALGORITHM_INCREMENTAL);
504 - } else
505 - rrdset_next(ifm->st_packets);
485 + }
486
487 rrddim_set_by_pointer(ifm->st_packets, ifm->rd_packets_in, IFA_DATA(ipackets));
488 rrddim_set_by_pointer(ifm->st_packets, ifm->rd_packets_out, IFA_DATA(opackets));
@@ -511,8 +491,6 @@ int do_getifaddrs(int update_every, usec_t dt) {
491 rrdset_done(ifm->st_packets);
492 }
493
514 - // --------------------------------------------------------------------
515 -
494 if (ifm->do_errors == CONFIG_BOOLEAN_YES || (ifm->do_errors == CONFIG_BOOLEAN_AUTO &&
495 (IFA_DATA(ierrors) ||
496 IFA_DATA(oerrors) ||
@@ -536,14 +514,12 @@ int do_getifaddrs(int update_every, usec_t dt) {
514
515 ifm->rd_errors_in = rrddim_add(ifm->st_errors, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
516 ifm->rd_errors_out = rrddim_add(ifm->st_errors, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
539 - } else
540 - rrdset_next(ifm->st_errors);
517 + }
518
519 rrddim_set_by_pointer(ifm->st_errors, ifm->rd_errors_in, IFA_DATA(ierrors));
520 rrddim_set_by_pointer(ifm->st_errors, ifm->rd_errors_out, IFA_DATA(oerrors));
521 rrdset_done(ifm->st_errors);
522 }
546 - // --------------------------------------------------------------------
523
524 if (ifm->do_drops == CONFIG_BOOLEAN_YES || (ifm->do_drops == CONFIG_BOOLEAN_AUTO &&
525 (IFA_DATA(iqdrops) ||
@@ -572,8 +548,7 @@ int do_getifaddrs(int update_every, usec_t dt) {
548 #if __FreeBSD__ >= 11
549 ifm->rd_drops_out = rrddim_add(ifm->st_drops, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
550 #endif
575 - } else
576 - rrdset_next(ifm->st_drops);
551 + }
552
553 rrddim_set_by_pointer(ifm->st_drops, ifm->rd_drops_in, IFA_DATA(iqdrops));
554 #if __FreeBSD__ >= 11
@@ -582,8 +557,6 @@ int do_getifaddrs(int update_every, usec_t dt) {
557 rrdset_done(ifm->st_drops);
558 }
559
585 - // --------------------------------------------------------------------
586 -
560 if (ifm->do_events == CONFIG_BOOLEAN_YES || (ifm->do_events == CONFIG_BOOLEAN_AUTO &&
561 (IFA_DATA(collisions) ||
562 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -606,8 +579,7 @@ int do_getifaddrs(int update_every, usec_t dt) {
579
580 ifm->rd_events_coll = rrddim_add(ifm->st_events, "collisions", NULL, -1, 1,
581 RRD_ALGORITHM_INCREMENTAL);
609 - } else
610 - rrdset_next(ifm->st_events);
582 + }
583
584 rrddim_set_by_pointer(ifm->st_events, ifm->rd_events_coll, IFA_DATA(collisions));
585 rrdset_done(ifm->st_events);
collectors/freebsd.plugin/freebsd_getmntinfo.c
+2 -8
@@ -212,8 +212,6 @@ int do_getmntinfo(int update_every, usec_t dt) {
212 if (unlikely(mntbuf[i].f_flags & MNT_RDONLY && !m->collected))
213 continue;
214
215 - // --------------------------------------------------------------------------
216 -
215 int rendered = 0;
216
217 if (m->do_space == CONFIG_BOOLEAN_YES || (m->do_space == CONFIG_BOOLEAN_AUTO &&
@@ -242,8 +240,7 @@ int do_getmntinfo(int update_every, usec_t dt) {
240 mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
241 m->rd_space_reserved = rrddim_add(m->st_space, "reserved_for_root", "reserved for root",
242 mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
245 - } else
246 - rrdset_next(m->st_space);
243 + }
244
245 rrddim_set_by_pointer(m->st_space, m->rd_space_avail, (collected_number) mntbuf[i].f_bavail);
246 rrddim_set_by_pointer(m->st_space, m->rd_space_used, (collected_number) (mntbuf[i].f_blocks -
@@ -255,8 +252,6 @@ int do_getmntinfo(int update_every, usec_t dt) {
252 rendered++;
253 }
254
258 - // --------------------------------------------------------------------------
259 -
255 if (m->do_inodes == CONFIG_BOOLEAN_YES || (m->do_inodes == CONFIG_BOOLEAN_AUTO &&
256 (mntbuf[i].f_files > 1 ||
257 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -279,8 +274,7 @@ int do_getmntinfo(int update_every, usec_t dt) {
274
275 m->rd_inodes_avail = rrddim_add(m->st_inodes, "avail", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
276 m->rd_inodes_used = rrddim_add(m->st_inodes, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
282 - } else
283 - rrdset_next(m->st_inodes);
277 + }
278
279 rrddim_set_by_pointer(m->st_inodes, m->rd_inodes_avail, (collected_number) mntbuf[i].f_ffree);
280 rrddim_set_by_pointer(m->st_inodes, m->rd_inodes_used, (collected_number) (mntbuf[i].f_files -
collectors/freebsd.plugin/freebsd_ipfw.c
+9 -22
@@ -149,8 +149,6 @@ int do_ipfw(int update_every, usec_t dt) {
149 dynsz = 0;
150 }
151
152 - // --------------------------------------------------------------------
153 -
152 if (likely(do_mem)) {
153 static RRDSET *st_mem = NULL;
154 static RRDDIM *rd_dyn_mem = NULL;
@@ -174,22 +172,19 @@ int do_ipfw(int update_every, usec_t dt) {
172
173 rd_dyn_mem = rrddim_add(st_mem, "dynamic", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
174 rd_stat_mem = rrddim_add(st_mem, "static", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
177 - } else
178 - rrdset_next(st_mem);
175 + }
176
177 rrddim_set_by_pointer(st_mem, rd_dyn_mem, dynsz);
178 rrddim_set_by_pointer(st_mem, rd_stat_mem, *optlen - dynsz);
179 rrdset_done(st_mem);
180 }
181
185 - // --------------------------------------------------------------------
186 -
182 static RRDSET *st_packets = NULL, *st_bytes = NULL;
183 RRDDIM *rd_packets = NULL, *rd_bytes = NULL;
184
185 if (likely(do_static || do_dynamic)) {
186 if (likely(do_static)) {
192 - if (unlikely(!st_packets))
187 + if (unlikely(!st_packets)) {
188 st_packets = rrdset_create_localhost("ipfw",
189 "packets",
190 NULL,
@@ -203,10 +198,9 @@ int do_ipfw(int update_every, usec_t dt) {
198 update_every,
199 RRDSET_TYPE_STACKED
200 );
206 - else
207 - rrdset_next(st_packets);
201 + }
202
209 - if (unlikely(!st_bytes))
203 + if (unlikely(!st_bytes)) {
204 st_bytes = rrdset_create_localhost("ipfw",
205 "bytes",
206 NULL,
@@ -220,8 +214,7 @@ int do_ipfw(int update_every, usec_t dt) {
214 update_every,
215 RRDSET_TYPE_STACKED
216 );
223 - else
224 - rrdset_next(st_bytes);
217 + }
218 }
219
220 for (n = seen = 0; n < rcnt; n++, rbase = (ipfw_obj_tlv *) ((caddr_t) rbase + rbase->length)) {
@@ -256,8 +249,6 @@ int do_ipfw(int update_every, usec_t dt) {
249 }
250 }
251
259 - // --------------------------------------------------------------------
260 -
252 // go through dynamic rules configuration structures
253
254 if (likely(do_dynamic && (dynsz > 0))) {
@@ -305,12 +296,10 @@ int do_ipfw(int update_every, usec_t dt) {
296 dynbase += tlv->length;
297 }
298
308 - // --------------------------------------------------------------------
309 -
299 static RRDSET *st_active = NULL, *st_expired = NULL;
300 RRDDIM *rd_active = NULL, *rd_expired = NULL;
301
313 - if (unlikely(!st_active))
302 + if (unlikely(!st_active)) {
303 st_active = rrdset_create_localhost("ipfw",
304 "active",
305 NULL,
@@ -324,10 +313,9 @@ int do_ipfw(int update_every, usec_t dt) {
313 update_every,
314 RRDSET_TYPE_STACKED
315 );
327 - else
328 - rrdset_next(st_active);
316 + }
317
330 - if (unlikely(!st_expired))
318 + if (unlikely(!st_expired)) {
319 st_expired = rrdset_create_localhost("ipfw",
320 "expired",
321 NULL,
@@ -341,8 +329,7 @@ int do_ipfw(int update_every, usec_t dt) {
329 update_every,
330 RRDSET_TYPE_STACKED
331 );
344 - else
345 - rrdset_next(st_expired);
332 + }
333
334 for (srn = 0; (srn < (static_rules_num - 1)) && (dyn_rules_num[srn].rule_num != IPFW_DEFAULT_RULE); srn++) {
335 sprintf(rule_num_str, "%d", dyn_rules_num[srn].rule_num);
collectors/freebsd.plugin/freebsd_kstat_zfs.c
-8
@@ -7,7 +7,6 @@ extern struct arcstats arcstats;
7
8 unsigned long long zfs_arcstats_shrinkable_cache_size_bytes = 0;
9
10 -// --------------------------------------------------------------------------------------------------------------------
10 // kstat.zfs.misc.arcstats
11
12 int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
@@ -227,7 +226,6 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
226 return 0;
227 }
228
230 -// --------------------------------------------------------------------------------------------------------------------
229 // kstat.zfs.misc.zio_trim
230
231 int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt) {
@@ -246,8 +244,6 @@ int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt) {
244 return 1;
245 } else {
246
249 - // --------------------------------------------------------------------
250 -
247 static RRDSET *st_bytes = NULL;
248 static RRDDIM *rd_bytes = NULL;
249
@@ -269,13 +265,10 @@ int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt) {
265
266 rd_bytes = rrddim_add(st_bytes, "TRIMmed", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
267 }
272 - else rrdset_next(st_bytes);
268
269 rrddim_set_by_pointer(st_bytes, rd_bytes, bytes);
270 rrdset_done(st_bytes);
271
277 - // --------------------------------------------------------------------
278 -
272 static RRDSET *st_requests = NULL;
273 static RRDDIM *rd_successful = NULL, *rd_failed = NULL, *rd_unsupported = NULL;
274
@@ -299,7 +292,6 @@ int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt) {
292 rd_failed = rrddim_add(st_requests, "failed", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
293 rd_unsupported = rrddim_add(st_requests, "unsupported", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
294 }
302 - else rrdset_next(st_requests);
295
296 rrddim_set_by_pointer(st_requests, rd_successful, success);
297 rrddim_set_by_pointer(st_requests, rd_failed, failed);
collectors/freebsd.plugin/freebsd_sysctl.c
+29 -247
@@ -90,7 +90,6 @@ typedef struct vmmeter vmmeter_t;
90 #define NETDATA_COLLECT_LAUNDRY 1
91 #endif
92
93 -// --------------------------------------------------------------------------------------------------------------------
93 // FreeBSD plugin initialization
94
95 int freebsd_plugin_init()
@@ -114,7 +113,6 @@ int freebsd_plugin_init()
113 return 0;
114 }
115
117 -// --------------------------------------------------------------------------------------------------------------------
116 // vm.loadavg
117
118 // FreeBSD calculates load averages once every 5 seconds
@@ -132,9 +130,6 @@ int do_vm_loadavg(int update_every, usec_t dt){
130 error("DISABLED: vm.loadavg module");
131 return 1;
132 } else {
135 -
136 - // --------------------------------------------------------------------
137 -
133 static RRDSET *st = NULL;
134 static RRDDIM *rd_load1 = NULL, *rd_load2 = NULL, *rd_load3 = NULL;
135
@@ -156,8 +151,7 @@ int do_vm_loadavg(int update_every, usec_t dt){
151 rd_load1 = rrddim_add(st, "load1", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
152 rd_load2 = rrddim_add(st, "load5", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
153 rd_load3 = rrddim_add(st, "load15", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
159 - } else
160 - rrdset_next(st);
154 + }
155
156 rrddim_set_by_pointer(st, rd_load1, (collected_number) ((double) sysload.ldavg[0] / sysload.fscale * 1000));
157 rrddim_set_by_pointer(st, rd_load2, (collected_number) ((double) sysload.ldavg[1] / sysload.fscale * 1000));
@@ -173,7 +167,6 @@ int do_vm_loadavg(int update_every, usec_t dt){
167 return 0;
168 }
169
176 -// --------------------------------------------------------------------------------------------------------------------
170 // vm.vmtotal
171
172 int do_vm_vmtotal(int update_every, usec_t dt) {
@@ -200,9 +193,6 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
193 error("DISABLED: vm.vmtotal module");
194 return 1;
195 } else {
203 -
204 - // --------------------------------------------------------------------
205 -
196 if (likely(do_all_processes)) {
197 static RRDSET *st = NULL;
198 static RRDDIM *rd = NULL;
@@ -224,14 +214,11 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
214 );
215 rd = rrddim_add(st, "active", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
216 }
227 - else rrdset_next(st);
217
218 rrddim_set_by_pointer(st, rd, (vmtotal_data.t_rq + vmtotal_data.t_dw + vmtotal_data.t_pw + vmtotal_data.t_sl + vmtotal_data.t_sw));
219 rrdset_done(st);
220 }
221
233 - // --------------------------------------------------------------------
234 -
222 if (likely(do_processes)) {
223 static RRDSET *st = NULL;
224 static RRDDIM *rd_running = NULL, *rd_blocked = NULL;
@@ -255,15 +242,12 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
242 rd_running = rrddim_add(st, "running", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
243 rd_blocked = rrddim_add(st, "blocked", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
244 }
258 - else rrdset_next(st);
245
246 rrddim_set_by_pointer(st, rd_running, vmtotal_data.t_rq);
247 rrddim_set_by_pointer(st, rd_blocked, (vmtotal_data.t_dw + vmtotal_data.t_pw));
248 rrdset_done(st);
249 }
250
265 - // --------------------------------------------------------------------
266 -
251 if (likely(do_mem_real)) {
252 static RRDSET *st = NULL;
253 static RRDDIM *rd = NULL;
@@ -287,7 +271,6 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
271
272 rd = rrddim_add(st, "used", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
273 }
290 - else rrdset_next(st);
274
275 rrddim_set_by_pointer(st, rd, vmtotal_data.t_rm);
276 rrdset_done(st);
@@ -301,7 +284,6 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
284 return 0;
285 }
286
304 -// --------------------------------------------------------------------------------------------------------------------
287 // kern.cp_time
288
289 int do_kern_cp_time(int update_every, usec_t dt) {
@@ -321,9 +303,6 @@ int do_kern_cp_time(int update_every, usec_t dt) {
303 error("DISABLED: kern.cp_time module");
304 return 1;
305 } else {
324 -
325 - // --------------------------------------------------------------------
326 -
306 static RRDSET *st = NULL;
307 static RRDDIM *rd_nice = NULL, *rd_system = NULL, *rd_user = NULL, *rd_interrupt = NULL, *rd_idle = NULL;
308
@@ -350,7 +329,6 @@ int do_kern_cp_time(int update_every, usec_t dt) {
329 rd_idle = rrddim_add(st, "idle", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
330 rrddim_hide(st, "idle");
331 }
353 - else rrdset_next(st);
332
333 rrddim_set_by_pointer(st, rd_nice, cp_time[1]);
334 rrddim_set_by_pointer(st, rd_system, cp_time[2]);
@@ -364,7 +342,6 @@ int do_kern_cp_time(int update_every, usec_t dt) {
342 return 0;
343 }
344
367 -// --------------------------------------------------------------------------------------------------------------------
345 // kern.cp_times
346
347 int do_kern_cp_times(int update_every, usec_t dt) {
@@ -388,9 +365,6 @@ int do_kern_cp_times(int update_every, usec_t dt) {
365 error("DISABLED: kern.cp_times module");
366 return 1;
367 } else {
391 -
392 - // --------------------------------------------------------------------
393 -
368 int i;
369 static struct cpu_chart {
370 char cpuid[MAX_INT_DIGITS + 4];
@@ -436,7 +410,7 @@ int do_kern_cp_times(int update_every, usec_t dt) {
410 all_cpu_charts[i].rd_idle = rrddim_add(all_cpu_charts[i].st, "idle", NULL, 1, 1,
411 RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
412 rrddim_hide(all_cpu_charts[i].st, "idle");
439 - } else rrdset_next(all_cpu_charts[i].st);
413 + }
414
415 rrddim_set_by_pointer(all_cpu_charts[i].st, all_cpu_charts[i].rd_nice, pcpu_cp_time[i * 5 + 1]);
416 rrddim_set_by_pointer(all_cpu_charts[i].st, all_cpu_charts[i].rd_system, pcpu_cp_time[i * 5 + 2]);
@@ -453,7 +427,6 @@ int do_kern_cp_times(int update_every, usec_t dt) {
427 return 0;
428 }
429
456 -// --------------------------------------------------------------------------------------------------------------------
430 // dev.cpu.temperature
431
432 int do_dev_cpu_temperature(int update_every, usec_t dt) {
@@ -482,8 +455,6 @@ int do_dev_cpu_temperature(int update_every, usec_t dt) {
455 }
456 }
457
485 - // --------------------------------------------------------------------
486 -
458 static RRDSET *st;
459 static RRDDIM **rd_pcpu_temperature;
460
@@ -509,7 +480,6 @@ int do_dev_cpu_temperature(int update_every, usec_t dt) {
480 RRDSET_TYPE_LINE
481 );
482 }
512 - else rrdset_next(st);
483
484 for (i = 0; i < number_of_cpus; i++) {
485 if (unlikely(!rd_pcpu_temperature[i])) {
@@ -527,7 +497,6 @@ int do_dev_cpu_temperature(int update_every, usec_t dt) {
497 return 0;
498 }
499
530 -// --------------------------------------------------------------------------------------------------------------------
500 // dev.cpu.0.freq
501
502 int do_dev_cpu_0_freq(int update_every, usec_t dt) {
@@ -540,9 +509,6 @@ int do_dev_cpu_0_freq(int update_every, usec_t dt) {
509 error("DISABLED: dev.cpu.0.freq module");
510 return 1;
511 } else {
543 -
544 - // --------------------------------------------------------------------
545 -
512 static RRDSET *st = NULL;
513 static RRDDIM *rd = NULL;
514
@@ -564,7 +530,6 @@ int do_dev_cpu_0_freq(int update_every, usec_t dt) {
530
531 rd = rrddim_add(st, "frequency", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
532 }
567 - else rrdset_next(st);
533
534 rrddim_set_by_pointer(st, rd, cpufreq);
535 rrdset_done(st);
@@ -606,8 +571,6 @@ int do_hw_intcnt(int update_every, usec_t dt) {
571 for (i = 0; i < nintr; i++)
572 totalintr += intrcnt[i];
573
609 - // --------------------------------------------------------------------
610 -
574 static RRDSET *st_intr = NULL;
575 static RRDDIM *rd_intr = NULL;
576
@@ -629,14 +592,11 @@ int do_hw_intcnt(int update_every, usec_t dt) {
592 rrdset_flag_set(st_intr, RRDSET_FLAG_DETAIL);
593
594 rd_intr = rrddim_add(st_intr, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
632 - } else
633 - rrdset_next(st_intr);
595 + }
596
597 rrddim_set_by_pointer(st_intr, rd_intr, totalintr);
598 rrdset_done(st_intr);
599
638 - // --------------------------------------------------------------------
639 -
600 size_t size;
601 static int mib_hw_intrnames[2] = {0, 0};
602 static char *intrnames = NULL;
@@ -655,12 +615,9 @@ int do_hw_intcnt(int update_every, usec_t dt) {
615 error("DISABLED: hw.intrcnt module");
616 return 1;
617 } else {
658 -
659 - // --------------------------------------------------------------------
660 -
618 static RRDSET *st_interrupts = NULL;
619
663 - if (unlikely(!st_interrupts))
620 + if (unlikely(!st_interrupts)) {
621 st_interrupts = rrdset_create_localhost(
622 "system",
623 "interrupts",
@@ -675,8 +632,7 @@ int do_hw_intcnt(int update_every, usec_t dt) {
632 update_every,
633 RRDSET_TYPE_STACKED
634 );
678 - else
679 - rrdset_next(st_interrupts);
635 + }
636
637 for (i = 0; i < nintr; i++) {
638 void *p;
@@ -702,7 +658,6 @@ int do_hw_intcnt(int update_every, usec_t dt) {
658 return 0;
659 }
660
705 -// --------------------------------------------------------------------------------------------------------------------
661 // vm.stats.sys.v_intr
662
663 int do_vm_stats_sys_v_intr(int update_every, usec_t dt) {
@@ -715,9 +670,6 @@ int do_vm_stats_sys_v_intr(int update_every, usec_t dt) {
670 error("DISABLED: vm.stats.sys.v_intr module");
671 return 1;
672 } else {
718 -
719 - // --------------------------------------------------------------------
720 -
673 static RRDSET *st = NULL;
674 static RRDDIM *rd = NULL;
675
@@ -739,7 +691,6 @@ int do_vm_stats_sys_v_intr(int update_every, usec_t dt) {
691
692 rd = rrddim_add(st, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
693 }
742 - else rrdset_next(st);
694
695 rrddim_set_by_pointer(st, rd, int_number);
696 rrdset_done(st);
@@ -748,7 +699,6 @@ int do_vm_stats_sys_v_intr(int update_every, usec_t dt) {
699 return 0;
700 }
701
751 -// --------------------------------------------------------------------------------------------------------------------
702 // vm.stats.sys.v_soft
703
704 int do_vm_stats_sys_v_soft(int update_every, usec_t dt) {
@@ -761,9 +711,6 @@ int do_vm_stats_sys_v_soft(int update_every, usec_t dt) {
711 error("DISABLED: vm.stats.sys.v_soft module");
712 return 1;
713 } else {
764 -
765 - // --------------------------------------------------------------------
766 -
714 static RRDSET *st = NULL;
715 static RRDDIM *rd = NULL;
716
@@ -785,7 +732,6 @@ int do_vm_stats_sys_v_soft(int update_every, usec_t dt) {
732
733 rd = rrddim_add(st, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
734 }
788 - else rrdset_next(st);
735
736 rrddim_set_by_pointer(st, rd, soft_intr_number);
737 rrdset_done(st);
@@ -794,7 +740,6 @@ int do_vm_stats_sys_v_soft(int update_every, usec_t dt) {
740 return 0;
741 }
742
797 -// --------------------------------------------------------------------------------------------------------------------
743 // vm.stats.sys.v_swtch
744
745 int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {
@@ -807,9 +752,6 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {
752 error("DISABLED: vm.stats.sys.v_swtch module");
753 return 1;
754 } else {
810 -
811 - // --------------------------------------------------------------------
812 -
755 static RRDSET *st = NULL;
756 static RRDDIM *rd = NULL;
757
@@ -831,7 +773,6 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {
773
774 rd = rrddim_add(st, "switches", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
775 }
834 - else rrdset_next(st);
776
777 rrddim_set_by_pointer(st, rd, ctxt_number);
778 rrdset_done(st);
@@ -840,7 +781,6 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {
781 return 0;
782 }
783
843 -// --------------------------------------------------------------------------------------------------------------------
784 // vm.stats.vm.v_forks
785
786 int do_vm_stats_sys_v_forks(int update_every, usec_t dt) {
@@ -879,7 +819,6 @@ int do_vm_stats_sys_v_forks(int update_every, usec_t dt) {
819
820 rd = rrddim_add(st, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
821 }
882 - else rrdset_next(st);
822
823 rrddim_set_by_pointer(st, rd, forks_number);
824 rrdset_done(st);
@@ -888,7 +827,6 @@ int do_vm_stats_sys_v_forks(int update_every, usec_t dt) {
827 return 0;
828 }
829
891 -// --------------------------------------------------------------------------------------------------------------------
830 // vm.swap_info
831
832 int do_vm_swap_info(int update_every, usec_t dt) {
@@ -931,8 +869,6 @@ int do_vm_swap_info(int update_every, usec_t dt) {
869 total_xsw.bytes_total += xsw.xsw_nblks;
870 }
871
934 - // --------------------------------------------------------------------
935 -
872 static RRDSET *st = NULL;
873 static RRDDIM *rd_free = NULL, *rd_used = NULL;
874
@@ -957,7 +893,6 @@ int do_vm_swap_info(int update_every, usec_t dt) {
893 rd_free = rrddim_add(st, "free", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
894 rd_used = rrddim_add(st, "used", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
895 }
960 - else rrdset_next(st);
896
897 rrddim_set_by_pointer(st, rd_free, total_xsw.bytes_total - total_xsw.bytes_used);
898 rrddim_set_by_pointer(st, rd_used, total_xsw.bytes_used);
@@ -967,7 +902,6 @@ int do_vm_swap_info(int update_every, usec_t dt) {
902 return 0;
903 }
904
970 -// --------------------------------------------------------------------------------------------------------------------
905 // system.ram
906
907 int do_system_ram(int update_every, usec_t dt) {
@@ -1002,9 +936,6 @@ int do_system_ram(int update_every, usec_t dt) {
936 error("DISABLED: system.ram module");
937 return 1;
938 } else {
1005 -
1006 - // --------------------------------------------------------------------
1007 -
939 static RRDSET *st = NULL, *st_mem_available = NULL;
940 static RRDDIM *rd_free = NULL, *rd_active = NULL, *rd_inactive = NULL, *rd_wired = NULL,
941 *rd_cache = NULL, *rd_buffers = NULL, *rd_avail = NULL;
@@ -1039,7 +970,6 @@ int do_system_ram(int update_every, usec_t dt) {
970 #endif
971 rd_buffers = rrddim_add(st, "buffers", NULL, 1, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
972 }
1042 - else rrdset_next(st);
973
974 rrddim_set_by_pointer(st, rd_free, vmmeter_data.v_free_count);
975 rrddim_set_by_pointer(st, rd_active, vmmeter_data.v_active_count);
@@ -1074,7 +1004,6 @@ int do_system_ram(int update_every, usec_t dt) {
1004
1005 rd_avail = rrddim_add(st_mem_available, "MemAvailable", "avail", system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
1006 }
1077 - else rrdset_next(st_mem_available);
1007
1008 #if __FreeBSD_version < 1200016
1009 rrddim_set_by_pointer(st_mem_available, rd_avail, vmmeter_data.v_inactive_count + vmmeter_data.v_free_count + vmmeter_data.v_cache_count + zfs_arcstats_shrinkable_cache_size_bytes / system_pagesize);
@@ -1088,7 +1017,6 @@ int do_system_ram(int update_every, usec_t dt) {
1017 return 0;
1018 }
1019
1091 -// --------------------------------------------------------------------------------------------------------------------
1020 // vm.stats.vm.v_swappgs
1021
1022 int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {
@@ -1102,9 +1030,6 @@ int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {
1030 error("DISABLED: vm.stats.vm.v_swappgs module");
1031 return 1;
1032 } else {
1105 -
1106 - // --------------------------------------------------------------------
1107 -
1033 static RRDSET *st = NULL;
1034 static RRDDIM *rd_in = NULL, *rd_out = NULL;
1035
@@ -1127,7 +1052,6 @@ int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {
1052 rd_in = rrddim_add(st, "in", NULL, system_pagesize, KILO_FACTOR, RRD_ALGORITHM_INCREMENTAL);
1053 rd_out = rrddim_add(st, "out", NULL, -system_pagesize, KILO_FACTOR, RRD_ALGORITHM_INCREMENTAL);
1054 }
1130 - else rrdset_next(st);
1055
1056 rrddim_set_by_pointer(st, rd_in, vmmeter_data.v_swappgsin);
1057 rrddim_set_by_pointer(st, rd_out, vmmeter_data.v_swappgsout);
@@ -1137,7 +1061,6 @@ int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {
1061 return 0;
1062 }
1063
1140 -// --------------------------------------------------------------------------------------------------------------------
1064 // vm.stats.vm.v_pgfaults
1065
1066 int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {
@@ -1155,9 +1078,6 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {
1078 error("DISABLED: vm.stats.vm.v_pgfaults module");
1079 return 1;
1080 } else {
1158 -
1159 - // --------------------------------------------------------------------
1160 -
1081 static RRDSET *st = NULL;
1082 static RRDDIM *rd_memory = NULL, *rd_io_requiring = NULL, *rd_cow = NULL,
1083 *rd_cow_optimized = NULL, *rd_in_transit = NULL;
@@ -1186,7 +1106,6 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {
1106 rd_cow_optimized = rrddim_add(st, "cow_optimized", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1107 rd_in_transit = rrddim_add(st, "in_transit", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1108 }
1189 - else rrdset_next(st);
1109
1110 rrddim_set_by_pointer(st, rd_memory, vmmeter_data.v_vm_faults);
1111 rrddim_set_by_pointer(st, rd_io_requiring, vmmeter_data.v_io_faults);
@@ -1240,8 +1159,6 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
1159 }
1160 }
1161
1243 - // --------------------------------------------------------------------
1244 -
1162 static RRDSET *st_semaphores = NULL, *st_semaphore_arrays = NULL;
1163 static RRDDIM *rd_semaphores = NULL, *rd_semaphore_arrays = NULL;
1164
@@ -1263,13 +1180,10 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
1180
1181 rd_semaphores = rrddim_add(st_semaphores, "semaphores", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1182 }
1266 - else rrdset_next(st_semaphores);
1183
1184 rrddim_set_by_pointer(st_semaphores, rd_semaphores, ipc_sem.semaphores);
1185 rrdset_done(st_semaphores);
1186
1271 - // --------------------------------------------------------------------
1272 -
1187 if (unlikely(!st_semaphore_arrays)) {
1188 st_semaphore_arrays = rrdset_create_localhost(
1189 "system",
@@ -1288,7 +1202,6 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
1202
1203 rd_semaphore_arrays = rrddim_add(st_semaphore_arrays, "arrays", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1204 }
1291 - else rrdset_next(st_semaphore_arrays);
1205
1206 rrddim_set_by_pointer(st_semaphore_arrays, rd_semaphore_arrays, ipc_sem.sets);
1207 rrdset_done(st_semaphore_arrays);
@@ -1298,7 +1211,6 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
1211 return 0;
1212 }
1213
1301 -// --------------------------------------------------------------------------------------------------------------------
1214 // kern.ipc.shm
1215
1216 int do_kern_ipc_shm(int update_every, usec_t dt) {
@@ -1340,8 +1252,6 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1252 }
1253 }
1254
1343 - // --------------------------------------------------------------------
1344 -
1255 static RRDSET *st_segs = NULL, *st_size = NULL;
1256 static RRDDIM *rd_segments = NULL, *rd_allocated = NULL;
1257
@@ -1363,13 +1273,10 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1273
1274 rd_segments = rrddim_add(st_segs, "segments", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1275 }
1366 - else rrdset_next(st_segs);
1276
1277 rrddim_set_by_pointer(st_segs, rd_segments, ipc_shm.segs);
1278 rrdset_done(st_segs);
1279
1371 - // --------------------------------------------------------------------
1372 -
1280 if (unlikely(!st_size)) {
1281 st_size = rrdset_create_localhost(
1282 "system",
@@ -1388,7 +1295,6 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1295
1296 rd_allocated = rrddim_add(st_size, "allocated", NULL, 1, KILO_FACTOR, RRD_ALGORITHM_ABSOLUTE);
1297 }
1391 - else rrdset_next(st_size);
1298
1299 rrddim_set_by_pointer(st_size, rd_allocated, ipc_shm.segsize);
1300 rrdset_done(st_size);
@@ -1398,7 +1304,6 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1304 return 0;
1305 }
1306
1401 -// --------------------------------------------------------------------------------------------------------------------
1307 // kern.ipc.msq
1308
1309 int do_kern_ipc_msq(int update_every, usec_t dt) {
@@ -1446,8 +1351,6 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1351 }
1352 }
1353
1449 - // --------------------------------------------------------------------
1450 -
1354 static RRDSET *st_queues = NULL, *st_messages = NULL, *st_size = NULL;
1355 static RRDDIM *rd_queues = NULL, *rd_messages = NULL, *rd_allocated = NULL, *rd_used = NULL;
1356
@@ -1469,13 +1372,10 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1372
1373 rd_queues = rrddim_add(st_queues, "queues", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1374 }
1472 - else rrdset_next(st_queues);
1375
1376 rrddim_set_by_pointer(st_queues, rd_queues, ipc_msq.queues);
1377 rrdset_done(st_queues);
1378
1477 - // --------------------------------------------------------------------
1478 -
1379 if (unlikely(!st_messages)) {
1380 st_messages = rrdset_create_localhost(
1381 "system",
@@ -1494,13 +1394,10 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1394
1395 rd_messages = rrddim_add(st_messages, "messages", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1396 }
1497 - else rrdset_next(st_messages);
1397
1398 rrddim_set_by_pointer(st_messages, rd_messages, ipc_msq.messages);
1399 rrdset_done(st_messages);
1400
1502 - // --------------------------------------------------------------------
1503 -
1401 if (unlikely(!st_size)) {
1402 st_size = rrdset_create_localhost(
1403 "system",
@@ -1520,7 +1417,6 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1417 rd_allocated = rrddim_add(st_size, "allocated", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1418 rd_used = rrddim_add(st_size, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1419 }
1523 - else rrdset_next(st_size);
1420
1421 rrddim_set_by_pointer(st_size, rd_allocated, ipc_msq.allocsize);
1422 rrddim_set_by_pointer(st_size, rd_used, ipc_msq.usedsize);
@@ -1531,7 +1427,6 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1427 return 0;
1428 }
1429
1534 -// --------------------------------------------------------------------------------------------------------------------
1430 // uptime
1431
1432 int do_uptime(int update_every, usec_t dt) {
@@ -1540,8 +1435,6 @@ int do_uptime(int update_every, usec_t dt) {
1435
1436 clock_gettime(CLOCK_UPTIME, &up_time);
1437
1543 - // --------------------------------------------------------------------
1544 -
1438 static RRDSET *st = NULL;
1439 static RRDDIM *rd = NULL;
1440
@@ -1563,15 +1456,12 @@ int do_uptime(int update_every, usec_t dt) {
1456
1457 rd = rrddim_add(st, "uptime", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1458 }
1566 - else rrdset_next(st);
1459
1460 rrddim_set_by_pointer(st, rd, up_time.tv_sec);
1461 rrdset_done(st);
1570 -
1462 return 0;
1463 }
1464
1574 -// --------------------------------------------------------------------------------------------------------------------
1465 // net.isr
1466
1467 int do_net_isr(int update_every, usec_t dt) {
@@ -1668,8 +1558,6 @@ int do_net_isr(int update_every, usec_t dt) {
1558 return 1;
1559 }
1560
1671 - // --------------------------------------------------------------------
1672 -
1561 if (likely(do_netisr)) {
1562 static RRDSET *st = NULL;
1563 static RRDDIM *rd_dispatched = NULL, *rd_hybrid_dispatched = NULL, *rd_qdrops = NULL, *rd_queued = NULL;
@@ -1695,7 +1583,6 @@ int do_net_isr(int update_every, usec_t dt) {
1583 rd_qdrops = rrddim_add(st, "qdrops", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1584 rd_queued = rrddim_add(st, "queued", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1585 }
1698 - else rrdset_next(st);
1586
1587 rrddim_set_by_pointer(st, rd_dispatched, netisr_stats[number_of_cpus].dispatched);
1588 rrddim_set_by_pointer(st, rd_hybrid_dispatched, netisr_stats[number_of_cpus].hybrid_dispatched);
@@ -1704,8 +1591,6 @@ int do_net_isr(int update_every, usec_t dt) {
1591 rrdset_done(st);
1592 }
1593
1707 - // --------------------------------------------------------------------
1708 -
1594 if (likely(do_netisr_per_core)) {
1595 static struct softnet_chart {
1596 char netisr_cpuid[MAX_INT_DIGITS + 17];
@@ -1752,7 +1637,6 @@ int do_net_isr(int update_every, usec_t dt) {
1637 all_softnet_charts[i].rd_queued = rrddim_add(all_softnet_charts[i].st, "queued",
1638 NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1639 }
1755 - else rrdset_next(all_softnet_charts[i].st);
1640
1641 rrddim_set_by_pointer(all_softnet_charts[i].st, all_softnet_charts[i].rd_dispatched,
1642 netisr_stats[i].dispatched);
@@ -1769,7 +1653,6 @@ int do_net_isr(int update_every, usec_t dt) {
1653 return 0;
1654 }
1655
1772 -// --------------------------------------------------------------------------------------------------------------------
1656 // net.inet.tcp.states
1657
1658 int do_net_inet_tcp_states(int update_every, usec_t dt) {
@@ -1783,9 +1666,6 @@ int do_net_inet_tcp_states(int update_every, usec_t dt) {
1666 error("DISABLED: net.inet.tcp.states module");
1667 return 1;
1668 } else {
1786 -
1787 - // --------------------------------------------------------------------
1788 -
1669 static RRDSET *st = NULL;
1670 static RRDDIM *rd = NULL;
1671
@@ -1806,8 +1686,7 @@ int do_net_inet_tcp_states(int update_every, usec_t dt) {
1686 );
1687
1688 rd = rrddim_add(st, "CurrEstab", "connections", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1809 - } else
1810 - rrdset_next(st);
1689 + }
1690
1691 rrddim_set_by_pointer(st, rd, tcps_states[TCPS_ESTABLISHED]);
1692 rrdset_done(st);
@@ -1816,7 +1695,6 @@ int do_net_inet_tcp_states(int update_every, usec_t dt) {
1695 return 0;
1696 }
1697
1819 -// --------------------------------------------------------------------------------------------------------------------
1698 // net.inet.tcp.stats
1699
1700 int do_net_inet_tcp_stats(int update_every, usec_t dt) {
@@ -1866,9 +1744,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1744 error("DISABLED: net.inet.tcp.stats module");
1745 return 1;
1746 } else {
1869 -
1870 - // --------------------------------------------------------------------
1871 -
1747 if (likely(do_tcp_packets)) {
1748 static RRDSET *st = NULL;
1749 static RRDDIM *rd_in_segs = NULL, *rd_out_segs = NULL;
@@ -1891,16 +1766,13 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1766
1767 rd_in_segs = rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1768 rd_out_segs = rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1894 - } else
1895 - rrdset_next(st);
1769 + }
1770
1771 rrddim_set_by_pointer(st, rd_in_segs, tcpstat.tcps_rcvtotal);
1772 rrddim_set_by_pointer(st, rd_out_segs, tcpstat.tcps_sndtotal);
1773 rrdset_done(st);
1774 }
1775
1902 - // --------------------------------------------------------------------
1903 -
1776 if (likely(do_tcp_errors)) {
1777 static RRDSET *st = NULL;
1778 static RRDDIM *rd_in_errs = NULL, *rd_in_csum_errs = NULL, *rd_retrans_segs = NULL;
@@ -1926,8 +1798,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1798 rd_in_errs = rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1799 rd_in_csum_errs = rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1800 rd_retrans_segs = rrddim_add(st, "RetransSegs", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1929 - } else
1930 - rrdset_next(st);
1801 + }
1802
1803 #if __FreeBSD__ >= 11
1804 rrddim_set_by_pointer(st, rd_in_errs, tcpstat.tcps_rcvbadoff + tcpstat.tcps_rcvreassfull +
@@ -1940,8 +1811,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1811 rrdset_done(st);
1812 }
1813
1943 - // --------------------------------------------------------------------
1944 -
1814 if (likely(do_tcp_handshake)) {
1815 static RRDSET *st = NULL;
1816 static RRDDIM *rd_estab_resets = NULL, *rd_active_opens = NULL, *rd_passive_opens = NULL,
@@ -1969,8 +1838,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1838 rd_active_opens = rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1839 rd_passive_opens = rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1840 rd_attempt_fails = rrddim_add(st, "AttemptFails", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1972 - } else
1973 - rrdset_next(st);
1841 + }
1842
1843 rrddim_set_by_pointer(st, rd_estab_resets, tcpstat.tcps_drops);
1844 rrddim_set_by_pointer(st, rd_active_opens, tcpstat.tcps_connattempt);
@@ -1979,8 +1847,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1847 rrdset_done(st);
1848 }
1849
1982 - // --------------------------------------------------------------------
1983 -
1850 if (do_tcpext_connaborts == CONFIG_BOOLEAN_YES || (do_tcpext_connaborts == CONFIG_BOOLEAN_AUTO &&
1851 (tcpstat.tcps_rcvpackafterwin ||
1852 tcpstat.tcps_rcvafterclose ||
@@ -2016,7 +1882,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1882 rd_on_timeout = rrddim_add(st, "TCPAbortOnTimeout", "timeout", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1883 rd_on_linger = rrddim_add(st, "TCPAbortOnLinger", "linger", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1884 }
2019 - else rrdset_next(st);
1885
1886 rrddim_set_by_pointer(st, rd_on_data, tcpstat.tcps_rcvpackafterwin);
1887 rrddim_set_by_pointer(st, rd_on_close, tcpstat.tcps_rcvafterclose);
@@ -2026,8 +1891,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1891 rrdset_done(st);
1892 }
1893
2029 - // --------------------------------------------------------------------
2030 -
1894 if (do_tcpext_ofo == CONFIG_BOOLEAN_YES || (do_tcpext_ofo == CONFIG_BOOLEAN_AUTO &&
1895 (tcpstat.tcps_rcvoopack ||
1896 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -2054,14 +1917,11 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1917
1918 rd_ofo_queue = rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1919 }
2057 - else rrdset_next(st);
1920
1921 rrddim_set_by_pointer(st, rd_ofo_queue, tcpstat.tcps_rcvoopack);
1922 rrdset_done(st);
1923 }
1924
2063 - // --------------------------------------------------------------------
2064 -
1925 if (do_tcpext_syncookies == CONFIG_BOOLEAN_YES || (do_tcpext_syncookies == CONFIG_BOOLEAN_AUTO &&
1926 (tcpstat.tcps_sc_sendcookie ||
1927 tcpstat.tcps_sc_recvcookie ||
@@ -2092,7 +1952,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1952 rd_send = rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1953 rd_failed = rrddim_add(st, "SyncookiesFailed", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1954 }
2095 - else rrdset_next(st);
1955
1956 rrddim_set_by_pointer(st, rd_recv, tcpstat.tcps_sc_recvcookie);
1957 rrddim_set_by_pointer(st, rd_send, tcpstat.tcps_sc_sendcookie);
@@ -2100,8 +1959,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1959 rrdset_done(st);
1960 }
1961
2103 - // --------------------------------------------------------------------
2104 -
1962 if(do_tcpext_listen == CONFIG_BOOLEAN_YES || (do_tcpext_listen == CONFIG_BOOLEAN_AUTO &&
1963 (tcpstat.tcps_listendrop ||
1964 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -2129,16 +1986,11 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1986
1987 rd_overflows = rrddim_add(st_listen, "ListenOverflows", "overflows", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1988 }
2132 - else
2133 - rrdset_next(st_listen);
1989
1990 rrddim_set_by_pointer(st_listen, rd_overflows, tcpstat.tcps_listendrop);
2136 -
1991 rrdset_done(st_listen);
1992 }
1993
2140 - // --------------------------------------------------------------------
2141 -
1994 if (do_ecn == CONFIG_BOOLEAN_YES || (do_ecn == CONFIG_BOOLEAN_AUTO &&
1995 (tcpstat.tcps_ecn_ce ||
1996 tcpstat.tcps_ecn_ect0 ||
@@ -2172,7 +2024,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
2024 rd_ect0 = rrddim_add(st, "InECT0Pkts", "ECTP0", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2025 rd_ect1 = rrddim_add(st, "InECT1Pkts", "ECTP1", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2026 }
2175 - else rrdset_next(st);
2027
2028 rrddim_set_by_pointer(st, rd_ce, tcpstat.tcps_ecn_ce);
2029 rrddim_set_by_pointer(st, rd_no_ect, tcpstat.tcps_ecn_ce - (tcpstat.tcps_ecn_ect0 +
@@ -2191,7 +2042,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
2042 return 0;
2043 }
2044
2194 -// --------------------------------------------------------------------------------------------------------------------
2045 // net.inet.udp.stats
2046
2047 int do_net_inet_udp_stats(int update_every, usec_t dt) {
@@ -2216,9 +2066,6 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
2066 error("DISABLED: net.inet.udp.stats module");
2067 return 1;
2068 } else {
2219 -
2220 - // --------------------------------------------------------------------
2221 -
2069 if (likely(do_udp_packets)) {
2070 static RRDSET *st = NULL;
2071 static RRDDIM *rd_in = NULL, *rd_out = NULL;
@@ -2241,16 +2088,13 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
2088
2089 rd_in = rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2090 rd_out = rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2244 - } else
2245 - rrdset_next(st);
2091 + }
2092
2093 rrddim_set_by_pointer(st, rd_in, udpstat.udps_ipackets);
2094 rrddim_set_by_pointer(st, rd_out, udpstat.udps_opackets);
2095 rrdset_done(st);
2096 }
2097
2252 - // --------------------------------------------------------------------
2253 -
2098 if (likely(do_udp_errors)) {
2099 static RRDSET *st = NULL;
2100 static RRDDIM *rd_in_errors = NULL, *rd_no_ports = NULL, *rd_recv_buf_errors = NULL,
@@ -2279,8 +2123,7 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
2123 rd_recv_buf_errors = rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2124 rd_in_csum_errors = rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2125 rd_ignored_multi = rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2282 - } else
2283 - rrdset_next(st);
2126 + }
2127
2128 rrddim_set_by_pointer(st, rd_in_errors, udpstat.udps_hdrops + udpstat.udps_badlen);
2129 rrddim_set_by_pointer(st, rd_no_ports, udpstat.udps_noport);
@@ -2298,7 +2141,6 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
2141 return 0;
2142 }
2143
2301 -// --------------------------------------------------------------------------------------------------------------------
2144 // net.inet.icmp.stats
2145
2146 int do_net_inet_icmp_stats(int update_every, usec_t dt) {
@@ -2337,8 +2179,6 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2179 }
2180 icmp_total.msgs_in += icmpstat.icps_badcode + icmpstat.icps_badlen + icmpstat.icps_checksum + icmpstat.icps_tooshort;
2181
2340 - // --------------------------------------------------------------------
2341 -
2182 if (likely(do_icmp_packets)) {
2183 static RRDSET *st = NULL;
2184 static RRDDIM *rd_in = NULL, *rd_out = NULL;
@@ -2361,17 +2201,13 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2201
2202 rd_in = rrddim_add(st, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2203 rd_out = rrddim_add(st, "OutMsgs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2364 - } else
2365 - rrdset_next(st);
2204 + }
2205
2206 rrddim_set_by_pointer(st, rd_in, icmp_total.msgs_in);
2207 rrddim_set_by_pointer(st, rd_out, icmp_total.msgs_out);
2369 -
2208 rrdset_done(st);
2209 }
2210
2373 - // --------------------------------------------------------------------
2374 -
2211 if (likely(do_icmp_errors)) {
2212 static RRDSET *st = NULL;
2213 static RRDDIM *rd_in = NULL, *rd_out = NULL, *rd_in_csum = NULL;
@@ -2395,8 +2231,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2231 rd_in = rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2232 rd_out = rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2233 rd_in_csum = rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2398 - } else
2399 - rrdset_next(st);
2234 + }
2235
2236 rrddim_set_by_pointer(st, rd_in, icmpstat.icps_badcode + icmpstat.icps_badlen +
2237 icmpstat.icps_checksum + icmpstat.icps_tooshort);
@@ -2406,8 +2241,6 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2241 rrdset_done(st);
2242 }
2243
2409 - // --------------------------------------------------------------------
2410 -
2244 if (likely(do_icmpmsg)) {
2245 static RRDSET *st = NULL;
2246 static RRDDIM *rd_in_reps = NULL, *rd_out_reps = NULL, *rd_in = NULL, *rd_out = NULL;
@@ -2432,14 +2265,12 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2265 rd_out_reps = rrddim_add(st, "OutEchoReps", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2266 rd_in = rrddim_add(st, "InEchos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2267 rd_out = rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2435 - } else
2436 - rrdset_next(st);
2268 + }
2269
2270 rrddim_set_by_pointer(st, rd_in_reps, icmpstat.icps_inhist[ICMP_ECHOREPLY]);
2271 rrddim_set_by_pointer(st, rd_out_reps, icmpstat.icps_outhist[ICMP_ECHOREPLY]);
2272 rrddim_set_by_pointer(st, rd_in, icmpstat.icps_inhist[ICMP_ECHO]);
2273 rrddim_set_by_pointer(st, rd_out, icmpstat.icps_outhist[ICMP_ECHO]);
2442 -
2274 rrdset_done(st);
2275 }
2276 }
@@ -2451,7 +2282,6 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2282 return 0;
2283 }
2284
2454 -// --------------------------------------------------------------------------------------------------------------------
2285 // net.inet.ip.stats
2286
2287 int do_net_inet_ip_stats(int update_every, usec_t dt) {
@@ -2482,9 +2312,6 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2312 error("DISABLED: net.inet.ip.stats module");
2313 return 1;
2314 } else {
2485 -
2486 - // --------------------------------------------------------------------
2487 -
2315 if (likely(do_ip_packets)) {
2316 static RRDSET *st = NULL;
2317 static RRDDIM *rd_in_receives = NULL, *rd_out_requests = NULL, *rd_forward_datagrams = NULL,
@@ -2510,8 +2337,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2337 rd_out_requests = rrddim_add(st, "OutRequests", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2338 rd_forward_datagrams = rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2339 rd_in_delivers = rrddim_add(st, "InDelivers", "delivered", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2513 - } else
2514 - rrdset_next(st);
2340 + }
2341
2342 rrddim_set_by_pointer(st, rd_in_receives, ipstat.ips_total);
2343 rrddim_set_by_pointer(st, rd_out_requests, ipstat.ips_localout);
@@ -2520,8 +2346,6 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2346 rrdset_done(st);
2347 }
2348
2523 - // --------------------------------------------------------------------
2524 -
2349 if (likely(do_ip_fragsout)) {
2350 static RRDSET *st = NULL;
2351 static RRDDIM *rd_ok = NULL, *rd_fails = NULL, *rd_created = NULL;
@@ -2547,8 +2371,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2371 rd_ok = rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2372 rd_fails = rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2373 rd_created = rrddim_add(st, "FragCreates", "created", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2550 - } else
2551 - rrdset_next(st);
2374 + }
2375
2376 rrddim_set_by_pointer(st, rd_ok, ipstat.ips_fragmented);
2377 rrddim_set_by_pointer(st, rd_fails, ipstat.ips_cantfrag);
@@ -2556,8 +2379,6 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2379 rrdset_done(st);
2380 }
2381
2559 - // --------------------------------------------------------------------
2560 -
2382 if (likely(do_ip_fragsin)) {
2383 static RRDSET *st = NULL;
2384 static RRDDIM *rd_ok = NULL, *rd_failed = NULL, *rd_all = NULL;
@@ -2583,8 +2404,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2404 rd_ok = rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2405 rd_failed = rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2406 rd_all = rrddim_add(st, "ReasmReqds", "all", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2586 - } else
2587 - rrdset_next(st);
2407 + }
2408
2409 rrddim_set_by_pointer(st, rd_ok, ipstat.ips_fragments);
2410 rrddim_set_by_pointer(st, rd_failed, ipstat.ips_fragdropped);
@@ -2592,8 +2412,6 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2412 rrdset_done(st);
2413 }
2414
2595 - // --------------------------------------------------------------------
2596 -
2415 if (likely(do_ip_errors)) {
2416 static RRDSET *st = NULL;
2417 static RRDDIM *rd_in_discards = NULL, *rd_out_discards = NULL,
@@ -2624,8 +2442,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2442 rd_out_no_routes = rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2443 rd_in_addr_errors = rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2444 rd_in_unknown_protos = rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2627 - } else
2628 - rrdset_next(st);
2445 + }
2446
2447 rrddim_set_by_pointer(st, rd_in_discards, ipstat.ips_badsum + ipstat.ips_tooshort +
2448 ipstat.ips_toosmall + ipstat.ips_toolong);
@@ -2646,7 +2463,6 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2463 return 0;
2464 }
2465
2649 -// --------------------------------------------------------------------------------------------------------------------
2466 // net.inet6.ip6.stats
2467
2468 int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
@@ -2680,9 +2496,6 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2496 error("DISABLED: net.inet6.ip6.stats module");
2497 return 1;
2498 } else {
2683 -
2684 - // --------------------------------------------------------------------
2685 -
2499 if (do_ip6_packets == CONFIG_BOOLEAN_YES || (do_ip6_packets == CONFIG_BOOLEAN_AUTO &&
2500 (ip6stat.ip6s_localout ||
2501 ip6stat.ip6s_total ||
@@ -2714,8 +2527,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2527 rd_sent = rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2528 rd_forwarded = rrddim_add(st, "forwarded", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2529 rd_delivers = rrddim_add(st, "delivers", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2717 - } else
2718 - rrdset_next(st);
2530 + }
2531
2532 rrddim_set_by_pointer(st, rd_sent, ip6stat.ip6s_localout);
2533 rrddim_set_by_pointer(st, rd_received, ip6stat.ip6s_total);
@@ -2724,8 +2536,6 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2536 rrdset_done(st);
2537 }
2538
2727 - // --------------------------------------------------------------------
2728 -
2539 if (do_ip6_fragsout == CONFIG_BOOLEAN_YES || (do_ip6_fragsout == CONFIG_BOOLEAN_AUTO &&
2540 (ip6stat.ip6s_fragmented ||
2541 ip6stat.ip6s_cantfrag ||
@@ -2757,8 +2567,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2567 rd_ok = rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2568 rd_failed = rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2569 rd_all = rrddim_add(st, "all", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2760 - } else
2761 - rrdset_next(st);
2570 + }
2571
2572 rrddim_set_by_pointer(st, rd_ok, ip6stat.ip6s_fragmented);
2573 rrddim_set_by_pointer(st, rd_failed, ip6stat.ip6s_cantfrag);
@@ -2766,8 +2575,6 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2575 rrdset_done(st);
2576 }
2577
2769 - // --------------------------------------------------------------------
2770 -
2578 if (do_ip6_fragsin == CONFIG_BOOLEAN_YES || (do_ip6_fragsin == CONFIG_BOOLEAN_AUTO &&
2579 (ip6stat.ip6s_reassembled ||
2580 ip6stat.ip6s_fragdropped ||
@@ -2801,8 +2608,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2608 rd_failed = rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2609 rd_timeout = rrddim_add(st, "timeout", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2610 rd_all = rrddim_add(st, "all", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2804 - } else
2805 - rrdset_next(st);
2611 + }
2612
2613 rrddim_set_by_pointer(st, rd_ok, ip6stat.ip6s_reassembled);
2614 rrddim_set_by_pointer(st, rd_failed, ip6stat.ip6s_fragdropped);
@@ -2811,8 +2617,6 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2617 rrdset_done(st);
2618 }
2619
2814 - // --------------------------------------------------------------------
2815 -
2620 if (do_ip6_errors == CONFIG_BOOLEAN_YES || (do_ip6_errors == CONFIG_BOOLEAN_AUTO &&
2621 (ip6stat.ip6s_toosmall ||
2622 ip6stat.ip6s_odropped ||
@@ -2856,8 +2660,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2660 rd_in_truncated_pkts = rrddim_add(st, "InTruncatedPkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2661 rd_in_no_routes = rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2662 rd_out_no_routes = rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2859 - } else
2860 - rrdset_next(st);
2663 + }
2664
2665 rrddim_set_by_pointer(st, rd_in_discards, ip6stat.ip6s_toosmall);
2666 rrddim_set_by_pointer(st, rd_out_discards, ip6stat.ip6s_odropped);
@@ -2878,7 +2681,6 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2681 return 0;
2682 }
2683
2881 -// --------------------------------------------------------------------------------------------------------------------
2684 // net.inet6.icmp6.stats
2685
2686 int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
@@ -2966,17 +2768,13 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2768
2769 rd_received = rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2770 rd_sent = rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2969 - } else
2970 - rrdset_next(st);
2771 + }
2772
2773 rrddim_set_by_pointer(st, rd_received, icmp6_total.msgs_out);
2774 rrddim_set_by_pointer(st, rd_sent, icmp6_total.msgs_in);
2974 -
2775 rrdset_done(st);
2776 }
2777
2978 - // --------------------------------------------------------------------
2979 -
2778 if (do_icmp6_redir == CONFIG_BOOLEAN_YES || (do_icmp6_redir == CONFIG_BOOLEAN_AUTO &&
2779 (icmp6stat.icp6s_inhist[ND_REDIRECT] ||
2780 icmp6stat.icp6s_outhist[ND_REDIRECT] ||
@@ -3004,16 +2802,13 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2802
2803 rd_received = rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2804 rd_sent = rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3007 - } else
3008 - rrdset_next(st);
2805 + }
2806
2807 rrddim_set_by_pointer(st, rd_received, icmp6stat.icp6s_outhist[ND_REDIRECT]);
2808 rrddim_set_by_pointer(st, rd_sent, icmp6stat.icp6s_inhist[ND_REDIRECT]);
2809 rrdset_done(st);
2810 }
2811
3015 - // --------------------------------------------------------------------
3016 -
2812 if (do_icmp6_errors == CONFIG_BOOLEAN_YES || (do_icmp6_errors == CONFIG_BOOLEAN_AUTO &&
2813 (icmp6stat.icp6s_badcode ||
2814 icmp6stat.icp6s_badlen ||
@@ -3060,8 +2855,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2855 rd_out_dest_unreachs = rrddim_add(st, "OutDestUnreachs", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2856 rd_out_time_excds = rrddim_add(st, "OutTimeExcds", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2857 rd_out_parm_problems = rrddim_add(st, "OutParmProblems", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3063 - } else
3064 - rrdset_next(st);
2858 + }
2859
2860 rrddim_set_by_pointer(st, rd_in_errors, icmp6stat.icp6s_badcode + icmp6stat.icp6s_badlen +
2861 icmp6stat.icp6s_checksum + icmp6stat.icp6s_tooshort);
@@ -3077,8 +2871,6 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2871 rrdset_done(st);
2872 }
2873
3080 - // --------------------------------------------------------------------
3081 -
2874 if (do_icmp6_echos == CONFIG_BOOLEAN_YES || (do_icmp6_echos == CONFIG_BOOLEAN_AUTO &&
2875 (icmp6stat.icp6s_inhist[ICMP6_ECHO_REQUEST] ||
2876 icmp6stat.icp6s_outhist[ICMP6_ECHO_REQUEST] ||
@@ -3110,8 +2902,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2902 rd_out = rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2903 rd_in_replies = rrddim_add(st, "InEchoReplies", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2904 rd_out_replies = rrddim_add(st, "OutEchoReplies", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3113 - } else
3114 - rrdset_next(st);
2905 + }
2906
2907 rrddim_set_by_pointer(st, rd_in, icmp6stat.icp6s_inhist[ICMP6_ECHO_REQUEST]);
2908 rrddim_set_by_pointer(st, rd_out, icmp6stat.icp6s_outhist[ICMP6_ECHO_REQUEST]);
@@ -3120,8 +2911,6 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2911 rrdset_done(st);
2912 }
2913
3123 - // --------------------------------------------------------------------
3124 -
2914 if (do_icmp6_router == CONFIG_BOOLEAN_YES || (do_icmp6_router == CONFIG_BOOLEAN_AUTO &&
2915 (icmp6stat.icp6s_inhist[ND_ROUTER_SOLICIT] ||
2916 icmp6stat.icp6s_outhist[ND_ROUTER_SOLICIT] ||
@@ -3154,8 +2943,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2943 rd_out_solicits = rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2944 rd_in_advertisements = rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2945 rd_out_advertisements = rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3157 - } else
3158 - rrdset_next(st);
2946 + }
2947
2948 rrddim_set_by_pointer(st, rd_in_solicits, icmp6stat.icp6s_inhist[ND_ROUTER_SOLICIT]);
2949 rrddim_set_by_pointer(st, rd_out_solicits, icmp6stat.icp6s_outhist[ND_ROUTER_SOLICIT]);
@@ -3164,8 +2952,6 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2952 rrdset_done(st);
2953 }
2954
3167 - // --------------------------------------------------------------------
3168 -
2955 if (do_icmp6_neighbor == CONFIG_BOOLEAN_YES || (do_icmp6_neighbor == CONFIG_BOOLEAN_AUTO &&
2956 (icmp6stat.icp6s_inhist[ND_NEIGHBOR_SOLICIT] ||
2957 icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT] ||
@@ -3198,8 +2984,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2984 rd_out_solicits = rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2985 rd_in_advertisements = rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2986 rd_out_advertisements = rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3201 - } else
3202 - rrdset_next(st);
2987 + }
2988
2989 rrddim_set_by_pointer(st, rd_in_solicits, icmp6stat.icp6s_inhist[ND_NEIGHBOR_SOLICIT]);
2990 rrddim_set_by_pointer(st, rd_out_solicits, icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT]);
@@ -3208,8 +2993,6 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2993 rrdset_done(st);
2994 }
2995
3211 - // --------------------------------------------------------------------
3212 -
2996 if (do_icmp6_types == CONFIG_BOOLEAN_YES || (do_icmp6_types == CONFIG_BOOLEAN_AUTO &&
2997 (icmp6stat.icp6s_inhist[1] ||
2998 icmp6stat.icp6s_inhist[128] ||
@@ -3255,8 +3038,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
3038 rd_out_133 = rrddim_add(st, "OutType133", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3039 rd_out_135 = rrddim_add(st, "OutType135", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3040 rd_out_143 = rrddim_add(st, "OutType143", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3258 - } else
3259 - rrdset_next(st);
3041 + }
3042
3043 rrddim_set_by_pointer(st, rd_in_1, icmp6stat.icp6s_inhist[1]);
3044 rrddim_set_by_pointer(st, rd_in_128, icmp6stat.icp6s_inhist[128]);
collectors/idlejitter.plugin/plugin_idlejitter.c
+2 -8
@@ -47,18 +47,15 @@ void *cpuidlejitter_main(void *ptr) {
47
48 usec_t update_every_ut = localhost->rrd_update_every * USEC_PER_SEC;
49 struct timeval before, after;
50 - unsigned long long counter;
50
52 - for(counter = 0; 1 ;counter++) {
51 + while (!netdata_exit) {
52 int iterations = 0;
53 usec_t error_total = 0,
54 error_min = 0,
55 error_max = 0,
56 elapsed = 0;
57
59 - if(netdata_exit) break;
60 -
61 - while(elapsed < update_every_ut) {
58 + while (elapsed < update_every_ut) {
59 now_monotonic_high_precision_timeval(&before);
60 worker_is_idle();
61 sleep_usec(sleep_ut);
@@ -82,10 +79,7 @@ void *cpuidlejitter_main(void *ptr) {
79 iterations++;
80 }
81
85 - if(netdata_exit) break;
86 -
82 if(iterations) {
88 - if (likely(counter)) rrdset_next(st);
83 rrddim_set_by_pointer(st, rd_min, error_min);
84 rrddim_set_by_pointer(st, rd_max, error_max);
85 rrddim_set_by_pointer(st, rd_avg, error_total / iterations);
collectors/macos.plugin/macos_fw.c
+2 -44
@@ -168,14 +168,11 @@ int do_macos_iokit(int update_every, usec_t dt) {
168 rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
169 rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
170 }
171 - else rrdset_next(st);
171
172 prev_diskstat.bytes_read = rrddim_set(st, "reads", diskstat.bytes_read);
173 prev_diskstat.bytes_write = rrddim_set(st, "writes", diskstat.bytes_write);
174 rrdset_done(st);
175
177 - // --------------------------------------------------------------------
178 -
176 /* Get number of reads. */
177 if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsReadsKey)))) {
178 CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.reads);
@@ -207,14 +204,11 @@ int do_macos_iokit(int update_every, usec_t dt) {
204 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
205 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
206 }
210 - else rrdset_next(st);
207
208 prev_diskstat.operations_read = rrddim_set(st, "reads", diskstat.reads);
209 prev_diskstat.operations_write = rrddim_set(st, "writes", diskstat.writes);
210 rrdset_done(st);
211
216 - // --------------------------------------------------------------------
217 -
212 /* Get reads time. */
213 if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsTotalReadTimeKey)))) {
214 CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.time_read);
@@ -245,14 +239,11 @@ int do_macos_iokit(int update_every, usec_t dt) {
239
240 rrddim_add(st, "utilization", NULL, 1, 10000000, RRD_ALGORITHM_INCREMENTAL);
241 }
248 - else rrdset_next(st);
242
243 cur_diskstat.busy_time_ns = (diskstat.time_read + diskstat.time_write);
244 prev_diskstat.busy_time_ns = rrddim_set(st, "utilization", cur_diskstat.busy_time_ns);
245 rrdset_done(st);
246
254 - // --------------------------------------------------------------------
255 -
247 /* Get reads latency. */
248 if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsLatentReadTimeKey)))) {
249 CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.latency_read);
@@ -284,7 +275,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
275 rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_INCREMENTAL);
276 rrddim_add(st, "writes", NULL, -1, 1000000, RRD_ALGORITHM_INCREMENTAL);
277 }
287 - else rrdset_next(st);
278
279 cur_diskstat.duration_read_ns = diskstat.time_read + diskstat.latency_read;
280 cur_diskstat.duration_write_ns = diskstat.time_write + diskstat.latency_write;
@@ -292,14 +282,10 @@ int do_macos_iokit(int update_every, usec_t dt) {
282 prev_diskstat.duration_write_ns = rrddim_set(st, "writes", cur_diskstat.duration_write_ns);
283 rrdset_done(st);
284
295 - // --------------------------------------------------------------------
285 // calculate differential charts
286 // only if this is not the first time we run
287
288 if (likely(dt)) {
300 -
301 - // --------------------------------------------------------------------
302 -
289 st = rrdset_find_active_bytype_localhost("disk_await", diskstat.name);
290 if (unlikely(!st)) {
291 st = rrdset_create_localhost(
@@ -321,7 +307,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
307 rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
308 rrddim_add(st, "writes", NULL, -1, 1000000, RRD_ALGORITHM_ABSOLUTE);
309 }
324 - else rrdset_next(st);
310
311 rrddim_set(st, "reads", (diskstat.reads - prev_diskstat.operations_read) ?
312 (cur_diskstat.duration_read_ns - prev_diskstat.duration_read_ns) / (diskstat.reads - prev_diskstat.operations_read) : 0);
@@ -329,8 +314,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
314 (cur_diskstat.duration_write_ns - prev_diskstat.duration_write_ns) / (diskstat.writes - prev_diskstat.operations_write) : 0);
315 rrdset_done(st);
316
332 - // --------------------------------------------------------------------
333 -
317 st = rrdset_find_active_bytype_localhost("disk_avgsz", diskstat.name);
318 if (unlikely(!st)) {
319 st = rrdset_create_localhost(
@@ -352,7 +335,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
335 rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
336 rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_ABSOLUTE);
337 }
355 - else rrdset_next(st);
338
339 rrddim_set(st, "reads", (diskstat.reads - prev_diskstat.operations_read) ?
340 (diskstat.bytes_read - prev_diskstat.bytes_read) / (diskstat.reads - prev_diskstat.operations_read) : 0);
@@ -360,8 +342,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
342 (diskstat.bytes_write - prev_diskstat.bytes_write) / (diskstat.writes - prev_diskstat.operations_write) : 0);
343 rrdset_done(st);
344
363 - // --------------------------------------------------------------------
364 -
345 st = rrdset_find_active_bytype_localhost("disk_svctm", diskstat.name);
346 if (unlikely(!st)) {
347 st = rrdset_create_localhost(
@@ -382,7 +362,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
362
363 rrddim_add(st, "svctm", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
364 }
385 - else rrdset_next(st);
365
366 rrddim_set(st, "svctm", ((diskstat.reads - prev_diskstat.operations_read) + (diskstat.writes - prev_diskstat.operations_write)) ?
367 (cur_diskstat.busy_time_ns - prev_diskstat.busy_time_ns) / ((diskstat.reads - prev_diskstat.operations_read) + (diskstat.writes - prev_diskstat.operations_write)) : 0);
@@ -423,7 +402,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
402 rrddim_add(st, "in", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
403 rrddim_add(st, "out", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
404 }
426 - else rrdset_next(st);
405
406 rrddim_set(st, "in", total_disk_reads);
407 rrddim_set(st, "out", total_disk_writes);
@@ -431,7 +409,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
409 }
410
411 // Can be merged with FreeBSD plugin
434 - // --------------------------------------------------------------------------
412
413 if (likely(do_space || do_inodes)) {
414 // there is no mount info in sysctl MIBs
@@ -477,8 +454,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
454 rrddim_add(st, "avail", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
455 rrddim_add(st, "used", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
456 rrddim_add(st, "reserved_for_root", "reserved for root", mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
480 - } else
481 - rrdset_next(st);
457 + }
458
459 rrddim_set(st, "avail", (collected_number) mntbuf[i].f_bavail);
460 rrddim_set(st, "used", (collected_number) (mntbuf[i].f_blocks - mntbuf[i].f_bfree));
@@ -510,8 +486,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
486 rrddim_add(st, "avail", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
487 rrddim_add(st, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
488 rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRD_ALGORITHM_ABSOLUTE);
513 - } else
514 - rrdset_next(st);
489 + }
490
491 rrddim_set(st, "avail", (collected_number) mntbuf[i].f_ffree);
492 rrddim_set(st, "used", (collected_number) (mntbuf[i].f_files - mntbuf[i].f_ffree));
@@ -522,7 +497,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
497 }
498
499 // Can be merged with FreeBSD plugin
525 - // --------------------------------------------------------------------
500
501 if (likely(do_bandwidth)) {
502 if (unlikely(getifaddrs(&ifap))) {
@@ -534,8 +508,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
508 if (ifa->ifa_addr->sa_family != AF_LINK)
509 continue;
510
537 - // --------------------------------------------------------------------
538 -
511 st = rrdset_find_active_bytype_localhost("net", ifa->ifa_name);
512 if (unlikely(!st)) {
513 st = rrdset_create_localhost(
@@ -556,14 +528,11 @@ int do_macos_iokit(int update_every, usec_t dt) {
528 rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
529 rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
530 }
559 - else rrdset_next(st);
531
532 rrddim_set(st, "received", IFA_DATA(ibytes));
533 rrddim_set(st, "sent", IFA_DATA(obytes));
534 rrdset_done(st);
535
565 - // --------------------------------------------------------------------
566 -
536 st = rrdset_find_active_bytype_localhost("net_packets", ifa->ifa_name);
537 if (unlikely(!st)) {
538 st = rrdset_create_localhost(
@@ -587,7 +556,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
556 rrddim_add(st, "multicast_received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
557 rrddim_add(st, "multicast_sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
558 }
590 - else rrdset_next(st);
559
560 rrddim_set(st, "received", IFA_DATA(ipackets));
561 rrddim_set(st, "sent", IFA_DATA(opackets));
@@ -595,8 +563,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
563 rrddim_set(st, "multicast_sent", IFA_DATA(omcasts));
564 rrdset_done(st);
565
598 - // --------------------------------------------------------------------
599 -
566 st = rrdset_find_active_bytype_localhost("net_errors", ifa->ifa_name);
567 if (unlikely(!st)) {
568 st = rrdset_create_localhost(
@@ -618,14 +584,11 @@ int do_macos_iokit(int update_every, usec_t dt) {
584 rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
585 rrddim_add(st, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
586 }
621 - else rrdset_next(st);
587
588 rrddim_set(st, "inbound", IFA_DATA(ierrors));
589 rrddim_set(st, "outbound", IFA_DATA(oerrors));
590 rrdset_done(st);
591
627 - // --------------------------------------------------------------------
628 -
592 st = rrdset_find_active_bytype_localhost("net_drops", ifa->ifa_name);
593 if (unlikely(!st)) {
594 st = rrdset_create_localhost(
@@ -646,13 +609,10 @@ int do_macos_iokit(int update_every, usec_t dt) {
609
610 rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
611 }
649 - else rrdset_next(st);
612
613 rrddim_set(st, "inbound", IFA_DATA(iqdrops));
614 rrdset_done(st);
615
654 - // --------------------------------------------------------------------
655 -
616 st = rrdset_find_active_bytype_localhost("net_events", ifa->ifa_name);
617 if (unlikely(!st)) {
618 st = rrdset_create_localhost(
@@ -675,7 +635,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
635 rrddim_add(st, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
636 rrddim_add(st, "carrier", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
637 }
678 - else rrdset_next(st);
638
639 rrddim_set(st, "collisions", IFA_DATA(collisions));
640 rrdset_done(st);
@@ -685,6 +644,5 @@ int do_macos_iokit(int update_every, usec_t dt) {
644 }
645 }
646
688 -
647 return 0;
648 }
collectors/macos.plugin/macos_mach_smi.c
+1 -15
@@ -39,8 +39,6 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
39 if (unlikely(kr != KERN_SUCCESS))
40 return -1;
41
42 - // --------------------------------------------------------------------
43 -
42 if (likely(do_cpu)) {
43 if (unlikely(HOST_CPU_LOAD_INFO_COUNT != 4)) {
44 error("MACOS: There are %d CPU states (4 was expected)", HOST_CPU_LOAD_INFO_COUNT);
@@ -78,7 +76,6 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
76 rrddim_add(st, "idle", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
77 rrddim_hide(st, "idle");
78 }
81 - else rrdset_next(st);
79
80 rrddim_set(st, "user", cp_time[CPU_STATE_USER]);
81 rrddim_set(st, "nice", cp_time[CPU_STATE_NICE]);
@@ -87,9 +84,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
84 rrdset_done(st);
85 }
86 }
90 - }
91 -
92 - // --------------------------------------------------------------------
87 + }
88
89 if (likely(do_ram || do_swapio || do_pgfaults)) {
90 #if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
@@ -137,7 +132,6 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
132 rrddim_add(st, "speculative", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
133 rrddim_add(st, "free", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
134 }
140 - else rrdset_next(st);
135
136 rrddim_set(st, "active", vm_statistics.active_count);
137 rrddim_set(st, "wired", vm_statistics.wire_count);
@@ -153,8 +147,6 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
147 }
148
149 #if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
156 - // --------------------------------------------------------------------
157 -
150 if (likely(do_swapio)) {
151 st = rrdset_find_active_localhost("system.swapio");
152 if (unlikely(!st)) {
@@ -176,7 +168,6 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
168 rrddim_add(st, "in", NULL, system_pagesize, 1024, RRD_ALGORITHM_INCREMENTAL);
169 rrddim_add(st, "out", NULL, -system_pagesize, 1024, RRD_ALGORITHM_INCREMENTAL);
170 }
179 - else rrdset_next(st);
171
172 rrddim_set(st, "in", vm_statistics.swapins);
173 rrddim_set(st, "out", vm_statistics.swapouts);
@@ -184,8 +175,6 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
175 }
176 #endif
177
187 - // --------------------------------------------------------------------
188 -
178 if (likely(do_pgfaults)) {
179 st = rrdset_find_active_localhost("mem.pgfaults");
180 if (unlikely(!st)) {
@@ -217,7 +206,6 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
206 rrddim_add(st, "reactivate", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
207 rrddim_add(st, "purge", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
208 }
220 - else rrdset_next(st);
209
210 rrddim_set(st, "memory", vm_statistics.faults);
211 rrddim_set(st, "cow", vm_statistics.cow_faults);
@@ -235,7 +223,5 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
223 }
224 }
225
238 - // --------------------------------------------------------------------
239 -
226 return 0;
227 }
collectors/macos.plugin/macos_sysctl.c
+27 -126
@@ -218,8 +218,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
218 // NEEDED BY: do_uptime
219 struct timespec boot_time, cur_time;
220
221 - // --------------------------------------------------------------------
222 -
221 if (next_loadavg_dt <= dt) {
222 if (likely(do_loadavg)) {
223 if (unlikely(GETSYSCTL_BY_NAME("vm.loadavg", sysload))) {
@@ -247,7 +245,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
245 rrddim_add(st, "load5", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
246 rrddim_add(st, "load15", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
247 }
250 - else rrdset_next(st);
248
249 rrddim_set(st, "load1", (collected_number) ((double)sysload.ldavg[0] / sysload.fscale * 1000));
250 rrddim_set(st, "load5", (collected_number) ((double)sysload.ldavg[1] / sysload.fscale * 1000));
@@ -260,8 +257,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
257 }
258 else next_loadavg_dt -= dt;
259
263 - // --------------------------------------------------------------------
264 -
260 if (likely(do_swap)) {
261 if (unlikely(GETSYSCTL_BY_NAME("vm.swapusage", swap_usage))) {
262 do_swap = 0;
@@ -288,7 +283,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
283 rrddim_add(st, "free", NULL, 1, 1048576, RRD_ALGORITHM_ABSOLUTE);
284 rrddim_add(st, "used", NULL, 1, 1048576, RRD_ALGORITHM_ABSOLUTE);
285 }
291 - else rrdset_next(st);
286
287 rrddim_set(st, "free", swap_usage.xsu_avail);
288 rrddim_set(st, "used", swap_usage.xsu_used);
@@ -296,8 +290,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
290 }
291 }
292
299 - // --------------------------------------------------------------------
300 -
293 if (likely(do_bandwidth)) {
294 mib[0] = CTL_NET;
295 mib[1] = PF_ROUTE;
@@ -349,7 +341,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
341 rrddim_add(st, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
342 rrddim_add(st, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
343 }
352 - else rrdset_next(st);
344
345 rrddim_set(st, "InOctets", iftot.ift_ibytes);
346 rrddim_set(st, "OutOctets", iftot.ift_obytes);
@@ -358,8 +349,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
349 }
350 }
351
361 - // --------------------------------------------------------------------
362 -
352 // see http://net-snmp.sourceforge.net/docs/mibs/tcp.html
353 if (likely(do_tcp_packets || do_tcp_errors || do_tcp_handshake || do_tcpext_connaborts || do_tcpext_ofo || do_tcpext_syscookies || do_ecn)) {
354 if (unlikely(GETSYSCTL_BY_NAME("net.inet.tcp.stats", tcpstat))){
@@ -398,16 +387,13 @@ int do_macos_sysctl(int update_every, usec_t dt) {
387
388 rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
389 rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
401 - } else
402 - rrdset_next(st);
390 + }
391
392 rrddim_set(st, "InSegs", tcpstat.tcps_rcvtotal);
393 rrddim_set(st, "OutSegs", tcpstat.tcps_sndtotal);
394 rrdset_done(st);
395 }
396
409 - // --------------------------------------------------------------------
410 -
397 if (likely(do_tcp_errors)) {
398 st = rrdset_find_active_localhost("ipv4.tcperrors");
399 if (unlikely(!st)) {
@@ -430,8 +416,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
416 rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
417 rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
418 rrddim_add(st, "RetransSegs", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
433 - } else
434 - rrdset_next(st);
419 + }
420
421 rrddim_set(st, "InErrs", tcpstat.tcps_rcvbadoff + tcpstat.tcps_rcvshort);
422 rrddim_set(st, "InCsumErrors", tcpstat.tcps_rcvbadsum);
@@ -439,8 +424,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
424 rrdset_done(st);
425 }
426
442 - // --------------------------------------------------------------------
443 -
427 if (likely(do_tcp_handshake)) {
428 st = rrdset_find_active_localhost("ipv4.tcphandshake");
429 if (unlikely(!st)) {
@@ -464,8 +447,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
447 rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
448 rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
449 rrddim_add(st, "AttemptFails", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
467 - } else
468 - rrdset_next(st);
450 + }
451
452 rrddim_set(st, "EstabResets", tcpstat.tcps_drops);
453 rrddim_set(st, "ActiveOpens", tcpstat.tcps_connattempt);
@@ -474,8 +456,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
456 rrdset_done(st);
457 }
458
477 - // --------------------------------------------------------------------
478 -
459 if (do_tcpext_connaborts == CONFIG_BOOLEAN_YES || (do_tcpext_connaborts == CONFIG_BOOLEAN_AUTO &&
460 (tcpstat.tcps_rcvpackafterwin ||
461 tcpstat.tcps_rcvafterclose ||
@@ -505,7 +485,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
485 rrddim_add(st, "TCPAbortOnMemory", "nomemory", 1, 1, RRD_ALGORITHM_INCREMENTAL);
486 rrddim_add(st, "TCPAbortOnTimeout", "timeout", 1, 1, RRD_ALGORITHM_INCREMENTAL);
487 }
508 - else rrdset_next(st);
488
489 rrddim_set(st, "TCPAbortOnData", tcpstat.tcps_rcvpackafterwin);
490 rrddim_set(st, "TCPAbortOnClose", tcpstat.tcps_rcvafterclose);
@@ -514,8 +493,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
493 rrdset_done(st);
494 }
495
517 - // --------------------------------------------------------------------
518 -
496 if (do_tcpext_ofo == CONFIG_BOOLEAN_YES || (do_tcpext_ofo == CONFIG_BOOLEAN_AUTO &&
497 (tcpstat.tcps_rcvoopack ||
498 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -539,14 +516,11 @@ int do_macos_sysctl(int update_every, usec_t dt) {
516
517 rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRD_ALGORITHM_INCREMENTAL);
518 }
542 - else rrdset_next(st);
519
520 rrddim_set(st, "TCPOFOQueue", tcpstat.tcps_rcvoopack);
521 rrdset_done(st);
522 }
523
548 - // --------------------------------------------------------------------
549 -
524 if (do_tcpext_syscookies == CONFIG_BOOLEAN_YES || (do_tcpext_syscookies == CONFIG_BOOLEAN_AUTO &&
525 (tcpstat.tcps_sc_sendcookie ||
526 tcpstat.tcps_sc_recvcookie ||
@@ -575,7 +549,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
549 rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
550 rrddim_add(st, "SyncookiesFailed", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
551 }
578 - else rrdset_next(st);
552
553 rrddim_set(st, "SyncookiesRecv", tcpstat.tcps_sc_recvcookie);
554 rrddim_set(st, "SyncookiesSent", tcpstat.tcps_sc_sendcookie);
@@ -583,9 +556,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
556 rrdset_done(st);
557 }
558
586 - // --------------------------------------------------------------------
587 -
588 -
559 #if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
560 if (do_ecn == CONFIG_BOOLEAN_YES || (do_ecn == CONFIG_BOOLEAN_AUTO &&
561 (tcpstat.tcps_ecn_recv_ce ||
@@ -613,7 +583,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
583 rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
584 rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRD_ALGORITHM_INCREMENTAL);
585 }
616 - else rrdset_next(st);
586
587 rrddim_set(st, "InCEPkts", tcpstat.tcps_ecn_recv_ce);
588 rrddim_set(st, "InNoECTPkts", tcpstat.tcps_ecn_not_supported);
@@ -624,8 +593,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
593 }
594 }
595
627 - // --------------------------------------------------------------------
628 -
596 // see http://net-snmp.sourceforge.net/docs/mibs/udp.html
597 if (likely(do_udp_packets || do_udp_errors)) {
598 if (unlikely(GETSYSCTL_BY_NAME("net.inet.udp.stats", udpstat))) {
@@ -654,16 +621,13 @@ int do_macos_sysctl(int update_every, usec_t dt) {
621
622 rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
623 rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
657 - } else
658 - rrdset_next(st);
624 + }
625
626 rrddim_set(st, "InDatagrams", udpstat.udps_ipackets);
627 rrddim_set(st, "OutDatagrams", udpstat.udps_opackets);
628 rrdset_done(st);
629 }
630
665 - // --------------------------------------------------------------------
666 -
631 if (likely(do_udp_errors)) {
632 st = rrdset_find_active_localhost("ipv4.udperrors");
633 if (unlikely(!st)) {
@@ -690,8 +654,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
654 #if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
655 rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
656 #endif
693 - } else
694 - rrdset_next(st);
657 + }
658
659 rrddim_set(st, "InErrors", udpstat.udps_hdrops + udpstat.udps_badlen);
660 rrddim_set(st, "NoPorts", udpstat.udps_noport);
@@ -707,8 +670,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
670 }
671 }
672
710 - // --------------------------------------------------------------------
711 -
673 if (likely(do_icmp_packets || do_icmpmsg)) {
674 if (unlikely(GETSYSCTL_BY_NAME("net.inet.icmp.stats", icmpstat))) {
675 do_icmp_packets = 0;
@@ -745,16 +706,12 @@ int do_macos_sysctl(int update_every, usec_t dt) {
706
707 rrddim_add(st, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
708 rrddim_add(st, "OutMsgs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
748 - } else
749 - rrdset_next(st);
709 + }
710
711 rrddim_set(st, "InMsgs", icmp_total.msgs_in);
712 rrddim_set(st, "OutMsgs", icmp_total.msgs_out);
753 -
713 rrdset_done(st);
714
756 - // --------------------------------------------------------------------
757 -
715 st = rrdset_find_active_localhost("ipv4.icmp_errors");
716 if (unlikely(!st)) {
717 st = rrdset_create_localhost(
@@ -775,18 +732,14 @@ int do_macos_sysctl(int update_every, usec_t dt) {
732 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
733 rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
734 rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
778 - } else
779 - rrdset_next(st);
735 + }
736
737 rrddim_set(st, "InErrors", icmpstat.icps_badcode + icmpstat.icps_badlen + icmpstat.icps_checksum + icmpstat.icps_tooshort);
738 rrddim_set(st, "OutErrors", icmpstat.icps_error);
739 rrddim_set(st, "InCsumErrors", icmpstat.icps_checksum);
784 -
740 rrdset_done(st);
741 }
742
788 - // --------------------------------------------------------------------
789 -
743 if (likely(do_icmpmsg)) {
744 st = rrdset_find_active_localhost("ipv4.icmpmsg");
745 if (unlikely(!st)) {
@@ -809,21 +762,17 @@ int do_macos_sysctl(int update_every, usec_t dt) {
762 rrddim_add(st, "OutEchoReps", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
763 rrddim_add(st, "InEchos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
764 rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
812 - } else
813 - rrdset_next(st);
814 -
815 - rrddim_set(st, "InEchoReps", icmpstat.icps_inhist[ICMP_ECHOREPLY]);
816 - rrddim_set(st, "OutEchoReps", icmpstat.icps_outhist[ICMP_ECHOREPLY]);
817 - rrddim_set(st, "InEchos", icmpstat.icps_inhist[ICMP_ECHO]);
818 - rrddim_set(st, "OutEchos", icmpstat.icps_outhist[ICMP_ECHO]);
765 + }
766
767 + rrddim_set(st, "InEchoReps", icmpstat.icps_inhist[ICMP_ECHOREPLY]);
768 + rrddim_set(st, "OutEchoReps", icmpstat.icps_outhist[ICMP_ECHOREPLY]);
769 + rrddim_set(st, "InEchos", icmpstat.icps_inhist[ICMP_ECHO]);
770 + rrddim_set(st, "OutEchos", icmpstat.icps_outhist[ICMP_ECHO]);
771 rrdset_done(st);
772 }
773 }
774 }
775
825 - // --------------------------------------------------------------------
826 -
776 // see also http://net-snmp.sourceforge.net/docs/mibs/ip.html
777 if (likely(do_ip_packets || do_ip_fragsout || do_ip_fragsin || do_ip_errors)) {
778 if (unlikely(GETSYSCTL_BY_NAME("net.inet.ip.stats", ipstat))) {
@@ -858,8 +807,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
807 rrddim_add(st, "OutRequests", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
808 rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRD_ALGORITHM_INCREMENTAL);
809 rrddim_add(st, "InDelivers", "delivered", 1, 1, RRD_ALGORITHM_INCREMENTAL);
861 - } else
862 - rrdset_next(st);
810 + }
811
812 rrddim_set(st, "OutRequests", ipstat.ips_localout);
813 rrddim_set(st, "InReceives", ipstat.ips_total);
@@ -868,8 +816,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
816 rrdset_done(st);
817 }
818
871 - // --------------------------------------------------------------------
872 -
819 if (likely(do_ip_fragsout)) {
820 st = rrdset_find_active_localhost("ipv4.fragsout");
821 if (unlikely(!st)) {
@@ -892,8 +838,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
838 rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
839 rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
840 rrddim_add(st, "FragCreates", "created", 1, 1, RRD_ALGORITHM_INCREMENTAL);
895 - } else
896 - rrdset_next(st);
841 + }
842
843 rrddim_set(st, "FragOKs", ipstat.ips_fragmented);
844 rrddim_set(st, "FragFails", ipstat.ips_cantfrag);
@@ -901,8 +846,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
846 rrdset_done(st);
847 }
848
904 - // --------------------------------------------------------------------
905 -
849 if (likely(do_ip_fragsin)) {
850 st = rrdset_find_active_localhost("ipv4.fragsin");
851 if (unlikely(!st)) {
@@ -925,8 +868,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
868 rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
869 rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
870 rrddim_add(st, "ReasmReqds", "all", 1, 1, RRD_ALGORITHM_INCREMENTAL);
928 - } else
929 - rrdset_next(st);
871 + }
872
873 rrddim_set(st, "ReasmOKs", ipstat.ips_fragments);
874 rrddim_set(st, "ReasmFails", ipstat.ips_fragdropped);
@@ -934,8 +876,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
876 rrdset_done(st);
877 }
878
937 - // --------------------------------------------------------------------
938 -
879 if (likely(do_ip_errors)) {
880 st = rrdset_find_active_localhost("ipv4.errors");
881 if (unlikely(!st)) {
@@ -963,8 +903,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
903
904 rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
905 rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
966 - } else
967 - rrdset_next(st);
906 + }
907
908 rrddim_set(st, "InDiscards", ipstat.ips_badsum + ipstat.ips_tooshort + ipstat.ips_toosmall + ipstat.ips_toolong);
909 rrddim_set(st, "OutDiscards", ipstat.ips_odropped);
@@ -977,8 +916,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
916 }
917 }
918
980 - // --------------------------------------------------------------------
981 -
919 if (likely(do_ip6_packets || do_ip6_fragsout || do_ip6_fragsin || do_ip6_errors)) {
920 if (unlikely(GETSYSCTL_BY_NAME("net.inet6.ip6.stats", ip6stat))) {
921 do_ip6_packets = 0;
@@ -1018,8 +955,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
955 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
956 rrddim_add(st, "forwarded", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
957 rrddim_add(st, "delivers", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1021 - } else
1022 - rrdset_next(st);
958 + }
959
960 rrddim_set(st, "sent", ip6stat.ip6s_localout);
961 rrddim_set(st, "received", ip6stat.ip6s_total);
@@ -1028,8 +964,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
964 rrdset_done(st);
965 }
966
1031 - // --------------------------------------------------------------------
1032 -
967 if (do_ip6_fragsout == CONFIG_BOOLEAN_YES || (do_ip6_fragsout == CONFIG_BOOLEAN_AUTO &&
968 (ip6stat.ip6s_fragmented ||
969 ip6stat.ip6s_cantfrag ||
@@ -1057,8 +991,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
991 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
992 rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
993 rrddim_add(st, "all", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1060 - } else
1061 - rrdset_next(st);
994 + }
995
996 rrddim_set(st, "ok", ip6stat.ip6s_fragmented);
997 rrddim_set(st, "failed", ip6stat.ip6s_cantfrag);
@@ -1066,8 +999,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
999 rrdset_done(st);
1000 }
1001
1069 - // --------------------------------------------------------------------
1070 -
1002 if (do_ip6_fragsin == CONFIG_BOOLEAN_YES || (do_ip6_fragsin == CONFIG_BOOLEAN_AUTO &&
1003 (ip6stat.ip6s_reassembled ||
1004 ip6stat.ip6s_fragdropped ||
@@ -1097,8 +1028,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1028 rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1029 rrddim_add(st, "timeout", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1030 rrddim_add(st, "all", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1100 - } else
1101 - rrdset_next(st);
1031 + }
1032
1033 rrddim_set(st, "ok", ip6stat.ip6s_reassembled);
1034 rrddim_set(st, "failed", ip6stat.ip6s_fragdropped);
@@ -1107,8 +1037,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1037 rrdset_done(st);
1038 }
1039
1110 - // --------------------------------------------------------------------
1111 -
1040 if (do_ip6_errors == CONFIG_BOOLEAN_YES || (do_ip6_errors == CONFIG_BOOLEAN_AUTO &&
1041 (ip6stat.ip6s_toosmall ||
1042 ip6stat.ip6s_odropped ||
@@ -1148,8 +1076,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1076 rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1077
1078 rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1151 - } else
1152 - rrdset_next(st);
1079 + }
1080
1081 rrddim_set(st, "InDiscards", ip6stat.ip6s_toosmall);
1082 rrddim_set(st, "OutDiscards", ip6stat.ip6s_odropped);
@@ -1166,8 +1093,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1093 }
1094 }
1095
1169 - // --------------------------------------------------------------------
1170 -
1096 if (likely(do_icmp6 || do_icmp6_redir || do_icmp6_errors || do_icmp6_echos || do_icmp6_router || do_icmp6_neighbor || do_icmp6_types)) {
1097 if (unlikely(GETSYSCTL_BY_NAME("net.inet6.icmp6.stats", icmp6stat))) {
1098 do_icmp6 = 0;
@@ -1202,16 +1127,13 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1127
1128 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1129 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1205 - } else
1206 - rrdset_next(st);
1130 + }
1131
1132 rrddim_set(st, "sent", icmp6_total.msgs_in);
1133 rrddim_set(st, "received", icmp6_total.msgs_out);
1134 rrdset_done(st);
1135 }
1136
1213 - // --------------------------------------------------------------------
1214 -
1137 if (do_icmp6_redir == CONFIG_BOOLEAN_YES || (do_icmp6_redir == CONFIG_BOOLEAN_AUTO &&
1138 (icmp6stat.icp6s_inhist[ND_REDIRECT] ||
1139 icmp6stat.icp6s_outhist[ND_REDIRECT] ||
@@ -1236,16 +1158,13 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1158
1159 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1160 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1239 - } else
1240 - rrdset_next(st);
1161 + }
1162
1163 rrddim_set(st, "sent", icmp6stat.icp6s_inhist[ND_REDIRECT]);
1164 rrddim_set(st, "received", icmp6stat.icp6s_outhist[ND_REDIRECT]);
1165 rrdset_done(st);
1166 }
1167
1247 - // --------------------------------------------------------------------
1248 -
1168 if (do_icmp6_errors == CONFIG_BOOLEAN_YES || (do_icmp6_errors == CONFIG_BOOLEAN_AUTO &&
1169 (icmp6stat.icp6s_badcode ||
1170 icmp6stat.icp6s_badlen ||
@@ -1288,8 +1207,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1207 rrddim_add(st, "OutDestUnreachs", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1208 rrddim_add(st, "OutTimeExcds", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1209 rrddim_add(st, "OutParmProblems", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1291 - } else
1292 - rrdset_next(st);
1210 + }
1211
1212 rrddim_set(st, "InErrors", icmp6stat.icp6s_badcode + icmp6stat.icp6s_badlen + icmp6stat.icp6s_checksum + icmp6stat.icp6s_tooshort);
1213 rrddim_set(st, "OutErrors", icmp6stat.icp6s_error);
@@ -1304,8 +1222,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1222 rrdset_done(st);
1223 }
1224
1307 - // --------------------------------------------------------------------
1308 -
1225 if (do_icmp6_echos == CONFIG_BOOLEAN_YES || (do_icmp6_echos == CONFIG_BOOLEAN_AUTO &&
1226 (icmp6stat.icp6s_inhist[ICMP6_ECHO_REQUEST] ||
1227 icmp6stat.icp6s_outhist[ICMP6_ECHO_REQUEST] ||
@@ -1334,8 +1250,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1250 rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1251 rrddim_add(st, "InEchoReplies", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1252 rrddim_add(st, "OutEchoReplies", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1337 - } else
1338 - rrdset_next(st);
1253 + }
1254
1255 rrddim_set(st, "InEchos", icmp6stat.icp6s_inhist[ICMP6_ECHO_REQUEST]);
1256 rrddim_set(st, "OutEchos", icmp6stat.icp6s_outhist[ICMP6_ECHO_REQUEST]);
@@ -1344,8 +1259,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1259 rrdset_done(st);
1260 }
1261
1347 - // --------------------------------------------------------------------
1348 -
1262 if (do_icmp6_router == CONFIG_BOOLEAN_YES || (do_icmp6_router == CONFIG_BOOLEAN_AUTO &&
1263 (icmp6stat.icp6s_inhist[ND_ROUTER_SOLICIT] ||
1264 icmp6stat.icp6s_outhist[ND_ROUTER_SOLICIT] ||
@@ -1374,8 +1287,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1287 rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1288 rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1289 rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1377 - } else
1378 - rrdset_next(st);
1290 + }
1291
1292 rrddim_set(st, "InSolicits", icmp6stat.icp6s_inhist[ND_ROUTER_SOLICIT]);
1293 rrddim_set(st, "OutSolicits", icmp6stat.icp6s_outhist[ND_ROUTER_SOLICIT]);
@@ -1384,8 +1296,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1296 rrdset_done(st);
1297 }
1298
1387 - // --------------------------------------------------------------------
1388 -
1299 if (do_icmp6_neighbor == CONFIG_BOOLEAN_YES || (do_icmp6_neighbor == CONFIG_BOOLEAN_AUTO &&
1300 (icmp6stat.icp6s_inhist[ND_NEIGHBOR_SOLICIT] ||
1301 icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT] ||
@@ -1414,18 +1324,14 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1324 rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1325 rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1326 rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1417 - } else
1418 - rrdset_next(st);
1327 + }
1328
1329 rrddim_set(st, "InSolicits", icmp6stat.icp6s_inhist[ND_NEIGHBOR_SOLICIT]);
1330 rrddim_set(st, "OutSolicits", icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT]);
1331 rrddim_set(st, "InAdvertisements", icmp6stat.icp6s_inhist[ND_NEIGHBOR_ADVERT]);
1332 rrddim_set(st, "OutAdvertisements", icmp6stat.icp6s_outhist[ND_NEIGHBOR_ADVERT]);
1424 - rrdset_done(st);
1333 }
1334
1427 - // --------------------------------------------------------------------
1428 -
1335 if (do_icmp6_types == CONFIG_BOOLEAN_YES || (do_icmp6_types == CONFIG_BOOLEAN_AUTO &&
1336 (icmp6stat.icp6s_inhist[1] ||
1337 icmp6stat.icp6s_inhist[128] ||
@@ -1466,8 +1372,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1372 rrddim_add(st, "OutType133", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1373 rrddim_add(st, "OutType135", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1374 rrddim_add(st, "OutType143", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1469 - } else
1470 - rrdset_next(st);
1375 + }
1376
1377 rrddim_set(st, "InType1", icmp6stat.icp6s_inhist[1]);
1378 rrddim_set(st, "InType128", icmp6stat.icp6s_inhist[128]);
@@ -1484,8 +1389,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1389 }
1390 }
1391
1487 - // --------------------------------------------------------------------
1488 -
1392 if (likely(do_uptime)) {
1393 if (unlikely(GETSYSCTL_BY_NAME("kern.boottime", boot_time))) {
1394 do_uptime = 0;
@@ -1511,7 +1414,6 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1414 );
1415 rrddim_add(st, "uptime", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1416 }
1514 - else rrdset_next(st);
1417
1418 rrddim_set(st, "uptime", cur_time.tv_sec - boot_time.tv_sec);
1419 rrdset_done(st);
@@ -1520,4 +1422,3 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1422
1423 return 0;
1424 }
1523 -
collectors/plugins.d/pluginsd_parser.c
+5 -1
@@ -155,7 +155,11 @@ PARSER_RC pluginsd_end(char **words, size_t num_words, void *user)
155
156 ((PARSER_USER_OBJECT *) user)->st = NULL;
157 ((PARSER_USER_OBJECT *) user)->count++;
158 - rrdset_done(st);
158 +
159 + struct timeval now;
160 + now_realtime_timeval(&now);
161 + rrdset_timed_done(st, now, /* pending_rrdset_next = */ false);
162 +
163 return PARSER_RC_OK;
164 }
165
collectors/proc.plugin/ipc.c
-18
@@ -390,17 +390,13 @@ int do_ipc(int update_every, usec_t dt) {
390 return 0;
391 }
392
393 - if(st_semaphores->counter_done) rrdset_next(st_semaphores);
393 rrddim_set_by_pointer(st_semaphores, rd_semaphores, status.semaem);
394 rrdset_done(st_semaphores);
395
397 - if(st_arrays->counter_done) rrdset_next(st_arrays);
396 rrddim_set_by_pointer(st_arrays, rd_arrays, status.semusz);
397 rrdset_done(st_arrays);
398 }
399
402 - // --------------------------------------------------------------------
403 -
400 if(likely(do_msg != CONFIG_BOOLEAN_NO)) {
401 static RRDSET *st_msq_messages = NULL, *st_msq_bytes = NULL;
402
@@ -422,8 +418,6 @@ int do_ipc(int update_every, usec_t dt) {
418 , update_every
419 , RRDSET_TYPE_STACKED
420 );
425 - else
426 - rrdset_next(st_msq_messages);
421
422 if(unlikely(!st_msq_bytes))
423 st_msq_bytes = rrdset_create_localhost(
@@ -440,8 +434,6 @@ int do_ipc(int update_every, usec_t dt) {
434 , update_every
435 , RRDSET_TYPE_STACKED
436 );
443 - else
444 - rrdset_next(st_msq_bytes);
437
438 struct message_queue *msq = message_queue_root, *msq_prev = NULL;
439 while(likely(msq)){
@@ -506,8 +498,6 @@ int do_ipc(int update_every, usec_t dt) {
498 }
499 }
500
509 - // --------------------------------------------------------------------
510 -
501 if(likely(do_shm != CONFIG_BOOLEAN_NO)) {
502 static RRDSET *st_shm_segments = NULL, *st_shm_bytes = NULL;
503 static RRDDIM *rd_shm_segments = NULL, *rd_shm_bytes = NULL;
@@ -532,15 +522,10 @@ int do_ipc(int update_every, usec_t dt) {
522
523 rd_shm_segments = rrddim_add(st_shm_segments, "segments", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
524 }
535 - else
536 - rrdset_next(st_shm_segments);
525
526 rrddim_set_by_pointer(st_shm_segments, rd_shm_segments, shm.segments);
539 -
527 rrdset_done(st_shm_segments);
528
542 - // --------------------------------------------------------------------
543 -
529 if(unlikely(!st_shm_bytes)) {
530 st_shm_bytes = rrdset_create_localhost(
531 "system"
@@ -559,11 +544,8 @@ int do_ipc(int update_every, usec_t dt) {
544
545 rd_shm_bytes = rrddim_add(st_shm_bytes, "bytes", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
546 }
562 - else
563 - rrdset_next(st_shm_bytes);
547
548 rrddim_set_by_pointer(st_shm_bytes, rd_shm_bytes, shm.bytes);
566 -
549 rrdset_done(st_shm_bytes);
550 }
551 }
collectors/proc.plugin/proc_diskstats.c
+1 -67
@@ -306,7 +306,6 @@ void bcache_read_priority_stats(struct disk *d, const char *family, int update_e
306
307 d->bcache_priority_stats_update_every_usec = update_every * USEC_PER_SEC;
308 }
309 - else rrdset_next(d->st_bcache_cache_allocations);
309
310 rrddim_set_by_pointer(d->st_bcache_cache_allocations, d->rd_bcache_cache_allocations_unused, unused);
311 rrddim_set_by_pointer(d->st_bcache_cache_allocations, d->rd_bcache_cache_allocations_dirty, dirty);
@@ -1116,15 +1115,12 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1115
1116 add_labels_to_disk(d, d->st_io);
1117 }
1119 - else rrdset_next(d->st_io);
1118
1119 last_readsectors = rrddim_set_by_pointer(d->st_io, d->rd_io_reads, readsectors);
1120 last_writesectors = rrddim_set_by_pointer(d->st_io, d->rd_io_writes, writesectors);
1121 rrdset_done(d->st_io);
1122 }
1123
1126 - // --------------------------------------------------------------------
1127 -
1124 if (do_dc_stats && d->do_io == CONFIG_BOOLEAN_YES && d->do_ext != CONFIG_BOOLEAN_NO) {
1125 if (unlikely(!d->st_ext_io)) {
1126 d->st_ext_io = rrdset_create_localhost(
@@ -1145,15 +1141,12 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1141 d->rd_io_discards = rrddim_add(d->st_ext_io, "discards", NULL, d->sector_size, 1024, RRD_ALGORITHM_INCREMENTAL);
1142
1143 add_labels_to_disk(d, d->st_ext_io);
1148 - } else
1149 - rrdset_next(d->st_ext_io);
1144 + }
1145
1146 last_discardsectors = rrddim_set_by_pointer(d->st_ext_io, d->rd_io_discards, discardsectors);
1147 rrdset_done(d->st_ext_io);
1148 }
1149
1155 - // --------------------------------------------------------------------
1156 -
1150 if(d->do_ops == CONFIG_BOOLEAN_YES || (d->do_ops == CONFIG_BOOLEAN_AUTO &&
1151 (reads || writes || discards || flushes ||
1152 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -1182,15 +1175,12 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1175
1176 add_labels_to_disk(d, d->st_ops);
1177 }
1185 - else rrdset_next(d->st_ops);
1178
1179 last_reads = rrddim_set_by_pointer(d->st_ops, d->rd_ops_reads, reads);
1180 last_writes = rrddim_set_by_pointer(d->st_ops, d->rd_ops_writes, writes);
1181 rrdset_done(d->st_ops);
1182 }
1183
1192 - // --------------------------------------------------------------------
1193 -
1184 if (do_dc_stats && d->do_ops == CONFIG_BOOLEAN_YES && d->do_ext != CONFIG_BOOLEAN_NO) {
1185 if (unlikely(!d->st_ext_ops)) {
1186 d->st_ext_ops = rrdset_create_localhost(
@@ -1216,8 +1206,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1206
1207 add_labels_to_disk(d, d->st_ext_ops);
1208 }
1219 - else
1220 - rrdset_next(d->st_ext_ops);
1209
1210 last_discards = rrddim_set_by_pointer(d->st_ext_ops, d->rd_ops_discards, discards);
1211 if (do_fl_stats)
@@ -1225,8 +1213,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1213 rrdset_done(d->st_ext_ops);
1214 }
1215
1228 - // --------------------------------------------------------------------
1229 -
1216 if(d->do_qops == CONFIG_BOOLEAN_YES || (d->do_qops == CONFIG_BOOLEAN_AUTO &&
1217 (queued_ios || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
1218 d->do_qops = CONFIG_BOOLEAN_YES;
@@ -1253,14 +1239,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1239
1240 add_labels_to_disk(d, d->st_qops);
1241 }
1256 - else rrdset_next(d->st_qops);
1242
1243 rrddim_set_by_pointer(d->st_qops, d->rd_qops_operations, queued_ios);
1244 rrdset_done(d->st_qops);
1245 }
1246
1262 - // --------------------------------------------------------------------
1263 -
1247 if(d->do_backlog == CONFIG_BOOLEAN_YES || (d->do_backlog == CONFIG_BOOLEAN_AUTO &&
1248 (backlog_ms || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
1249 d->do_backlog = CONFIG_BOOLEAN_YES;
@@ -1287,14 +1270,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1270
1271 add_labels_to_disk(d, d->st_backlog);
1272 }
1290 - else rrdset_next(d->st_backlog);
1273
1274 rrddim_set_by_pointer(d->st_backlog, d->rd_backlog_backlog, backlog_ms);
1275 rrdset_done(d->st_backlog);
1276 }
1277
1296 - // --------------------------------------------------------------------
1297 -
1278 if(d->do_util == CONFIG_BOOLEAN_YES || (d->do_util == CONFIG_BOOLEAN_AUTO &&
1279 (busy_ms || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
1280 d->do_util = CONFIG_BOOLEAN_YES;
@@ -1321,13 +1301,10 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1301
1302 add_labels_to_disk(d, d->st_busy);
1303 }
1324 - else rrdset_next(d->st_busy);
1304
1305 last_busy_ms = rrddim_set_by_pointer(d->st_busy, d->rd_busy_busy, busy_ms);
1306 rrdset_done(d->st_busy);
1307
1329 - // --------------------------------------------------------------------
1330 -
1308 if(unlikely(!d->st_util)) {
1309 d->st_util = rrdset_create_localhost(
1310 "disk_util"
@@ -1350,7 +1327,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1327
1328 add_labels_to_disk(d, d->st_util);
1329 }
1353 - else rrdset_next(d->st_util);
1330
1331 collected_number disk_utilization = (busy_ms - last_busy_ms) / (10 * update_every);
1332 if (disk_utilization > 100)
@@ -1360,8 +1336,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1336 rrdset_done(d->st_util);
1337 }
1338
1363 - // --------------------------------------------------------------------
1364 -
1339 if(d->do_mops == CONFIG_BOOLEAN_YES || (d->do_mops == CONFIG_BOOLEAN_AUTO &&
1340 (mreads || mwrites || mdiscards ||
1341 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -1390,15 +1364,12 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1364
1365 add_labels_to_disk(d, d->st_mops);
1366 }
1393 - else rrdset_next(d->st_mops);
1367
1368 rrddim_set_by_pointer(d->st_mops, d->rd_mops_reads, mreads);
1369 rrddim_set_by_pointer(d->st_mops, d->rd_mops_writes, mwrites);
1370 rrdset_done(d->st_mops);
1371 }
1372
1400 - // --------------------------------------------------------------------
1401 -
1373 if(do_dc_stats && d->do_mops == CONFIG_BOOLEAN_YES && d->do_ext != CONFIG_BOOLEAN_NO) {
1374 d->do_mops = CONFIG_BOOLEAN_YES;
1375
@@ -1424,15 +1395,11 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1395
1396 add_labels_to_disk(d, d->st_ext_mops);
1397 }
1427 - else
1428 - rrdset_next(d->st_ext_mops);
1398
1399 rrddim_set_by_pointer(d->st_ext_mops, d->rd_mops_discards, mdiscards);
1400 rrdset_done(d->st_ext_mops);
1401 }
1402
1434 - // --------------------------------------------------------------------
1435 -
1403 if(d->do_iotime == CONFIG_BOOLEAN_YES || (d->do_iotime == CONFIG_BOOLEAN_AUTO &&
1404 (readms || writems || discardms || flushms || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
1405 d->do_iotime = CONFIG_BOOLEAN_YES;
@@ -1460,15 +1427,12 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1427
1428 add_labels_to_disk(d, d->st_iotime);
1429 }
1463 - else rrdset_next(d->st_iotime);
1430
1431 last_readms = rrddim_set_by_pointer(d->st_iotime, d->rd_iotime_reads, readms);
1432 last_writems = rrddim_set_by_pointer(d->st_iotime, d->rd_iotime_writes, writems);
1433 rrdset_done(d->st_iotime);
1434 }
1435
1470 - // --------------------------------------------------------------------
1471 -
1436 if(do_dc_stats && d->do_iotime == CONFIG_BOOLEAN_YES && d->do_ext != CONFIG_BOOLEAN_NO) {
1437 if(unlikely(!d->st_ext_iotime)) {
1438 d->st_ext_iotime = rrdset_create_localhost(
@@ -1494,8 +1458,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1458
1459 add_labels_to_disk(d, d->st_ext_iotime);
1460 }
1497 - else
1498 - rrdset_next(d->st_ext_iotime);
1461
1462 last_discardms = rrddim_set_by_pointer(d->st_ext_iotime, d->rd_iotime_discards, discardms);
1463 if (do_fl_stats)
@@ -1503,7 +1465,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1465 rrdset_done(d->st_ext_iotime);
1466 }
1467
1506 - // --------------------------------------------------------------------
1468 // calculate differential charts
1469 // only if this is not the first time we run
1470
@@ -1538,7 +1499,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1499
1500 add_labels_to_disk(d, d->st_await);
1501 }
1541 - else rrdset_next(d->st_await);
1502
1503 rrddim_set_by_pointer(d->st_await, d->rd_await_reads, (reads - last_reads) ? (readms - last_readms) / (reads - last_reads) : 0);
1504 rrddim_set_by_pointer(d->st_await, d->rd_await_writes, (writes - last_writes) ? (writems - last_writems) / (writes - last_writes) : 0);
@@ -1570,8 +1530,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1530
1531 add_labels_to_disk(d, d->st_ext_await);
1532 }
1573 - else
1574 - rrdset_next(d->st_ext_await);
1533
1534 rrddim_set_by_pointer(
1535 d->st_ext_await, d->rd_await_discards,
@@ -1613,7 +1571,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1571
1572 add_labels_to_disk(d, d->st_avgsz);
1573 }
1616 - else rrdset_next(d->st_avgsz);
1574
1575 rrddim_set_by_pointer(d->st_avgsz, d->rd_avgsz_reads, (reads - last_reads) ? (readsectors - last_readsectors) / (reads - last_reads) : 0);
1576 rrddim_set_by_pointer(d->st_avgsz, d->rd_avgsz_writes, (writes - last_writes) ? (writesectors - last_writesectors) / (writes - last_writes) : 0);
@@ -1643,8 +1600,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1600
1601 add_labels_to_disk(d, d->st_ext_avgsz);
1602 }
1646 - else
1647 - rrdset_next(d->st_ext_avgsz);
1603
1604 rrddim_set_by_pointer(
1605 d->st_ext_avgsz, d->rd_avgsz_discards,
@@ -1682,15 +1637,12 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1637
1638 add_labels_to_disk(d, d->st_svctm);
1639 }
1685 - else
1686 - rrdset_next(d->st_svctm);
1640
1641 rrddim_set_by_pointer(d->st_svctm, d->rd_svctm_svctm, ((reads - last_reads) + (writes - last_writes)) ? (busy_ms - last_busy_ms) / ((reads - last_reads) + (writes - last_writes)) : 0);
1642 rrdset_done(d->st_svctm);
1643 }
1644 }
1645
1693 - // --------------------------------------------------------------------------
1646 // read bcache metrics and generate the bcache charts
1647
1648 if(d->device_is_bcache && d->do_bcache != CONFIG_BOOLEAN_NO) {
@@ -1791,8 +1743,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1743
1744 add_labels_to_disk(d, d->st_bcache_hit_ratio);
1745 }
1794 - else
1795 - rrdset_next(d->st_bcache_hit_ratio);
1746
1747 rrddim_set_by_pointer(d->st_bcache_hit_ratio, d->rd_bcache_hit_ratio_5min, stats_five_minute_cache_hit_ratio);
1748 rrddim_set_by_pointer(d->st_bcache_hit_ratio, d->rd_bcache_hit_ratio_1hour, stats_hour_cache_hit_ratio);
@@ -1824,8 +1774,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1774
1775 add_labels_to_disk(d, d->st_bcache_rates);
1776 }
1827 - else
1828 - rrdset_next(d->st_bcache_rates);
1777
1778 rrddim_set_by_pointer(d->st_bcache_rates, d->rd_bcache_rate_writeback, writeback_rate);
1779 rrddim_set_by_pointer(d->st_bcache_rates, d->rd_bcache_rate_congested, cache_congested);
@@ -1853,8 +1801,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1801
1802 add_labels_to_disk(d, d->st_bcache_size);
1803 }
1856 - else
1857 - rrdset_next(d->st_bcache_size);
1804
1805 rrddim_set_by_pointer(d->st_bcache_size, d->rd_bcache_dirty_size, dirty_data);
1806 rrdset_done(d->st_bcache_size);
@@ -1881,8 +1827,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1827
1828 add_labels_to_disk(d, d->st_bcache_usage);
1829 }
1884 - else
1885 - rrdset_next(d->st_bcache_usage);
1830
1831 rrddim_set_by_pointer(d->st_bcache_usage, d->rd_bcache_available_percent, cache_available_percent);
1832 rrdset_done(d->st_bcache_usage);
@@ -1911,8 +1855,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1855
1856 add_labels_to_disk(d, d->st_bcache_cache_read_races);
1857 }
1914 - else
1915 - rrdset_next(d->st_bcache_cache_read_races);
1858
1859 rrddim_set_by_pointer(d->st_bcache_cache_read_races, d->rd_bcache_cache_read_races, cache_read_races);
1860 rrddim_set_by_pointer(d->st_bcache_cache_read_races, d->rd_bcache_cache_io_errors, cache_io_errors);
@@ -1950,8 +1892,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1892
1893 add_labels_to_disk(d, d->st_bcache);
1894 }
1953 - else
1954 - rrdset_next(d->st_bcache);
1895
1896 rrddim_set_by_pointer(d->st_bcache, d->rd_bcache_hits, stats_total_cache_hits);
1897 rrddim_set_by_pointer(d->st_bcache, d->rd_bcache_misses, stats_total_cache_misses);
@@ -1988,7 +1928,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1928
1929 add_labels_to_disk(d, d->st_bcache_bypass);
1930 }
1991 - else rrdset_next(d->st_bcache_bypass);
1931
1932 rrddim_set_by_pointer(d->st_bcache_bypass, d->rd_bcache_bypass_hits, stats_total_cache_bypass_hits);
1933 rrddim_set_by_pointer(d->st_bcache_bypass, d->rd_bcache_bypass_misses, stats_total_cache_bypass_misses);
@@ -1997,8 +1936,6 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1936 }
1937 }
1938
2000 -
2001 - // ------------------------------------------------------------------------
1939 // update the system total I/O
1940
1941 if(global_do_io == CONFIG_BOOLEAN_YES || (global_do_io == CONFIG_BOOLEAN_AUTO &&
@@ -2026,15 +1963,12 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1963 rd_in = rrddim_add(st_io, "in", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1964 rd_out = rrddim_add(st_io, "out", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1965 }
2029 - else rrdset_next(st_io);
1966
1967 rrddim_set_by_pointer(st_io, rd_in, system_read_kb);
1968 rrddim_set_by_pointer(st_io, rd_out, system_write_kb);
1969 rrdset_done(st_io);
1970 }
1971
2036 -
2037 - // ------------------------------------------------------------------------
1972 // cleanup removed disks
1973
1974 struct disk *d = disk_root, *last = NULL;
collectors/proc.plugin/proc_interrupts.c
-7
@@ -146,8 +146,6 @@ int do_proc_interrupts(int update_every, usec_t dt) {
146 irr->used = 1;
147 }
148
149 - // --------------------------------------------------------------------
150 -
149 static RRDSET *st_system_interrupts = NULL;
150 if(unlikely(!st_system_interrupts))
151 st_system_interrupts = rrdset_create_localhost(
@@ -164,8 +162,6 @@ int do_proc_interrupts(int update_every, usec_t dt) {
162 , update_every
163 , RRDSET_TYPE_STACKED
164 );
167 - else
168 - rrdset_next(st_system_interrupts);
165
166 for(l = 0; l < lines ;l++) {
167 struct interrupt *irr = irrindex(irrs, l, cpus);
@@ -190,8 +186,6 @@ int do_proc_interrupts(int update_every, usec_t dt) {
186
187 rrdset_done(st_system_interrupts);
188
193 - // --------------------------------------------------------------------
194 -
189 if(likely(do_per_core != CONFIG_BOOLEAN_NO)) {
190 static RRDSET **core_st = NULL;
191 static int old_cpus = 0;
@@ -230,7 +224,6 @@ int do_proc_interrupts(int update_every, usec_t dt) {
224 snprintfz(core, 50, "cpu%d", c);
225 rrdlabels_add(core_st[c]->rrdlabels, "cpu", core, RRDLABEL_SRC_AUTO);
226 }
233 - else rrdset_next(core_st[c]);
227
228 for(l = 0; l < lines ;l++) {
229 struct interrupt *irr = irrindex(irrs, l, cpus);
collectors/proc.plugin/proc_loadavg.c
+4 -9
@@ -52,9 +52,6 @@ int do_proc_loadavg(int update_every, usec_t dt) {
52 //
53 //unsigned long long next_pid = str2ull(procfile_lineword(ff, 0, 5));
54
55 -
56 - // --------------------------------------------------------------------
57 -
55 if(next_loadavg_dt <= dt) {
56 if(likely(do_loadavg)) {
57 static RRDSET *load_chart = NULL;
@@ -80,8 +77,6 @@ int do_proc_loadavg(int update_every, usec_t dt) {
77 rd_load5 = rrddim_add(load_chart, "load5", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
78 rd_load15 = rrddim_add(load_chart, "load15", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
79 }
83 - else
84 - rrdset_next(load_chart);
80
81 rrddim_set_by_pointer(load_chart, rd_load1, (collected_number) (load1 * 1000));
82 rrddim_set_by_pointer(load_chart, rd_load5, (collected_number) (load5 * 1000));
@@ -90,11 +85,12 @@ int do_proc_loadavg(int update_every, usec_t dt) {
85
86 next_loadavg_dt = load_chart->update_every * USEC_PER_SEC;
87 }
93 - else next_loadavg_dt = MIN_LOADAVG_UPDATE_EVERY * USEC_PER_SEC;
88 + else
89 + next_loadavg_dt = MIN_LOADAVG_UPDATE_EVERY * USEC_PER_SEC;
90 }
95 - else next_loadavg_dt -= dt;
91 + else
92 + next_loadavg_dt -= dt;
93
97 - // --------------------------------------------------------------------
94
95 if(likely(do_all_processes)) {
96 static RRDSET *processes_chart = NULL;
@@ -120,7 +116,6 @@ int do_proc_loadavg(int update_every, usec_t dt) {
116 rd_active = rrddim_add(processes_chart, "active", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
117 rd_pidmax = rrdsetvar_custom_chart_variable_add_and_acquire(processes_chart, "pidmax");
118 }
123 - else rrdset_next(processes_chart);
119
120 rrddim_set_by_pointer(processes_chart, rd_active, active_processes);
121 rrdsetvar_custom_chart_variable_set(processes_chart, rd_pidmax, max_processes);
collectors/proc.plugin/proc_mdstat.c
-36
@@ -392,8 +392,6 @@ int do_proc_mdstat(int update_every, usec_t dt)
392 }
393 }
394
395 - // --------------------------------------------------------------------
396 -
395 if (likely(do_health && redundant_num)) {
396 static RRDSET *st_mdstat_health = NULL;
397 if (unlikely(!st_mdstat_health)) {
@@ -413,8 +411,6 @@ int do_proc_mdstat(int update_every, usec_t dt)
411
412 rrdset_isnot_obsolete(st_mdstat_health);
413 }
416 - else
417 - rrdset_next(st_mdstat_health);
414
415 if (!redundant_num) {
416 if (likely(make_charts_obsolete))
@@ -435,8 +431,6 @@ int do_proc_mdstat(int update_every, usec_t dt)
431 }
432 }
433
438 - // --------------------------------------------------------------------
439 -
434 for (raid_idx = 0; raid_idx < raids_num; raid_idx++) {
435 struct raid *raid = &raids[raid_idx];
436 char id[50 + 1];
@@ -467,8 +461,6 @@ int do_proc_mdstat(int update_every, usec_t dt)
461
462 add_labels_to_mdstat(raid, raid->st_disks);
463 }
470 - else
471 - rrdset_next(raid->st_disks);
464
465 if (unlikely(!raid->rd_inuse && !(raid->rd_inuse = rrddim_find_active(raid->st_disks, "inuse"))))
466 raid->rd_inuse = rrddim_add(raid->st_disks, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -477,12 +469,9 @@ int do_proc_mdstat(int update_every, usec_t dt)
469
470 rrddim_set_by_pointer(raid->st_disks, raid->rd_inuse, raid->inuse_disks);
471 rrddim_set_by_pointer(raid->st_disks, raid->rd_down, raid->failed_disks);
480 -
472 rrdset_done(raid->st_disks);
473 }
474
484 - // --------------------------------------------------------------------
485 -
475 if (likely(do_mismatch)) {
476 snprintfz(id, 50, "%s_mismatch", raid->name);
477
@@ -507,19 +496,14 @@ int do_proc_mdstat(int update_every, usec_t dt)
496
497 add_labels_to_mdstat(raid, raid->st_mismatch_cnt);
498 }
510 - else
511 - rrdset_next(raid->st_mismatch_cnt);
499
500 if (unlikely(!raid->rd_mismatch_cnt && !(raid->rd_mismatch_cnt = rrddim_find_active(raid->st_mismatch_cnt, "count"))))
501 raid->rd_mismatch_cnt = rrddim_add(raid->st_mismatch_cnt, "count", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
502
503 rrddim_set_by_pointer(raid->st_mismatch_cnt, raid->rd_mismatch_cnt, raid->mismatch_cnt);
517 -
504 rrdset_done(raid->st_mismatch_cnt);
505 }
506
521 - // --------------------------------------------------------------------
522 -
507 if (likely(do_operations)) {
508 snprintfz(id, 50, "%s_operation", raid->name);
509
@@ -544,8 +528,6 @@ int do_proc_mdstat(int update_every, usec_t dt)
528
529 add_labels_to_mdstat(raid, raid->st_operation);
530 }
547 - else
548 - rrdset_next(raid->st_operation);
531
532 if(unlikely(!raid->rd_check && !(raid->rd_check = rrddim_find_active(raid->st_operation, "check"))))
533 raid->rd_check = rrddim_add(raid->st_operation, "check", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
@@ -560,13 +542,9 @@ int do_proc_mdstat(int update_every, usec_t dt)
542 rrddim_set_by_pointer(raid->st_operation, raid->rd_resync, raid->resync);
543 rrddim_set_by_pointer(raid->st_operation, raid->rd_recovery, raid->recovery);
544 rrddim_set_by_pointer(raid->st_operation, raid->rd_reshape, raid->reshape);
563 -
545 rrdset_done(raid->st_operation);
546
566 - // --------------------------------------------------------------------
567 -
547 snprintfz(id, 50, "%s_finish", raid->name);
569 -
548 if (unlikely(!raid->st_finish && !(raid->st_finish = rrdset_find_active_byname_localhost(id)))) {
549 snprintfz(family, 50, "%s (%s)", raid->name, raid->level);
550
@@ -587,20 +565,14 @@ int do_proc_mdstat(int update_every, usec_t dt)
565
566 add_labels_to_mdstat(raid, raid->st_finish);
567 }
590 - else
591 - rrdset_next(raid->st_finish);
568
569 if(unlikely(!raid->rd_finish_in && !(raid->rd_finish_in = rrddim_find_active(raid->st_finish, "finish_in"))))
570 raid->rd_finish_in = rrddim_add(raid->st_finish, "finish_in", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
571
572 rrddim_set_by_pointer(raid->st_finish, raid->rd_finish_in, raid->finish_in);
597 -
573 rrdset_done(raid->st_finish);
574
600 - // --------------------------------------------------------------------
601 -
575 snprintfz(id, 50, "%s_speed", raid->name);
603 -
576 if (unlikely(!raid->st_speed && !(raid->st_speed = rrdset_find_active_byname_localhost(id)))) {
577 snprintfz(family, 50, "%s (%s)", raid->name, raid->level);
578
@@ -622,19 +594,14 @@ int do_proc_mdstat(int update_every, usec_t dt)
594
595 add_labels_to_mdstat(raid, raid->st_speed);
596 }
625 - else
626 - rrdset_next(raid->st_speed);
597
598 if (unlikely(!raid->rd_speed && !(raid->rd_speed = rrddim_find_active(raid->st_speed, "speed"))))
599 raid->rd_speed = rrddim_add(raid->st_speed, "speed", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
600
601 rrddim_set_by_pointer(raid->st_speed, raid->rd_speed, raid->speed);
632 -
602 rrdset_done(raid->st_speed);
603 }
604 } else {
636 - // --------------------------------------------------------------------
637 -
605 if (likely(do_nonredundant)) {
606 snprintfz(id, 50, "%s_availability", raid->name);
607
@@ -659,14 +626,11 @@ int do_proc_mdstat(int update_every, usec_t dt)
626
627 add_labels_to_mdstat(raid, raid->st_nonredundant);
628 }
662 - else
663 - rrdset_next(raid->st_nonredundant);
629
630 if (unlikely(!raid->rd_nonredundant && !(raid->rd_nonredundant = rrddim_find_active(raid->st_nonredundant, "available"))))
631 raid->rd_nonredundant = rrddim_add(raid->st_nonredundant, "available", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
632
633 rrddim_set_by_pointer(raid->st_nonredundant, raid->rd_nonredundant, 1);
669 -
634 rrdset_done(raid->st_nonredundant);
635 }
636 }
collectors/proc.plugin/proc_meminfo.c
-35
@@ -154,8 +154,6 @@ int do_proc_meminfo(int update_every, usec_t dt) {
154 if (first_ff_read)
155 first_ff_read = 0;
156
157 - // --------------------------------------------------------------------
158 -
157 // http://calimeroteknik.free.fr/blag/?article20/really-used-memory-on-gnu-linux
158 unsigned long long MemCached = Cached + SReclaimable - Shmem;
159 unsigned long long MemUsed = MemTotal - MemFree - MemCached - Buffers;
@@ -190,13 +188,11 @@ int do_proc_meminfo(int update_every, usec_t dt) {
188 rd_cached = rrddim_add(st_system_ram, "cached", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
189 rd_buffers = rrddim_add(st_system_ram, "buffers", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
190 }
193 - else rrdset_next(st_system_ram);
191
192 rrddim_set_by_pointer(st_system_ram, rd_free, MemFree);
193 rrddim_set_by_pointer(st_system_ram, rd_used, MemUsed);
194 rrddim_set_by_pointer(st_system_ram, rd_cached, MemCached);
195 rrddim_set_by_pointer(st_system_ram, rd_buffers, Buffers);
199 -
196 rrdset_done(st_system_ram);
197 }
198
@@ -222,16 +218,12 @@ int do_proc_meminfo(int update_every, usec_t dt) {
218
219 rd_avail = rrddim_add(st_mem_available, "MemAvailable", "avail", 1, 1024, RRD_ALGORITHM_ABSOLUTE);
220 }
225 - else rrdset_next(st_mem_available);
221
222 rrddim_set_by_pointer(st_mem_available, rd_avail, MemAvailable);
228 -
223 rrdset_done(st_mem_available);
224 }
225 }
226
233 - // --------------------------------------------------------------------
234 -
227 unsigned long long SwapUsed = SwapTotal - SwapFree;
228
229 if(do_swap == CONFIG_BOOLEAN_YES || (do_swap == CONFIG_BOOLEAN_AUTO &&
@@ -263,16 +255,12 @@ int do_proc_meminfo(int update_every, usec_t dt) {
255 rd_free = rrddim_add(st_system_swap, "free", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
256 rd_used = rrddim_add(st_system_swap, "used", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
257 }
266 - else rrdset_next(st_system_swap);
258
259 rrddim_set_by_pointer(st_system_swap, rd_used, SwapUsed);
260 rrddim_set_by_pointer(st_system_swap, rd_free, SwapFree);
270 -
261 rrdset_done(st_system_swap);
262 }
263
274 - // --------------------------------------------------------------------
275 -
264 if(arl_hwcorrupted->flags & ARL_ENTRY_FLAG_FOUND &&
265 (do_hwcorrupt == CONFIG_BOOLEAN_YES || (do_hwcorrupt == CONFIG_BOOLEAN_AUTO &&
266 (HardwareCorrupted > 0 ||
@@ -302,15 +290,11 @@ int do_proc_meminfo(int update_every, usec_t dt) {
290
291 rd_corrupted = rrddim_add(st_mem_hwcorrupt, "HardwareCorrupted", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
292 }
305 - else rrdset_next(st_mem_hwcorrupt);
293
294 rrddim_set_by_pointer(st_mem_hwcorrupt, rd_corrupted, HardwareCorrupted);
308 -
295 rrdset_done(st_mem_hwcorrupt);
296 }
297
312 - // --------------------------------------------------------------------
313 -
298 if(do_committed) {
299 static RRDSET *st_mem_committed = NULL;
300 static RRDDIM *rd_committed = NULL;
@@ -335,15 +319,11 @@ int do_proc_meminfo(int update_every, usec_t dt) {
319
320 rd_committed = rrddim_add(st_mem_committed, "Committed_AS", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
321 }
338 - else rrdset_next(st_mem_committed);
322
323 rrddim_set_by_pointer(st_mem_committed, rd_committed, Committed_AS);
341 -
324 rrdset_done(st_mem_committed);
325 }
326
345 - // --------------------------------------------------------------------
346 -
327 if(do_writeback) {
328 static RRDSET *st_mem_writeback = NULL;
329 static RRDDIM *rd_dirty = NULL, *rd_writeback = NULL, *rd_fusewriteback = NULL, *rd_nfs_writeback = NULL, *rd_bounce = NULL;
@@ -371,14 +351,12 @@ int do_proc_meminfo(int update_every, usec_t dt) {
351 rd_nfs_writeback = rrddim_add(st_mem_writeback, "NfsWriteback", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
352 rd_bounce = rrddim_add(st_mem_writeback, "Bounce", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
353 }
374 - else rrdset_next(st_mem_writeback);
354
355 rrddim_set_by_pointer(st_mem_writeback, rd_dirty, Dirty);
356 rrddim_set_by_pointer(st_mem_writeback, rd_writeback, Writeback);
357 rrddim_set_by_pointer(st_mem_writeback, rd_fusewriteback, WritebackTmp);
358 rrddim_set_by_pointer(st_mem_writeback, rd_nfs_writeback, NFS_Unstable);
359 rrddim_set_by_pointer(st_mem_writeback, rd_bounce, Bounce);
381 -
360 rrdset_done(st_mem_writeback);
361 }
362
@@ -414,7 +392,6 @@ int do_proc_meminfo(int update_every, usec_t dt) {
392 if (do_percpu)
393 rd_percpu = rrddim_add(st_mem_kernel, "Percpu", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
394 }
417 - else rrdset_next(st_mem_kernel);
395
396 rrddim_set_by_pointer(st_mem_kernel, rd_slab, Slab);
397 rrddim_set_by_pointer(st_mem_kernel, rd_kernelstack, KernelStack);
@@ -426,8 +403,6 @@ int do_proc_meminfo(int update_every, usec_t dt) {
403 rrdset_done(st_mem_kernel);
404 }
405
429 - // --------------------------------------------------------------------
430 -
406 if(do_slab) {
407 static RRDSET *st_mem_slab = NULL;
408 static RRDDIM *rd_reclaimable = NULL, *rd_unreclaimable = NULL;
@@ -453,16 +428,12 @@ int do_proc_meminfo(int update_every, usec_t dt) {
428 rd_reclaimable = rrddim_add(st_mem_slab, "reclaimable", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
429 rd_unreclaimable = rrddim_add(st_mem_slab, "unreclaimable", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
430 }
456 - else rrdset_next(st_mem_slab);
431
432 rrddim_set_by_pointer(st_mem_slab, rd_reclaimable, SReclaimable);
433 rrddim_set_by_pointer(st_mem_slab, rd_unreclaimable, SUnreclaim);
460 -
434 rrdset_done(st_mem_slab);
435 }
436
464 - // --------------------------------------------------------------------
465 -
437 if(do_hugepages == CONFIG_BOOLEAN_YES || (do_hugepages == CONFIG_BOOLEAN_AUTO &&
438 ((Hugepagesize && HugePages_Total) ||
439 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -494,18 +465,14 @@ int do_proc_meminfo(int update_every, usec_t dt) {
465 rd_surp = rrddim_add(st_mem_hugepages, "surplus", NULL, Hugepagesize, 1024, RRD_ALGORITHM_ABSOLUTE);
466 rd_rsvd = rrddim_add(st_mem_hugepages, "reserved", NULL, Hugepagesize, 1024, RRD_ALGORITHM_ABSOLUTE);
467 }
497 - else rrdset_next(st_mem_hugepages);
468
469 rrddim_set_by_pointer(st_mem_hugepages, rd_used, HugePages_Total - HugePages_Free - HugePages_Rsvd);
470 rrddim_set_by_pointer(st_mem_hugepages, rd_free, HugePages_Free);
471 rrddim_set_by_pointer(st_mem_hugepages, rd_rsvd, HugePages_Rsvd);
472 rrddim_set_by_pointer(st_mem_hugepages, rd_surp, HugePages_Surp);
503 -
473 rrdset_done(st_mem_hugepages);
474 }
475
507 - // --------------------------------------------------------------------
508 -
476 if(do_transparent_hugepages == CONFIG_BOOLEAN_YES || (do_transparent_hugepages == CONFIG_BOOLEAN_AUTO &&
477 (AnonHugePages ||
478 ShmemHugePages ||
@@ -536,11 +503,9 @@ int do_proc_meminfo(int update_every, usec_t dt) {
503 rd_anonymous = rrddim_add(st_mem_transparent_hugepages, "anonymous", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
504 rd_shared = rrddim_add(st_mem_transparent_hugepages, "shmem", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
505 }
539 - else rrdset_next(st_mem_transparent_hugepages);
506
507 rrddim_set_by_pointer(st_mem_transparent_hugepages, rd_anonymous, AnonHugePages);
508 rrddim_set_by_pointer(st_mem_transparent_hugepages, rd_shared, ShmemHugePages);
543 -
509 rrdset_done(st_mem_transparent_hugepages);
510 }
511
collectors/proc.plugin/proc_net_dev.c
-36
@@ -951,8 +951,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
951 // , d->rframe, d->tcollisions, d->tcarrier
952 // );
953
954 - // --------------------------------------------------------------------
955 -
954 if(unlikely(d->do_bandwidth == CONFIG_BOOLEAN_AUTO &&
955 (d->rbytes || d->tbytes || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
956 d->do_bandwidth = CONFIG_BOOLEAN_YES;
@@ -988,7 +986,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
986 d->rd_tbytes = td;
987 }
988 }
991 - else rrdset_next(d->st_bandwidth);
989
990 rrddim_set_by_pointer(d->st_bandwidth, d->rd_rbytes, (collected_number)d->rbytes);
991 rrddim_set_by_pointer(d->st_bandwidth, d->rd_tbytes, (collected_number)d->tbytes);
@@ -1048,7 +1045,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1045
1046 d->rd_speed = rrddim_add(d->st_speed, "speed", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1047 }
1051 - else rrdset_next(d->st_speed);
1048
1049 rrddim_set_by_pointer(d->st_speed, d->rd_speed, (collected_number)d->speed * KILOBITS_IN_A_MEGABIT);
1050 rrdset_done(d->st_speed);
@@ -1066,8 +1062,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1062 }
1063 }
1064
1069 - // --------------------------------------------------------------------
1070 -
1065 if(d->do_duplex != CONFIG_BOOLEAN_NO && d->filename_duplex) {
1066 if(unlikely(!d->st_duplex)) {
1067 d->st_duplex = rrdset_create_localhost(
@@ -1093,7 +1087,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1087 d->rd_duplex_half = rrddim_add(d->st_duplex, "half", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1088 d->rd_duplex_unknown = rrddim_add(d->st_duplex, "unknown", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1089 }
1096 - else rrdset_next(d->st_duplex);
1090
1091 rrddim_set_by_pointer(d->st_duplex, d->rd_duplex_full, (collected_number)(d->duplex == NETDEV_DUPLEX_FULL));
1092 rrddim_set_by_pointer(d->st_duplex, d->rd_duplex_half, (collected_number)(d->duplex == NETDEV_DUPLEX_HALF));
@@ -1101,8 +1094,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1094 rrdset_done(d->st_duplex);
1095 }
1096
1104 - // --------------------------------------------------------------------
1105 -
1097 if(d->do_operstate != CONFIG_BOOLEAN_NO && d->filename_operstate) {
1098 if(unlikely(!d->st_operstate)) {
1099 d->st_operstate = rrdset_create_localhost(
@@ -1132,7 +1123,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1123 d->rd_operstate_dormant = rrddim_add(d->st_operstate, "dormant", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1124 d->rd_operstate_unknown = rrddim_add(d->st_operstate, "unknown", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1125 }
1135 - else rrdset_next(d->st_operstate);
1126
1127 rrddim_set_by_pointer(d->st_operstate, d->rd_operstate_up, (collected_number)(d->operstate == NETDEV_OPERSTATE_UP));
1128 rrddim_set_by_pointer(d->st_operstate, d->rd_operstate_down, (collected_number)(d->operstate == NETDEV_OPERSTATE_DOWN));
@@ -1144,8 +1134,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1134 rrdset_done(d->st_operstate);
1135 }
1136
1147 - // --------------------------------------------------------------------
1148 -
1137 if(d->do_carrier != CONFIG_BOOLEAN_NO && d->carrier_file_exists) {
1138 if(unlikely(!d->st_carrier)) {
1139 d->st_carrier = rrdset_create_localhost(
@@ -1170,15 +1158,12 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1158 d->rd_carrier_up = rrddim_add(d->st_carrier, "up", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1159 d->rd_carrier_down = rrddim_add(d->st_carrier, "down", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1160 }
1173 - else rrdset_next(d->st_carrier);
1161
1162 rrddim_set_by_pointer(d->st_carrier, d->rd_carrier_up, (collected_number)(d->carrier == 1));
1163 rrddim_set_by_pointer(d->st_carrier, d->rd_carrier_down, (collected_number)(d->carrier != 1));
1164 rrdset_done(d->st_carrier);
1165 }
1166
1180 - // --------------------------------------------------------------------
1181 -
1167 if(d->do_mtu != CONFIG_BOOLEAN_NO && d->filename_mtu) {
1168 if(unlikely(!d->st_mtu)) {
1169 d->st_mtu = rrdset_create_localhost(
@@ -1202,14 +1187,11 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1187
1188 d->rd_mtu = rrddim_add(d->st_mtu, "mtu", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1189 }
1205 - else rrdset_next(d->st_mtu);
1190
1191 rrddim_set_by_pointer(d->st_mtu, d->rd_mtu, (collected_number)d->mtu);
1192 rrdset_done(d->st_mtu);
1193 }
1194
1211 - // --------------------------------------------------------------------
1212 -
1195 if(unlikely(d->do_packets == CONFIG_BOOLEAN_AUTO &&
1196 (d->rpackets || d->tpackets || d->rmulticast || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1197 d->do_packets = CONFIG_BOOLEAN_YES;
@@ -1248,7 +1230,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1230 d->rd_tpackets = td;
1231 }
1232 }
1251 - else rrdset_next(d->st_packets);
1233
1234 rrddim_set_by_pointer(d->st_packets, d->rd_rpackets, (collected_number)d->rpackets);
1235 rrddim_set_by_pointer(d->st_packets, d->rd_tpackets, (collected_number)d->tpackets);
@@ -1256,8 +1237,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1237 rrdset_done(d->st_packets);
1238 }
1239
1259 - // --------------------------------------------------------------------
1260 -
1240 if(unlikely(d->do_errors == CONFIG_BOOLEAN_AUTO &&
1241 (d->rerrors || d->terrors || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1242 d->do_errors = CONFIG_BOOLEAN_YES;
@@ -1295,15 +1274,12 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1274 d->rd_terrors = td;
1275 }
1276 }
1298 - else rrdset_next(d->st_errors);
1277
1278 rrddim_set_by_pointer(d->st_errors, d->rd_rerrors, (collected_number)d->rerrors);
1279 rrddim_set_by_pointer(d->st_errors, d->rd_terrors, (collected_number)d->terrors);
1280 rrdset_done(d->st_errors);
1281 }
1282
1305 - // --------------------------------------------------------------------
1306 -
1283 if(unlikely(d->do_drops == CONFIG_BOOLEAN_AUTO &&
1284 (d->rdrops || d->tdrops || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1285 d->do_drops = CONFIG_BOOLEAN_YES;
@@ -1341,15 +1317,12 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1317 d->rd_tdrops = td;
1318 }
1319 }
1344 - else rrdset_next(d->st_drops);
1320
1321 rrddim_set_by_pointer(d->st_drops, d->rd_rdrops, (collected_number)d->rdrops);
1322 rrddim_set_by_pointer(d->st_drops, d->rd_tdrops, (collected_number)d->tdrops);
1323 rrdset_done(d->st_drops);
1324 }
1325
1351 - // --------------------------------------------------------------------
1352 -
1326 if(unlikely(d->do_fifo == CONFIG_BOOLEAN_AUTO &&
1327 (d->rfifo || d->tfifo || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1328 d->do_fifo = CONFIG_BOOLEAN_YES;
@@ -1387,15 +1360,12 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1360 d->rd_tfifo = td;
1361 }
1362 }
1390 - else rrdset_next(d->st_fifo);
1363
1364 rrddim_set_by_pointer(d->st_fifo, d->rd_rfifo, (collected_number)d->rfifo);
1365 rrddim_set_by_pointer(d->st_fifo, d->rd_tfifo, (collected_number)d->tfifo);
1366 rrdset_done(d->st_fifo);
1367 }
1368
1397 - // --------------------------------------------------------------------
1398 -
1369 if(unlikely(d->do_compressed == CONFIG_BOOLEAN_AUTO &&
1370 (d->rcompressed || d->tcompressed || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1371 d->do_compressed = CONFIG_BOOLEAN_YES;
@@ -1433,15 +1403,12 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1403 d->rd_tcompressed = td;
1404 }
1405 }
1436 - else rrdset_next(d->st_compressed);
1406
1407 rrddim_set_by_pointer(d->st_compressed, d->rd_rcompressed, (collected_number)d->rcompressed);
1408 rrddim_set_by_pointer(d->st_compressed, d->rd_tcompressed, (collected_number)d->tcompressed);
1409 rrdset_done(d->st_compressed);
1410 }
1411
1443 - // --------------------------------------------------------------------
1444 -
1412 if(unlikely(d->do_events == CONFIG_BOOLEAN_AUTO &&
1413 (d->rframe || d->tcollisions || d->tcarrier || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1414 d->do_events = CONFIG_BOOLEAN_YES;
@@ -1472,7 +1439,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1439 d->rd_tcollisions = rrddim_add(d->st_events, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1440 d->rd_tcarrier = rrddim_add(d->st_events, "carrier", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1441 }
1475 - else rrdset_next(d->st_events);
1442
1443 rrddim_set_by_pointer(d->st_events, d->rd_rframe, (collected_number)d->rframe);
1444 rrddim_set_by_pointer(d->st_events, d->rd_tcollisions, (collected_number)d->tcollisions);
@@ -1507,8 +1473,6 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1473 rd_in = rrddim_add(st_system_net, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
1474 rd_out = rrddim_add(st_system_net, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
1475 }
1510 - else
1511 - rrdset_next(st_system_net);
1476
1477 rrddim_set_by_pointer(st_system_net, rd_in, (collected_number)system_rbytes);
1478 rrddim_set_by_pointer(st_system_net, rd_out, (collected_number)system_tbytes);
collectors/proc.plugin/proc_net_ip_vs_stats.c
-10
@@ -39,9 +39,6 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
39 InBytes = strtoull(procfile_lineword(ff, 2, 3), NULL, 16);
40 OutBytes = strtoull(procfile_lineword(ff, 2, 4), NULL, 16);
41
42 -
43 - // --------------------------------------------------------------------
44 -
42 if(do_sockets) {
43 static RRDSET *st = NULL;
44
@@ -63,14 +60,11 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
60
61 rrddim_add(st, "connections", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
62 }
66 - else rrdset_next(st);
63
64 rrddim_set(st, "connections", entries);
65 rrdset_done(st);
66 }
67
72 - // --------------------------------------------------------------------
73 -
68 if(do_packets) {
69 static RRDSET *st = NULL;
70 if(unlikely(!st)) {
@@ -92,15 +86,12 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
86 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
87 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
88 }
95 - else rrdset_next(st);
89
90 rrddim_set(st, "received", InPackets);
91 rrddim_set(st, "sent", OutPackets);
92 rrdset_done(st);
93 }
94
102 - // --------------------------------------------------------------------
103 -
95 if(do_bandwidth) {
96 static RRDSET *st = NULL;
97 if(unlikely(!st)) {
@@ -122,7 +113,6 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
113 rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
114 rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
115 }
125 - else rrdset_next(st);
116
117 rrddim_set(st, "received", InBytes);
118 rrddim_set(st, "sent", OutBytes);
collectors/proc.plugin/proc_net_netstat.c
-170
@@ -889,8 +889,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
889
890 // netstat IpExt charts
891
892 - // --------------------------------------------------------------------
893 -
892 if(do_bandwidth == CONFIG_BOOLEAN_YES || (do_bandwidth == CONFIG_BOOLEAN_AUTO &&
893 (ipext_InOctets ||
894 ipext_OutOctets ||
@@ -918,17 +916,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
916 rd_in = rrddim_add(st_system_ip, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
917 rd_out = rrddim_add(st_system_ip, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
918 }
921 - else
922 - rrdset_next(st_system_ip);
919
920 rrddim_set_by_pointer(st_system_ip, rd_in, ipext_InOctets);
921 rrddim_set_by_pointer(st_system_ip, rd_out, ipext_OutOctets);
926 -
922 rrdset_done(st_system_ip);
923 }
924
930 - // --------------------------------------------------------------------
931 -
925 if(do_inerrors == CONFIG_BOOLEAN_YES || (do_inerrors == CONFIG_BOOLEAN_AUTO &&
926 (ipext_InNoRoutes ||
927 ipext_InTruncatedPkts ||
@@ -959,18 +952,13 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
952 rd_truncated = rrddim_add(st_ip_inerrors, "InTruncatedPkts", "truncated", 1, 1, RRD_ALGORITHM_INCREMENTAL);
953 rd_checksum = rrddim_add(st_ip_inerrors, "InCsumErrors", "checksum", 1, 1, RRD_ALGORITHM_INCREMENTAL);
954 }
962 - else
963 - rrdset_next(st_ip_inerrors);
955
956 rrddim_set_by_pointer(st_ip_inerrors, rd_noroutes, ipext_InNoRoutes);
957 rrddim_set_by_pointer(st_ip_inerrors, rd_truncated, ipext_InTruncatedPkts);
958 rrddim_set_by_pointer(st_ip_inerrors, rd_checksum, ipext_InCsumErrors);
968 -
959 rrdset_done(st_ip_inerrors);
960 }
961
972 - // --------------------------------------------------------------------
973 -
962 if(do_mcast == CONFIG_BOOLEAN_YES || (do_mcast == CONFIG_BOOLEAN_AUTO &&
963 (ipext_InMcastOctets ||
964 ipext_OutMcastOctets ||
@@ -1000,8 +988,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
988 rd_in = rrddim_add(st_ip_mcast, "InMcastOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
989 rd_out = rrddim_add(st_ip_mcast, "OutMcastOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
990 }
1003 - else
1004 - rrdset_next(st_ip_mcast);
991
992 rrddim_set_by_pointer(st_ip_mcast, rd_in, ipext_InMcastOctets);
993 rrddim_set_by_pointer(st_ip_mcast, rd_out, ipext_OutMcastOctets);
@@ -1041,8 +1027,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1027 rd_in = rrddim_add(st_ip_bcast, "InBcastOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
1028 rd_out = rrddim_add(st_ip_bcast, "OutBcastOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
1029 }
1044 - else
1045 - rrdset_next(st_ip_bcast);
1030
1031 rrddim_set_by_pointer(st_ip_bcast, rd_in, ipext_InBcastOctets);
1032 rrddim_set_by_pointer(st_ip_bcast, rd_out, ipext_OutBcastOctets);
@@ -1082,16 +1066,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1066 rd_in = rrddim_add(st_ip_mcastpkts, "InMcastPkts", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1067 rd_out = rrddim_add(st_ip_mcastpkts, "OutMcastPkts", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1068 }
1085 - else rrdset_next(st_ip_mcastpkts);
1069
1070 rrddim_set_by_pointer(st_ip_mcastpkts, rd_in, ipext_InMcastPkts);
1071 rrddim_set_by_pointer(st_ip_mcastpkts, rd_out, ipext_OutMcastPkts);
1089 -
1072 rrdset_done(st_ip_mcastpkts);
1073 }
1074
1093 - // --------------------------------------------------------------------
1094 -
1075 if(do_bcast_p == CONFIG_BOOLEAN_YES || (do_bcast_p == CONFIG_BOOLEAN_AUTO &&
1076 (ipext_InBcastPkts ||
1077 ipext_OutBcastPkts ||
@@ -1122,17 +1102,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1102 rd_in = rrddim_add(st_ip_bcastpkts, "InBcastPkts", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1103 rd_out = rrddim_add(st_ip_bcastpkts, "OutBcastPkts", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1104 }
1125 - else
1126 - rrdset_next(st_ip_bcastpkts);
1105
1106 rrddim_set_by_pointer(st_ip_bcastpkts, rd_in, ipext_InBcastPkts);
1107 rrddim_set_by_pointer(st_ip_bcastpkts, rd_out, ipext_OutBcastPkts);
1130 -
1108 rrdset_done(st_ip_bcastpkts);
1109 }
1110
1134 - // --------------------------------------------------------------------
1135 -
1111 if(do_ecn == CONFIG_BOOLEAN_YES || (do_ecn == CONFIG_BOOLEAN_AUTO &&
1112 (ipext_InCEPkts ||
1113 ipext_InECT0Pkts ||
@@ -1167,20 +1142,16 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1142 rd_ectp0 = rrddim_add(st_ecnpkts, "InECT0Pkts", "ECTP0", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1143 rd_ectp1 = rrddim_add(st_ecnpkts, "InECT1Pkts", "ECTP1", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1144 }
1170 - else rrdset_next(st_ecnpkts);
1145
1146 rrddim_set_by_pointer(st_ecnpkts, rd_cep, ipext_InCEPkts);
1147 rrddim_set_by_pointer(st_ecnpkts, rd_noectp, ipext_InNoECTPkts);
1148 rrddim_set_by_pointer(st_ecnpkts, rd_ectp0, ipext_InECT0Pkts);
1149 rrddim_set_by_pointer(st_ecnpkts, rd_ectp1, ipext_InECT1Pkts);
1176 -
1150 rrdset_done(st_ecnpkts);
1151 }
1152
1153 // netstat TcpExt charts
1154
1182 - // --------------------------------------------------------------------
1183 -
1155 if(do_tcpext_memory == CONFIG_BOOLEAN_YES || (do_tcpext_memory == CONFIG_BOOLEAN_AUTO &&
1156 (tcpext_TCPMemoryPressures ||
1157 netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
@@ -1207,16 +1178,11 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1178
1179 rd_pressures = rrddim_add(st_tcpmemorypressures, "TCPMemoryPressures", "pressures", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1180 }
1210 - else
1211 - rrdset_next(st_tcpmemorypressures);
1181
1182 rrddim_set_by_pointer(st_tcpmemorypressures, rd_pressures, tcpext_TCPMemoryPressures);
1214 -
1183 rrdset_done(st_tcpmemorypressures);
1184 }
1185
1218 - // --------------------------------------------------------------------
1219 -
1186 if(do_tcpext_connaborts == CONFIG_BOOLEAN_YES || (do_tcpext_connaborts == CONFIG_BOOLEAN_AUTO &&
1187 (tcpext_TCPAbortOnData ||
1188 tcpext_TCPAbortOnClose ||
@@ -1253,8 +1219,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1219 rd_linger = rrddim_add(st_tcpconnaborts, "TCPAbortOnLinger", "linger", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1220 rd_failed = rrddim_add(st_tcpconnaborts, "TCPAbortFailed", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1221 }
1256 - else
1257 - rrdset_next(st_tcpconnaborts);
1222
1223 rrddim_set_by_pointer(st_tcpconnaborts, rd_baddata, tcpext_TCPAbortOnData);
1224 rrddim_set_by_pointer(st_tcpconnaborts, rd_userclosed, tcpext_TCPAbortOnClose);
@@ -1262,12 +1226,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1226 rrddim_set_by_pointer(st_tcpconnaborts, rd_timeout, tcpext_TCPAbortOnTimeout);
1227 rrddim_set_by_pointer(st_tcpconnaborts, rd_linger, tcpext_TCPAbortOnLinger);
1228 rrddim_set_by_pointer(st_tcpconnaborts, rd_failed, tcpext_TCPAbortFailed);
1265 -
1229 rrdset_done(st_tcpconnaborts);
1230 }
1231
1269 - // --------------------------------------------------------------------
1270 -
1232 if(do_tcpext_reorder == CONFIG_BOOLEAN_YES || (do_tcpext_reorder == CONFIG_BOOLEAN_AUTO &&
1233 (tcpext_TCPRenoReorder ||
1234 tcpext_TCPFACKReorder ||
@@ -1300,14 +1261,11 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1261 rd_fack = rrddim_add(st_tcpreorders, "TCPFACKReorder", "fack", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1262 rd_reno = rrddim_add(st_tcpreorders, "TCPRenoReorder", "reno", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1263 }
1303 - else
1304 - rrdset_next(st_tcpreorders);
1264
1265 rrddim_set_by_pointer(st_tcpreorders, rd_timestamp, tcpext_TCPTSReorder);
1266 rrddim_set_by_pointer(st_tcpreorders, rd_sack, tcpext_TCPSACKReorder);
1267 rrddim_set_by_pointer(st_tcpreorders, rd_fack, tcpext_TCPFACKReorder);
1268 rrddim_set_by_pointer(st_tcpreorders, rd_reno, tcpext_TCPRenoReorder);
1310 -
1269 rrdset_done(st_tcpreorders);
1270 }
1271
@@ -1345,19 +1303,14 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1303 rd_merged = rrddim_add(st_ip_tcpofo, "TCPOFOMerge", "merged", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1304 rd_pruned = rrddim_add(st_ip_tcpofo, "OfoPruned", "pruned", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1305 }
1348 - else
1349 - rrdset_next(st_ip_tcpofo);
1306
1307 rrddim_set_by_pointer(st_ip_tcpofo, rd_inqueue, tcpext_TCPOFOQueue);
1308 rrddim_set_by_pointer(st_ip_tcpofo, rd_dropped, tcpext_TCPOFODrop);
1309 rrddim_set_by_pointer(st_ip_tcpofo, rd_merged, tcpext_TCPOFOMerge);
1310 rrddim_set_by_pointer(st_ip_tcpofo, rd_pruned, tcpext_OfoPruned);
1355 -
1311 rrdset_done(st_ip_tcpofo);
1312 }
1313
1359 - // --------------------------------------------------------------------
1360 -
1314 if(do_tcpext_syscookies == CONFIG_BOOLEAN_YES || (do_tcpext_syscookies == CONFIG_BOOLEAN_AUTO &&
1315 (tcpext_SyncookiesSent ||
1316 tcpext_SyncookiesRecv ||
@@ -1389,18 +1342,13 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1342 rd_sent = rrddim_add(st_syncookies, "SyncookiesSent", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1343 rd_failed = rrddim_add(st_syncookies, "SyncookiesFailed", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1344 }
1392 - else
1393 - rrdset_next(st_syncookies);
1345
1346 rrddim_set_by_pointer(st_syncookies, rd_received, tcpext_SyncookiesRecv);
1347 rrddim_set_by_pointer(st_syncookies, rd_sent, tcpext_SyncookiesSent);
1348 rrddim_set_by_pointer(st_syncookies, rd_failed, tcpext_SyncookiesFailed);
1398 -
1349 rrdset_done(st_syncookies);
1350 }
1351
1402 - // --------------------------------------------------------------------
1403 -
1352 if(do_tcpext_syn_queue == CONFIG_BOOLEAN_YES || (do_tcpext_syn_queue == CONFIG_BOOLEAN_AUTO &&
1353 (tcpext_TCPReqQFullDrop ||
1354 tcpext_TCPReqQFullDoCookies ||
@@ -1432,17 +1380,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1380 rd_TCPReqQFullDrop = rrddim_add(st_syn_queue, "TCPReqQFullDrop", "drops", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1381 rd_TCPReqQFullDoCookies = rrddim_add(st_syn_queue, "TCPReqQFullDoCookies", "cookies", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1382 }
1435 - else
1436 - rrdset_next(st_syn_queue);
1383
1384 rrddim_set_by_pointer(st_syn_queue, rd_TCPReqQFullDrop, tcpext_TCPReqQFullDrop);
1385 rrddim_set_by_pointer(st_syn_queue, rd_TCPReqQFullDoCookies, tcpext_TCPReqQFullDoCookies);
1440 -
1386 rrdset_done(st_syn_queue);
1387 }
1388
1444 - // --------------------------------------------------------------------
1445 -
1389 if(do_tcpext_accept_queue == CONFIG_BOOLEAN_YES || (do_tcpext_accept_queue == CONFIG_BOOLEAN_AUTO &&
1390 (tcpext_ListenOverflows ||
1391 tcpext_ListenDrops ||
@@ -1473,19 +1416,14 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1416 rd_overflows = rrddim_add(st_accept_queue, "ListenOverflows", "overflows", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1417 rd_drops = rrddim_add(st_accept_queue, "ListenDrops", "drops", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1418 }
1476 - else
1477 - rrdset_next(st_accept_queue);
1419
1420 rrddim_set_by_pointer(st_accept_queue, rd_overflows, tcpext_ListenOverflows);
1421 rrddim_set_by_pointer(st_accept_queue, rd_drops, tcpext_ListenDrops);
1481 -
1422 rrdset_done(st_accept_queue);
1423 }
1424
1425 // snmp Ip charts
1426
1487 - // --------------------------------------------------------------------
1488 -
1427 if(do_ip_packets == CONFIG_BOOLEAN_YES || (do_ip_packets == CONFIG_BOOLEAN_AUTO &&
1428 (snmp_root.ip_OutRequests ||
1429 snmp_root.ip_InReceives ||
@@ -1521,7 +1459,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1459 rd_ForwDatagrams = rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1460 rd_InDelivers = rrddim_add(st, "InDelivers", "delivered", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1461 }
1524 - else rrdset_next(st);
1462
1463 rrddim_set_by_pointer(st, rd_OutRequests, (collected_number)snmp_root.ip_OutRequests);
1464 rrddim_set_by_pointer(st, rd_InReceives, (collected_number)snmp_root.ip_InReceives);
@@ -1530,8 +1467,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1467 rrdset_done(st);
1468 }
1469
1533 - // --------------------------------------------------------------------
1534 -
1470 if(do_ip_fragsout == CONFIG_BOOLEAN_YES || (do_ip_fragsout == CONFIG_BOOLEAN_AUTO &&
1471 (snmp_root.ip_FragOKs ||
1472 snmp_root.ip_FragFails ||
@@ -1565,7 +1500,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1500 rd_FragFails = rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1501 rd_FragCreates = rrddim_add(st, "FragCreates", "created", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1502 }
1568 - else rrdset_next(st);
1503
1504 rrddim_set_by_pointer(st, rd_FragOKs, (collected_number)snmp_root.ip_FragOKs);
1505 rrddim_set_by_pointer(st, rd_FragFails, (collected_number)snmp_root.ip_FragFails);
@@ -1573,8 +1507,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1507 rrdset_done(st);
1508 }
1509
1576 - // --------------------------------------------------------------------
1577 -
1510 if(do_ip_fragsin == CONFIG_BOOLEAN_YES || (do_ip_fragsin == CONFIG_BOOLEAN_AUTO &&
1511 (snmp_root.ip_ReasmOKs ||
1512 snmp_root.ip_ReasmFails ||
@@ -1608,7 +1540,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1540 rd_ReasmFails = rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1541 rd_ReasmReqds = rrddim_add(st, "ReasmReqds", "all", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1542 }
1611 - else rrdset_next(st);
1543
1544 rrddim_set_by_pointer(st, rd_ReasmOKs, (collected_number)snmp_root.ip_ReasmOKs);
1545 rrddim_set_by_pointer(st, rd_ReasmFails, (collected_number)snmp_root.ip_ReasmFails);
@@ -1616,8 +1547,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1547 rrdset_done(st);
1548 }
1549
1619 - // --------------------------------------------------------------------
1620 -
1550 if(do_ip_errors == CONFIG_BOOLEAN_YES || (do_ip_errors == CONFIG_BOOLEAN_AUTO &&
1551 (snmp_root.ip_InDiscards ||
1552 snmp_root.ip_OutDiscards ||
@@ -1662,7 +1591,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1591 rd_InAddrErrors = rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1592 rd_InUnknownProtos = rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1593 }
1665 - else rrdset_next(st);
1594
1595 rrddim_set_by_pointer(st, rd_InDiscards, (collected_number)snmp_root.ip_InDiscards);
1596 rrddim_set_by_pointer(st, rd_OutDiscards, (collected_number)snmp_root.ip_OutDiscards);
@@ -1675,8 +1603,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1603
1604 // snmp Icmp charts
1605
1678 - // --------------------------------------------------------------------
1679 -
1606 if(do_icmp_packets == CONFIG_BOOLEAN_YES || (do_icmp_packets == CONFIG_BOOLEAN_AUTO &&
1607 (snmp_root.icmp_InMsgs ||
1608 snmp_root.icmp_OutMsgs ||
@@ -1710,11 +1636,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1636 rd_InMsgs = rrddim_add(st_packets, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1637 rd_OutMsgs = rrddim_add(st_packets, "OutMsgs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1638 }
1713 - else rrdset_next(st_packets);
1639
1640 rrddim_set_by_pointer(st_packets, rd_InMsgs, (collected_number)snmp_root.icmp_InMsgs);
1641 rrddim_set_by_pointer(st_packets, rd_OutMsgs, (collected_number)snmp_root.icmp_OutMsgs);
1717 -
1642 rrdset_done(st_packets);
1643 }
1644
@@ -1744,20 +1668,16 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1668 rd_OutErrors = rrddim_add(st_errors, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1669 rd_InCsumErrors = rrddim_add(st_errors, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1670 }
1747 - else rrdset_next(st_errors);
1671
1672 rrddim_set_by_pointer(st_errors, rd_InErrors, (collected_number)snmp_root.icmp_InErrors);
1673 rrddim_set_by_pointer(st_errors, rd_OutErrors, (collected_number)snmp_root.icmp_OutErrors);
1674 rrddim_set_by_pointer(st_errors, rd_InCsumErrors, (collected_number)snmp_root.icmp_InCsumErrors);
1752 -
1675 rrdset_done(st_errors);
1676 }
1677 }
1678
1679 // snmp IcmpMsg charts
1680
1759 - // --------------------------------------------------------------------
1760 -
1681 if(do_icmpmsg == CONFIG_BOOLEAN_YES || (do_icmpmsg == CONFIG_BOOLEAN_AUTO &&
1682 (snmp_root.icmpmsg_InEchoReps ||
1683 snmp_root.icmpmsg_OutEchoReps ||
@@ -1841,7 +1761,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1761 rd_InTimestampReps = rrddim_add(st, "InType14", "InTimestampReps", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1762 rd_OutTimestampReps = rrddim_add(st, "OutType14", "OutTimestampReps", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1763 }
1844 - else rrdset_next(st);
1764
1765 rrddim_set_by_pointer(st, rd_InEchoReps, (collected_number)snmp_root.icmpmsg_InEchoReps);
1766 rrddim_set_by_pointer(st, rd_OutEchoReps, (collected_number)snmp_root.icmpmsg_OutEchoReps);
@@ -1869,13 +1788,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1788
1789 // snmp Tcp charts
1790
1872 - // --------------------------------------------------------------------
1873 -
1791 // this is smart enough to update it, only when it is changed
1792 rrdvar_custom_host_variable_set(localhost, tcp_max_connections_var, snmp_root.tcp_MaxConn);
1793
1877 - // --------------------------------------------------------------------
1878 -
1794 // see http://net-snmp.sourceforge.net/docs/mibs/tcp.html
1795 if(do_tcp_sockets == CONFIG_BOOLEAN_YES || (do_tcp_sockets == CONFIG_BOOLEAN_AUTO &&
1796 (snmp_root.tcp_CurrEstab ||
@@ -1903,14 +1818,11 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1818
1819 rd_CurrEstab = rrddim_add(st, "CurrEstab", "connections", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1820 }
1906 - else rrdset_next(st);
1821
1822 rrddim_set_by_pointer(st, rd_CurrEstab, (collected_number)snmp_root.tcp_CurrEstab);
1823 rrdset_done(st);
1824 }
1825
1912 - // --------------------------------------------------------------------
1913 -
1826 if(do_tcp_packets == CONFIG_BOOLEAN_YES || (do_tcp_packets == CONFIG_BOOLEAN_AUTO &&
1827 (snmp_root.tcp_InSegs ||
1828 snmp_root.tcp_OutSegs ||
@@ -1940,7 +1852,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1852 rd_InSegs = rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1853 rd_OutSegs = rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1854 }
1943 - else rrdset_next(st);
1855
1856 rrddim_set_by_pointer(st, rd_InSegs, (collected_number)snmp_root.tcp_InSegs);
1857 rrddim_set_by_pointer(st, rd_OutSegs, (collected_number)snmp_root.tcp_OutSegs);
@@ -1982,7 +1893,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1893 rd_InCsumErrors = rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1894 rd_RetransSegs = rrddim_add(st, "RetransSegs", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1895 }
1985 - else rrdset_next(st);
1896
1897 rrddim_set_by_pointer(st, rd_InErrs, (collected_number)snmp_root.tcp_InErrs);
1898 rrddim_set_by_pointer(st, rd_InCsumErrors, (collected_number)snmp_root.tcp_InCsumErrors);
@@ -1990,8 +1900,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1900 rrdset_done(st);
1901 }
1902
1993 - // --------------------------------------------------------------------
1994 -
1903 if(do_tcp_opens == CONFIG_BOOLEAN_YES || (do_tcp_opens == CONFIG_BOOLEAN_AUTO &&
1904 (snmp_root.tcp_ActiveOpens ||
1905 snmp_root.tcp_PassiveOpens ||
@@ -2022,15 +1930,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1930 rd_ActiveOpens = rrddim_add(st, "ActiveOpens", "active", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1931 rd_PassiveOpens = rrddim_add(st, "PassiveOpens", "passive", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1932 }
2025 - else rrdset_next(st);
1933
1934 rrddim_set_by_pointer(st, rd_ActiveOpens, (collected_number)snmp_root.tcp_ActiveOpens);
1935 rrddim_set_by_pointer(st, rd_PassiveOpens, (collected_number)snmp_root.tcp_PassiveOpens);
1936 rrdset_done(st);
1937 }
1938
2032 - // --------------------------------------------------------------------
2033 -
1939 if(do_tcp_handshake == CONFIG_BOOLEAN_YES || (do_tcp_handshake == CONFIG_BOOLEAN_AUTO &&
1940 (snmp_root.tcp_EstabResets ||
1941 snmp_root.tcp_OutRsts ||
@@ -2066,7 +1971,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1971 rd_AttemptFails = rrddim_add(st, "AttemptFails", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1972 rd_TCPSynRetrans = rrddim_add(st, "TCPSynRetrans", "SynRetrans", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1973 }
2069 - else rrdset_next(st);
1974
1975 rrddim_set_by_pointer(st, rd_EstabResets, (collected_number)snmp_root.tcp_EstabResets);
1976 rrddim_set_by_pointer(st, rd_OutRsts, (collected_number)snmp_root.tcp_OutRsts);
@@ -2077,8 +1981,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1981
1982 // snmp Udp charts
1983
2080 - // --------------------------------------------------------------------
2081 -
1984 // see http://net-snmp.sourceforge.net/docs/mibs/udp.html
1985 if(do_udp_packets == CONFIG_BOOLEAN_YES || (do_udp_packets == CONFIG_BOOLEAN_AUTO &&
1986 (snmp_root.udp_InDatagrams ||
@@ -2109,7 +2011,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2011 rd_InDatagrams = rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2012 rd_OutDatagrams = rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2013 }
2112 - else rrdset_next(st);
2014
2015 rrddim_set_by_pointer(st, rd_InDatagrams, (collected_number)snmp_root.udp_InDatagrams);
2016 rrddim_set_by_pointer(st, rd_OutDatagrams, (collected_number)snmp_root.udp_OutDatagrams);
@@ -2160,7 +2061,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2061 rd_InCsumErrors = rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2062 rd_IgnoredMulti = rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2063 }
2163 - else rrdset_next(st);
2064
2065 rrddim_set_by_pointer(st, rd_InErrors, (collected_number)snmp_root.udp_InErrors);
2066 rrddim_set_by_pointer(st, rd_NoPorts, (collected_number)snmp_root.udp_NoPorts);
@@ -2173,8 +2073,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2073
2074 // snmp UdpLite charts
2075
2176 - // --------------------------------------------------------------------
2177 -
2076 if(do_udplite_packets == CONFIG_BOOLEAN_YES || (do_udplite_packets == CONFIG_BOOLEAN_AUTO &&
2077 (snmp_root.udplite_InDatagrams ||
2078 snmp_root.udplite_OutDatagrams ||
@@ -2211,7 +2109,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2109 rd_InDatagrams = rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2110 rd_OutDatagrams = rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2111 }
2214 - else rrdset_next(st);
2112
2113 rrddim_set_by_pointer(st, rd_InDatagrams, (collected_number)snmp_root.udplite_InDatagrams);
2114 rrddim_set_by_pointer(st, rd_OutDatagrams, (collected_number)snmp_root.udplite_OutDatagrams);
@@ -2249,7 +2146,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2146 rd_InCsumErrors = rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2147 rd_IgnoredMulti = rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2148 }
2252 - else rrdset_next(st);
2149
2150 rrddim_set_by_pointer(st, rd_NoPorts, (collected_number)snmp_root.udplite_NoPorts);
2151 rrddim_set_by_pointer(st, rd_InErrors, (collected_number)snmp_root.udplite_InErrors);
@@ -2263,8 +2159,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2159
2160 // snmp6 charts
2161
2266 - // --------------------------------------------------------------------
2267 -
2162 if(do_ip6_bandwidth == CONFIG_BOOLEAN_YES || (do_ip6_bandwidth == CONFIG_BOOLEAN_AUTO &&
2163 (Ip6InOctets ||
2164 Ip6OutOctets ||
@@ -2293,15 +2187,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2187 rd_received = rrddim_add(st, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
2188 rd_sent = rrddim_add(st, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
2189 }
2296 - else rrdset_next(st);
2190
2191 rrddim_set_by_pointer(st, rd_received, Ip6InOctets);
2192 rrddim_set_by_pointer(st, rd_sent, Ip6OutOctets);
2193 rrdset_done(st);
2194 }
2195
2303 - // --------------------------------------------------------------------
2304 -
2196 if(do_ip6_packets == CONFIG_BOOLEAN_YES || (do_ip6_packets == CONFIG_BOOLEAN_AUTO &&
2197 (Ip6InReceives ||
2198 Ip6OutRequests ||
@@ -2336,7 +2227,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2227 rd_forwarded = rrddim_add(st, "OutForwDatagrams", "forwarded", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2228 rd_delivers = rrddim_add(st, "InDelivers", "delivers", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2229 }
2339 - else rrdset_next(st);
2230
2231 rrddim_set_by_pointer(st, rd_received, Ip6InReceives);
2232 rrddim_set_by_pointer(st, rd_sent, Ip6OutRequests);
@@ -2345,8 +2235,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2235 rrdset_done(st);
2236 }
2237
2348 - // --------------------------------------------------------------------
2349 -
2238 if(do_ip6_fragsout == CONFIG_BOOLEAN_YES || (do_ip6_fragsout == CONFIG_BOOLEAN_AUTO &&
2239 (Ip6FragOKs ||
2240 Ip6FragFails ||
@@ -2379,7 +2267,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2267 rd_failed = rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2268 rd_all = rrddim_add(st, "FragCreates", "all", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2269 }
2382 - else rrdset_next(st);
2270
2271 rrddim_set_by_pointer(st, rd_ok, Ip6FragOKs);
2272 rrddim_set_by_pointer(st, rd_failed, Ip6FragFails);
@@ -2387,8 +2274,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2274 rrdset_done(st);
2275 }
2276
2390 - // --------------------------------------------------------------------
2391 -
2277 if(do_ip6_fragsin == CONFIG_BOOLEAN_YES || (do_ip6_fragsin == CONFIG_BOOLEAN_AUTO &&
2278 (Ip6ReasmOKs ||
2279 Ip6ReasmFails ||
@@ -2424,7 +2309,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2309 rd_timeout = rrddim_add(st, "ReasmTimeout", "timeout", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2310 rd_all = rrddim_add(st, "ReasmReqds", "all", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2311 }
2427 - else rrdset_next(st);
2312
2313 rrddim_set_by_pointer(st, rd_ok, Ip6ReasmOKs);
2314 rrddim_set_by_pointer(st, rd_failed, Ip6ReasmFails);
@@ -2433,8 +2317,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2317 rrdset_done(st);
2318 }
2319
2436 - // --------------------------------------------------------------------
2437 -
2320 if(do_ip6_errors == CONFIG_BOOLEAN_YES || (do_ip6_errors == CONFIG_BOOLEAN_AUTO &&
2321 (Ip6InDiscards ||
2322 Ip6OutDiscards ||
@@ -2484,7 +2366,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2366 rd_InNoRoutes = rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2367 rd_OutNoRoutes = rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2368 }
2487 - else rrdset_next(st);
2369
2370 rrddim_set_by_pointer(st, rd_InDiscards, Ip6InDiscards);
2371 rrddim_set_by_pointer(st, rd_OutDiscards, Ip6OutDiscards);
@@ -2498,8 +2379,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2379 rrdset_done(st);
2380 }
2381
2501 - // --------------------------------------------------------------------
2502 -
2382 if(do_ip6_udp_packets == CONFIG_BOOLEAN_YES || (do_ip6_udp_packets == CONFIG_BOOLEAN_AUTO &&
2383 (Udp6InDatagrams ||
2384 Udp6OutDatagrams ||
@@ -2528,15 +2407,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2407 rd_received = rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2408 rd_sent = rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2409 }
2531 - else rrdset_next(st);
2410
2411 rrddim_set_by_pointer(st, rd_received, Udp6InDatagrams);
2412 rrddim_set_by_pointer(st, rd_sent, Udp6OutDatagrams);
2413 rrdset_done(st);
2414 }
2415
2538 - // --------------------------------------------------------------------
2539 -
2416 if(do_ip6_udp_errors == CONFIG_BOOLEAN_YES || (do_ip6_udp_errors == CONFIG_BOOLEAN_AUTO &&
2417 (Udp6InErrors ||
2418 Udp6NoPorts ||
@@ -2578,7 +2454,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2454 rd_InCsumErrors = rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2455 rd_IgnoredMulti = rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2456 }
2581 - else rrdset_next(st);
2457
2458 rrddim_set_by_pointer(st, rd_RcvbufErrors, Udp6RcvbufErrors);
2459 rrddim_set_by_pointer(st, rd_SndbufErrors, Udp6SndbufErrors);
@@ -2589,8 +2464,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2464 rrdset_done(st);
2465 }
2466
2592 - // --------------------------------------------------------------------
2593 -
2467 if(do_ip6_udplite_packets == CONFIG_BOOLEAN_YES || (do_ip6_udplite_packets == CONFIG_BOOLEAN_AUTO &&
2468 (UdpLite6InDatagrams ||
2469 UdpLite6OutDatagrams ||
@@ -2619,15 +2492,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2492 rd_received = rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2493 rd_sent = rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2494 }
2622 - else rrdset_next(st);
2495
2496 rrddim_set_by_pointer(st, rd_received, UdpLite6InDatagrams);
2497 rrddim_set_by_pointer(st, rd_sent, UdpLite6OutDatagrams);
2498 rrdset_done(st);
2499 }
2500
2629 - // --------------------------------------------------------------------
2630 -
2501 if(do_ip6_udplite_errors == CONFIG_BOOLEAN_YES || (do_ip6_udplite_errors == CONFIG_BOOLEAN_AUTO &&
2502 (UdpLite6InErrors ||
2503 UdpLite6NoPorts ||
@@ -2667,7 +2537,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2537 rd_NoPorts = rrddim_add(st, "NoPorts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2538 rd_InCsumErrors = rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2539 }
2670 - else rrdset_next(st);
2540
2541 rrddim_set_by_pointer(st, rd_InErrors, UdpLite6InErrors);
2542 rrddim_set_by_pointer(st, rd_NoPorts, UdpLite6NoPorts);
@@ -2677,8 +2546,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2546 rrdset_done(st);
2547 }
2548
2680 - // --------------------------------------------------------------------
2681 -
2549 if(do_ip6_mcast == CONFIG_BOOLEAN_YES || (do_ip6_mcast == CONFIG_BOOLEAN_AUTO &&
2550 (Ip6OutMcastOctets ||
2551 Ip6InMcastOctets ||
@@ -2708,15 +2575,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2575 rd_Ip6InMcastOctets = rrddim_add(st, "InMcastOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
2576 rd_Ip6OutMcastOctets = rrddim_add(st, "OutMcastOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
2577 }
2711 - else rrdset_next(st);
2578
2579 rrddim_set_by_pointer(st, rd_Ip6InMcastOctets, Ip6InMcastOctets);
2580 rrddim_set_by_pointer(st, rd_Ip6OutMcastOctets, Ip6OutMcastOctets);
2581 rrdset_done(st);
2582 }
2583
2718 - // --------------------------------------------------------------------
2719 -
2584 if(do_ip6_bcast == CONFIG_BOOLEAN_YES || (do_ip6_bcast == CONFIG_BOOLEAN_AUTO &&
2585 (Ip6OutBcastOctets ||
2586 Ip6InBcastOctets ||
@@ -2746,15 +2610,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2610 rd_Ip6InBcastOctets = rrddim_add(st, "InBcastOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
2611 rd_Ip6OutBcastOctets = rrddim_add(st, "OutBcastOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
2612 }
2749 - else rrdset_next(st);
2613
2614 rrddim_set_by_pointer(st, rd_Ip6InBcastOctets, Ip6InBcastOctets);
2615 rrddim_set_by_pointer(st, rd_Ip6OutBcastOctets, Ip6OutBcastOctets);
2616 rrdset_done(st);
2617 }
2618
2756 - // --------------------------------------------------------------------
2757 -
2619 if(do_ip6_mcast_p == CONFIG_BOOLEAN_YES || (do_ip6_mcast_p == CONFIG_BOOLEAN_AUTO &&
2620 (Ip6OutMcastPkts ||
2621 Ip6InMcastPkts ||
@@ -2784,15 +2645,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2645 rd_Ip6InMcastPkts = rrddim_add(st, "InMcastPkts", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2646 rd_Ip6OutMcastPkts = rrddim_add(st, "OutMcastPkts", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2647 }
2787 - else rrdset_next(st);
2648
2649 rrddim_set_by_pointer(st, rd_Ip6InMcastPkts, Ip6InMcastPkts);
2650 rrddim_set_by_pointer(st, rd_Ip6OutMcastPkts, Ip6OutMcastPkts);
2651 rrdset_done(st);
2652 }
2653
2794 - // --------------------------------------------------------------------
2795 -
2654 if(do_ip6_icmp == CONFIG_BOOLEAN_YES || (do_ip6_icmp == CONFIG_BOOLEAN_AUTO &&
2655 (Icmp6InMsgs ||
2656 Icmp6OutMsgs ||
@@ -2821,15 +2679,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2679 rd_Icmp6InMsgs = rrddim_add(st, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2680 rd_Icmp6OutMsgs = rrddim_add(st, "OutMsgs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2681 }
2824 - else rrdset_next(st);
2682
2683 rrddim_set_by_pointer(st, rd_Icmp6InMsgs, Icmp6InMsgs);
2684 rrddim_set_by_pointer(st, rd_Icmp6OutMsgs, Icmp6OutMsgs);
2685 rrdset_done(st);
2686 }
2687
2831 - // --------------------------------------------------------------------
2832 -
2688 if(do_ip6_icmp_redir == CONFIG_BOOLEAN_YES || (do_ip6_icmp_redir == CONFIG_BOOLEAN_AUTO &&
2689 (Icmp6InRedirects ||
2690 Icmp6OutRedirects ||
@@ -2858,15 +2713,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2713 rd_Icmp6InRedirects = rrddim_add(st, "InRedirects", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2714 rd_Icmp6OutRedirects = rrddim_add(st, "OutRedirects", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2715 }
2861 - else rrdset_next(st);
2716
2717 rrddim_set_by_pointer(st, rd_Icmp6InRedirects, Icmp6InRedirects);
2718 rrddim_set_by_pointer(st, rd_Icmp6OutRedirects, Icmp6OutRedirects);
2719 rrdset_done(st);
2720 }
2721
2868 - // --------------------------------------------------------------------
2869 -
2722 if(do_ip6_icmp_errors == CONFIG_BOOLEAN_YES || (do_ip6_icmp_errors == CONFIG_BOOLEAN_AUTO &&
2723 (Icmp6InErrors ||
2724 Icmp6OutErrors ||
@@ -2922,7 +2774,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2774 rd_OutTimeExcds = rrddim_add(st, "OutTimeExcds", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2775 rd_OutParmProblems = rrddim_add(st, "OutParmProblems", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2776 }
2925 - else rrdset_next(st);
2777
2778 rrddim_set_by_pointer(st, rd_InErrors, Icmp6InErrors);
2779 rrddim_set_by_pointer(st, rd_OutErrors, Icmp6OutErrors);
@@ -2938,8 +2789,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2789 rrdset_done(st);
2790 }
2791
2941 - // --------------------------------------------------------------------
2942 -
2792 if(do_ip6_icmp_echos == CONFIG_BOOLEAN_YES || (do_ip6_icmp_echos == CONFIG_BOOLEAN_AUTO &&
2793 (Icmp6InEchos ||
2794 Icmp6OutEchos ||
@@ -2974,7 +2823,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2823 rd_InEchoReplies = rrddim_add(st, "InEchoReplies", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2824 rd_OutEchoReplies = rrddim_add(st, "OutEchoReplies", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2825 }
2977 - else rrdset_next(st);
2826
2827 rrddim_set_by_pointer(st, rd_InEchos, Icmp6InEchos);
2828 rrddim_set_by_pointer(st, rd_OutEchos, Icmp6OutEchos);
@@ -2983,8 +2831,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2831 rrdset_done(st);
2832 }
2833
2986 - // --------------------------------------------------------------------
2987 -
2834 if(do_ip6_icmp_groupmemb == CONFIG_BOOLEAN_YES || (do_ip6_icmp_groupmemb == CONFIG_BOOLEAN_AUTO &&
2835 (Icmp6InGroupMembQueries ||
2836 Icmp6OutGroupMembQueries ||
@@ -3024,7 +2870,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2870 rd_InReductions = rrddim_add(st, "InReductions", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2871 rd_OutReductions = rrddim_add(st, "OutReductions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2872 }
3027 - else rrdset_next(st);
2873
2874 rrddim_set_by_pointer(st, rd_InQueries, Icmp6InGroupMembQueries);
2875 rrddim_set_by_pointer(st, rd_OutQueries, Icmp6OutGroupMembQueries);
@@ -3035,8 +2880,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2880 rrdset_done(st);
2881 }
2882
3038 - // --------------------------------------------------------------------
3039 -
2883 if(do_ip6_icmp_router == CONFIG_BOOLEAN_YES || (do_ip6_icmp_router == CONFIG_BOOLEAN_AUTO &&
2884 (Icmp6InRouterSolicits ||
2885 Icmp6OutRouterSolicits ||
@@ -3071,7 +2914,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2914 rd_InAdvertisements = rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2915 rd_OutAdvertisements = rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2916 }
3074 - else rrdset_next(st);
2917
2918 rrddim_set_by_pointer(st, rd_InSolicits, Icmp6InRouterSolicits);
2919 rrddim_set_by_pointer(st, rd_OutSolicits, Icmp6OutRouterSolicits);
@@ -3080,8 +2922,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2922 rrdset_done(st);
2923 }
2924
3083 - // --------------------------------------------------------------------
3084 -
2925 if(do_ip6_icmp_neighbor == CONFIG_BOOLEAN_YES || (do_ip6_icmp_neighbor == CONFIG_BOOLEAN_AUTO &&
2926 (Icmp6InNeighborSolicits ||
2927 Icmp6OutNeighborSolicits ||
@@ -3116,7 +2956,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2956 rd_InAdvertisements = rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2957 rd_OutAdvertisements = rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2958 }
3119 - else rrdset_next(st);
2959
2960 rrddim_set_by_pointer(st, rd_InSolicits, Icmp6InNeighborSolicits);
2961 rrddim_set_by_pointer(st, rd_OutSolicits, Icmp6OutNeighborSolicits);
@@ -3125,8 +2964,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2964 rrdset_done(st);
2965 }
2966
3128 - // --------------------------------------------------------------------
3129 -
2967 if(do_ip6_icmp_mldv2 == CONFIG_BOOLEAN_YES || (do_ip6_icmp_mldv2 == CONFIG_BOOLEAN_AUTO &&
2968 (Icmp6InMLDv2Reports ||
2969 Icmp6OutMLDv2Reports ||
@@ -3155,15 +2992,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2992 rd_InMLDv2Reports = rrddim_add(st, "InMLDv2Reports", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
2993 rd_OutMLDv2Reports = rrddim_add(st, "OutMLDv2Reports", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
2994 }
3158 - else rrdset_next(st);
2995
2996 rrddim_set_by_pointer(st, rd_InMLDv2Reports, Icmp6InMLDv2Reports);
2997 rrddim_set_by_pointer(st, rd_OutMLDv2Reports, Icmp6OutMLDv2Reports);
2998 rrdset_done(st);
2999 }
3000
3165 - // --------------------------------------------------------------------
3166 -
3001 if(do_ip6_icmp_types == CONFIG_BOOLEAN_YES || (do_ip6_icmp_types == CONFIG_BOOLEAN_AUTO &&
3002 (Icmp6InType1 ||
3003 Icmp6InType128 ||
@@ -3216,7 +3050,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
3050 rd_OutType135 = rrddim_add(st, "OutType135", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3051 rd_OutType143 = rrddim_add(st, "OutType143", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3052 }
3219 - else rrdset_next(st);
3053
3054 rrddim_set_by_pointer(st, rd_InType1, Icmp6InType1);
3055 rrddim_set_by_pointer(st, rd_InType128, Icmp6InType128);
@@ -3231,8 +3064,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
3064 rrdset_done(st);
3065 }
3066
3234 - // --------------------------------------------------------------------
3235 -
3067 if(do_ip6_ect == CONFIG_BOOLEAN_YES || (do_ip6_ect == CONFIG_BOOLEAN_AUTO &&
3068 (Ip6InNoECTPkts ||
3069 Ip6InECT1Pkts ||
@@ -3267,7 +3098,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
3098 rd_InECT0Pkts = rrddim_add(st, "InECT0Pkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
3099 rd_InCEPkts = rrddim_add(st, "InCEPkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
3100 }
3270 - else rrdset_next(st);
3101
3102 rrddim_set_by_pointer(st, rd_InNoECTPkts, Ip6InNoECTPkts);
3103 rrddim_set_by_pointer(st, rd_InECT1Pkts, Ip6InECT1Pkts);
collectors/proc.plugin/proc_net_rpc_nfs.c
-15
@@ -275,8 +275,6 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
275 }
276 }
277
278 - // --------------------------------------------------------------------
279 -
278 if(do_net == 2) {
279 static RRDSET *st = NULL;
280 static RRDDIM *rd_udp = NULL,
@@ -303,7 +301,6 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
301 rd_udp = rrddim_add(st, "udp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
302 rd_tcp = rrddim_add(st, "tcp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
303 }
306 - else rrdset_next(st);
304
305 // ignore net_count, net_tcp_connections
306 (void)net_count;
@@ -314,8 +311,6 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
311 rrdset_done(st);
312 }
313
317 - // --------------------------------------------------------------------
318 -
314 if(do_rpc == 2) {
315 static RRDSET *st = NULL;
316 static RRDDIM *rd_calls = NULL,
@@ -343,7 +338,6 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
338 rd_retransmits = rrddim_add(st, "retransmits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
339 rd_auth_refresh = rrddim_add(st, "auth_refresh", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
340 }
346 - else rrdset_next(st);
341
342 rrddim_set_by_pointer(st, rd_calls, rpc_calls);
343 rrddim_set_by_pointer(st, rd_retransmits, rpc_retransmits);
@@ -351,8 +345,6 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
345 rrdset_done(st);
346 }
347
354 - // --------------------------------------------------------------------
355 -
348 if(do_proc2 == 2) {
349 static RRDSET *st = NULL;
350 if(unlikely(!st)) {
@@ -371,7 +363,6 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
363 , RRDSET_TYPE_STACKED
364 );
365 }
374 - else rrdset_next(st);
366
367 size_t i;
368 for(i = 0; nfs_proc2_values[i].present ; i++) {
@@ -384,8 +375,6 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
375 rrdset_done(st);
376 }
377
387 - // --------------------------------------------------------------------
388 -
378 if(do_proc3 == 2) {
379 static RRDSET *st = NULL;
380 if(unlikely(!st)) {
@@ -404,7 +393,6 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
393 , RRDSET_TYPE_STACKED
394 );
395 }
407 - else rrdset_next(st);
396
397 size_t i;
398 for(i = 0; nfs_proc3_values[i].present ; i++) {
@@ -417,8 +405,6 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
405 rrdset_done(st);
406 }
407
420 - // --------------------------------------------------------------------
421 -
408 if(do_proc4 == 2) {
409 static RRDSET *st = NULL;
410 if(unlikely(!st)) {
@@ -437,7 +423,6 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
423 , RRDSET_TYPE_STACKED
424 );
425 }
440 - else rrdset_next(st);
426
427 size_t i;
428 for(i = 0; nfs_proc4_values[i].present ; i++) {
collectors/proc.plugin/proc_net_rpc_nfsd.c
-31
@@ -449,8 +449,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
449 }
450 }
451
452 - // --------------------------------------------------------------------
453 -
452 if(do_rc == 2) {
453 static RRDSET *st = NULL;
454 static RRDDIM *rd_hits = NULL,
@@ -477,7 +475,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
475 rd_misses = rrddim_add(st, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
476 rd_nocache = rrddim_add(st, "nocache", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
477 }
480 - else rrdset_next(st);
478
479 rrddim_set_by_pointer(st, rd_hits, rc_hits);
480 rrddim_set_by_pointer(st, rd_misses, rc_misses);
@@ -485,8 +482,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
482 rrdset_done(st);
483 }
484
488 - // --------------------------------------------------------------------
489 -
485 if(do_fh == 2) {
486 static RRDSET *st = NULL;
487 static RRDDIM *rd_stale = NULL;
@@ -510,14 +505,11 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
505
506 rd_stale = rrddim_add(st, "stale", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
507 }
513 - else rrdset_next(st);
508
509 rrddim_set_by_pointer(st, rd_stale, fh_stale);
510 rrdset_done(st);
511 }
512
519 - // --------------------------------------------------------------------
520 -
513 if(do_io == 2) {
514 static RRDSET *st = NULL;
515 static RRDDIM *rd_read = NULL,
@@ -542,15 +534,12 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
534 rd_read = rrddim_add(st, "read", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
535 rd_write = rrddim_add(st, "write", NULL, -1, 1000, RRD_ALGORITHM_INCREMENTAL);
536 }
545 - else rrdset_next(st);
537
538 rrddim_set_by_pointer(st, rd_read, io_read);
539 rrddim_set_by_pointer(st, rd_write, io_write);
540 rrdset_done(st);
541 }
542
552 - // --------------------------------------------------------------------
553 -
543 if(do_th == 2) {
544 static RRDSET *st = NULL;
545 static RRDDIM *rd_threads = NULL;
@@ -573,15 +562,11 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
562
563 rd_threads = rrddim_add(st, "threads", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
564 }
576 - else rrdset_next(st);
565
566 rrddim_set_by_pointer(st, rd_threads, th_threads);
567 rrdset_done(st);
580 -
568 }
569
583 - // --------------------------------------------------------------------
584 -
570 if(do_net == 2) {
571 static RRDSET *st = NULL;
572 static RRDDIM *rd_udp = NULL,
@@ -607,7 +592,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
592 rd_udp = rrddim_add(st, "udp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
593 rd_tcp = rrddim_add(st, "tcp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
594 }
610 - else rrdset_next(st);
595
596 // ignore net_count, net_tcp_connections
597 (void)net_count;
@@ -618,8 +602,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
602 rrdset_done(st);
603 }
604
621 - // --------------------------------------------------------------------
622 -
605 if(do_rpc == 2) {
606 static RRDSET *st = NULL;
607 static RRDDIM *rd_calls = NULL,
@@ -647,7 +629,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
629 rd_bad_format = rrddim_add(st, "bad_format", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
630 rd_bad_auth = rrddim_add(st, "bad_auth", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
631 }
650 - else rrdset_next(st);
632
633 // ignore rpc_bad_client
634 (void)rpc_bad_client;
@@ -658,8 +639,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
639 rrdset_done(st);
640 }
641
661 - // --------------------------------------------------------------------
662 -
642 if(do_proc2 == 2) {
643 static RRDSET *st = NULL;
644 if(unlikely(!st)) {
@@ -678,7 +657,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
657 , RRDSET_TYPE_STACKED
658 );
659 }
681 - else rrdset_next(st);
660
661 size_t i;
662 for(i = 0; nfsd_proc2_values[i].present ; i++) {
@@ -691,8 +669,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
669 rrdset_done(st);
670 }
671
694 - // --------------------------------------------------------------------
695 -
672 if(do_proc3 == 2) {
673 static RRDSET *st = NULL;
674 if(unlikely(!st)) {
@@ -711,7 +687,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
687 , RRDSET_TYPE_STACKED
688 );
689 }
714 - else rrdset_next(st);
690
691 size_t i;
692 for(i = 0; nfsd_proc3_values[i].present ; i++) {
@@ -724,8 +699,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
699 rrdset_done(st);
700 }
701
727 - // --------------------------------------------------------------------
728 -
702 if(do_proc4 == 2) {
703 static RRDSET *st = NULL;
704 if(unlikely(!st)) {
@@ -744,7 +717,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
717 , RRDSET_TYPE_STACKED
718 );
719 }
747 - else rrdset_next(st);
720
721 size_t i;
722 for(i = 0; nfsd_proc4_values[i].present ; i++) {
@@ -757,8 +729,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
729 rrdset_done(st);
730 }
731
760 - // --------------------------------------------------------------------
761 -
732 if(do_proc4ops == 2) {
733 static RRDSET *st = NULL;
734 if(unlikely(!st)) {
@@ -777,7 +747,6 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
747 , RRDSET_TYPE_STACKED
748 );
749 }
780 - else rrdset_next(st);
750
751 size_t i;
752 for(i = 0; nfsd4_ops_values[i].present ; i++) {
collectors/proc.plugin/proc_net_sctp_snmp.c
-6
@@ -148,7 +148,6 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
148
149 rd_established = rrddim_add(st, "SctpCurrEstab", "established", 1, 1, RRD_ALGORITHM_ABSOLUTE);
150 }
151 - else rrdset_next(st);
151
152 rrddim_set_by_pointer(st, rd_established, SctpCurrEstab);
153 rrdset_done(st);
@@ -190,7 +189,6 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
189 rd_aborted = rrddim_add(st, "SctpAborteds", "aborted", -1, 1, RRD_ALGORITHM_INCREMENTAL);
190 rd_shutdown = rrddim_add(st, "SctpShutdowns", "shutdown", -1, 1, RRD_ALGORITHM_INCREMENTAL);
191 }
193 - else rrdset_next(st);
192
193 rrddim_set_by_pointer(st, rd_active, SctpActiveEstabs);
194 rrddim_set_by_pointer(st, rd_passive, SctpPassiveEstabs);
@@ -230,7 +228,6 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
228 rd_received = rrddim_add(st, "SctpInSCTPPacks", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
229 rd_sent = rrddim_add(st, "SctpOutSCTPPacks", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
230 }
233 - else rrdset_next(st);
231
232 rrddim_set_by_pointer(st, rd_received, SctpInSCTPPacks);
233 rrddim_set_by_pointer(st, rd_sent, SctpOutSCTPPacks);
@@ -268,7 +265,6 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
265 rd_invalid = rrddim_add(st, "SctpOutOfBlues", "invalid", 1, 1, RRD_ALGORITHM_INCREMENTAL);
266 rd_csum = rrddim_add(st, "SctpChecksumErrors", "checksum", 1, 1, RRD_ALGORITHM_INCREMENTAL);
267 }
271 - else rrdset_next(st);
268
269 rrddim_set_by_pointer(st, rd_invalid, SctpOutOfBlues);
270 rrddim_set_by_pointer(st, rd_csum, SctpChecksumErrors);
@@ -306,7 +302,6 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
302 rd_reassembled = rrddim_add(st, "SctpReasmUsrMsgs", "reassembled", 1, 1, RRD_ALGORITHM_INCREMENTAL);
303 rd_fragmented = rrddim_add(st, "SctpFragUsrMsgs", "fragmented", -1, 1, RRD_ALGORITHM_INCREMENTAL);
304 }
309 - else rrdset_next(st);
305
306 rrddim_set_by_pointer(st, rd_reassembled, SctpReasmUsrMsgs);
307 rrddim_set_by_pointer(st, rd_fragmented, SctpFragUsrMsgs);
@@ -357,7 +352,6 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
352 rd_OutOrder = rrddim_add(st, "SctpOutOrderChunks", "OutOrder", -1, 1, RRD_ALGORITHM_INCREMENTAL);
353 rd_OutUnorder = rrddim_add(st, "SctpOutUnorderChunks", "OutUnorder", -1, 1, RRD_ALGORITHM_INCREMENTAL);
354 }
360 - else rrdset_next(st);
355
356 rrddim_set_by_pointer(st, rd_InCtrl, SctpInCtrlChunks);
357 rrddim_set_by_pointer(st, rd_InOrder, SctpInOrderChunks);
collectors/proc.plugin/proc_net_sockstat.c
-9
@@ -244,7 +244,6 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
244
245 rd_used = rrddim_add(st, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
246 }
247 - else rrdset_next(st);
247
248 rrddim_set_by_pointer(st, rd_used, (collected_number)sockstat_root.sockets_used);
249 rrdset_done(st);
@@ -287,7 +286,6 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
286 rd_inuse = rrddim_add(st, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
287 rd_timewait = rrddim_add(st, "timewait", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
288 }
290 - else rrdset_next(st);
289
290 rrddim_set_by_pointer(st, rd_inuse, (collected_number)sockstat_root.tcp_inuse);
291 rrddim_set_by_pointer(st, rd_orphan, (collected_number)sockstat_root.tcp_orphan);
@@ -323,7 +321,6 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
321
322 rd_mem = rrddim_add(st, "mem", NULL, sysconf(_SC_PAGESIZE), 1024, RRD_ALGORITHM_ABSOLUTE);
323 }
326 - else rrdset_next(st);
324
325 rrddim_set_by_pointer(st, rd_mem, (collected_number)sockstat_root.tcp_mem);
326 rrdset_done(st);
@@ -357,7 +354,6 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
354
355 rd_inuse = rrddim_add(st, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
356 }
360 - else rrdset_next(st);
357
358 rrddim_set_by_pointer(st, rd_inuse, (collected_number)sockstat_root.udp_inuse);
359 rrdset_done(st);
@@ -391,7 +387,6 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
387
388 rd_mem = rrddim_add(st, "mem", NULL, sysconf(_SC_PAGESIZE), 1024, RRD_ALGORITHM_ABSOLUTE);
389 }
394 - else rrdset_next(st);
390
391 rrddim_set_by_pointer(st, rd_mem, (collected_number)sockstat_root.udp_mem);
392 rrdset_done(st);
@@ -425,7 +420,6 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
420
421 rd_inuse = rrddim_add(st, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
422 }
428 - else rrdset_next(st);
423
424 rrddim_set_by_pointer(st, rd_inuse, (collected_number)sockstat_root.udplite_inuse);
425 rrdset_done(st);
@@ -459,7 +453,6 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
453
454 rd_inuse = rrddim_add(st, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
455 }
462 - else rrdset_next(st);
456
457 rrddim_set_by_pointer(st, rd_inuse, (collected_number)sockstat_root.raw_inuse);
458 rrdset_done(st);
@@ -493,7 +486,6 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
486
487 rd_inuse = rrddim_add(st, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
488 }
496 - else rrdset_next(st);
489
490 rrddim_set_by_pointer(st, rd_inuse, (collected_number)sockstat_root.frag_inuse);
491 rrdset_done(st);
@@ -527,7 +519,6 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
519
520 rd_mem = rrddim_add(st, "mem", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
521 }
530 - else rrdset_next(st);
522
523 rrddim_set_by_pointer(st, rd_mem, (collected_number)sockstat_root.frag_memory);
524 rrdset_done(st);
collectors/proc.plugin/proc_net_sockstat6.c
-5
@@ -137,7 +137,6 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
137
138 rd_inuse = rrddim_add(st, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
139 }
140 - else rrdset_next(st);
140
141 rrddim_set_by_pointer(st, rd_inuse, (collected_number)sockstat6_root.tcp6_inuse);
142 rrdset_done(st);
@@ -171,7 +170,6 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
170
171 rd_inuse = rrddim_add(st, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
172 }
174 - else rrdset_next(st);
173
174 rrddim_set_by_pointer(st, rd_inuse, (collected_number)sockstat6_root.udp6_inuse);
175 rrdset_done(st);
@@ -205,7 +203,6 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
203
204 rd_inuse = rrddim_add(st, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
205 }
208 - else rrdset_next(st);
206
207 rrddim_set_by_pointer(st, rd_inuse, (collected_number)sockstat6_root.udplite6_inuse);
208 rrdset_done(st);
@@ -239,7 +236,6 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
236
237 rd_inuse = rrddim_add(st, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
238 }
242 - else rrdset_next(st);
239
240 rrddim_set_by_pointer(st, rd_inuse, (collected_number)sockstat6_root.raw6_inuse);
241 rrdset_done(st);
@@ -273,7 +269,6 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
269
270 rd_inuse = rrddim_add(st, "inuse", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
271 }
276 - else rrdset_next(st);
272
273 rrddim_set_by_pointer(st, rd_inuse, (collected_number)sockstat6_root.frag6_inuse);
274 rrdset_done(st);
collectors/proc.plugin/proc_net_softnet_stat.c
-2
@@ -101,7 +101,6 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
101 if(unlikely(softnet_column_name(w)))
102 rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
103 }
104 - else rrdset_next(st);
104
105 for(w = 0; w < allocated_columns ;w++)
106 if(unlikely(softnet_column_name(w)))
@@ -137,7 +136,6 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
136 if(unlikely(softnet_column_name(w)))
137 rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
138 }
140 - else rrdset_next(st);
139
140 for(w = 0; w < allocated_columns ;w++)
141 if(unlikely(softnet_column_name(w)))
collectors/proc.plugin/proc_net_stat_conntrack.c
-6
@@ -152,7 +152,6 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
152
153 rd_connections = rrddim_add(st, "connections", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
154 }
155 - else rrdset_next(st);
155
156 rrddim_set_by_pointer(st, rd_connections, aentries);
157 rrdset_done(st);
@@ -187,7 +186,6 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
186 rd_ignore = rrddim_add(st, "ignore", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
187 rd_invalid = rrddim_add(st, "invalid", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
188 }
190 - else rrdset_next(st);
189
190 rrddim_set_by_pointer(st, rd_new, anew);
191 rrddim_set_by_pointer(st, rd_ignore, aignore);
@@ -225,7 +223,6 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
223 rd_deleted = rrddim_add(st, "deleted", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
224 rd_delete_list = rrddim_add(st, "delete_list", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
225 }
228 - else rrdset_next(st);
226
227 rrddim_set_by_pointer(st, rd_inserted, ainsert);
228 rrddim_set_by_pointer(st, rd_deleted, adelete);
@@ -262,7 +259,6 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
259 rd_deleted = rrddim_add(st, "deleted", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
260 rd_new = rrddim_add(st, "new", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
261 }
265 - else rrdset_next(st);
262
263 rrddim_set_by_pointer(st, rd_created, aexpect_create);
264 rrddim_set_by_pointer(st, rd_deleted, aexpect_delete);
@@ -299,7 +295,6 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
295 rd_restarted = rrddim_add(st, "restarted", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
296 rd_found = rrddim_add(st, "found", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
297 }
302 - else rrdset_next(st);
298
299 rrddim_set_by_pointer(st, rd_searched, asearched);
300 rrddim_set_by_pointer(st, rd_restarted, asearch_restart);
@@ -338,7 +333,6 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
333 rd_drop = rrddim_add(st, "drop", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
334 rd_early_drop = rrddim_add(st, "early_drop", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
335 }
341 - else rrdset_next(st);
336
337 rrddim_set_by_pointer(st, rd_icmp_error, aicmp_error);
338 rrddim_set_by_pointer(st, rd_insert_failed, ainsert_failed);
collectors/proc.plugin/proc_net_stat_synproxy.c
-3
@@ -80,7 +80,6 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
80
81 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
82 }
83 - else rrdset_next(st);
83
84 rrddim_set(st, "received", syn_received);
85 rrdset_done(st);
@@ -111,7 +110,6 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
110
111 rrddim_add(st, "reopened", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
112 }
114 - else rrdset_next(st);
113
114 rrddim_set(st, "reopened", conn_reopened);
115 rrdset_done(st);
@@ -144,7 +142,6 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
142 rrddim_add(st, "invalid", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
143 rrddim_add(st, "retransmits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
144 }
147 - else rrdset_next(st);
145
146 rrddim_set(st, "valid", cookie_valid);
147 rrddim_set(st, "invalid", cookie_invalid);
collectors/proc.plugin/proc_net_wireless.c
-13
@@ -269,8 +269,6 @@ int do_proc_net_wireless(int update_every, usec_t dt)
269
270 add_labels_to_wireless(wireless_dev, wireless_dev->st_status);
271 }
272 - else
273 - rrdset_next(wireless_dev->st_status);
272
273 rrddim_set_by_pointer(wireless_dev->st_status, wireless_dev->rd_status,
274 (collected_number)wireless_dev->status);
@@ -302,8 +300,6 @@ int do_proc_net_wireless(int update_every, usec_t dt)
300
301 add_labels_to_wireless(wireless_dev, wireless_dev->st_link);
302 }
305 - else
306 - rrdset_next(wireless_dev->st_link);
303
304 if (unlikely(!wireless_dev->st_level)) {
305 wireless_dev->st_level = rrdset_create_localhost(
@@ -325,8 +321,6 @@ int do_proc_net_wireless(int update_every, usec_t dt)
321
322 add_labels_to_wireless(wireless_dev, wireless_dev->st_level);
323 }
328 - else
329 - rrdset_next(wireless_dev->st_level);
324
325 if (unlikely(!wireless_dev->st_noise)) {
326 wireless_dev->st_noise = rrdset_create_localhost(
@@ -348,8 +342,6 @@ int do_proc_net_wireless(int update_every, usec_t dt)
342
343 add_labels_to_wireless(wireless_dev, wireless_dev->st_noise);
344 }
351 - else
352 - rrdset_next(wireless_dev->st_noise);
345
346 rrddim_set_by_pointer(wireless_dev->st_link, wireless_dev->rd_link, (collected_number)wireless_dev->link);
347 rrdset_done(wireless_dev->st_link);
@@ -393,8 +385,6 @@ int do_proc_net_wireless(int update_every, usec_t dt)
385
386 add_labels_to_wireless(wireless_dev, wireless_dev->st_discarded_packets);
387 }
396 - else
397 - rrdset_next(wireless_dev->st_discarded_packets);
388
389 rrddim_set_by_pointer(wireless_dev->st_discarded_packets, wireless_dev->rd_nwid, (collected_number)wireless_dev->nwid);
390 rrddim_set_by_pointer(wireless_dev->st_discarded_packets, wireless_dev->rd_crypt, (collected_number)wireless_dev->crypt);
@@ -429,11 +419,8 @@ int do_proc_net_wireless(int update_every, usec_t dt)
419
420 add_labels_to_wireless(wireless_dev, wireless_dev->st_missed_beacon);
421 }
432 - else
433 - rrdset_next(wireless_dev->st_missed_beacon);
422
423 rrddim_set_by_pointer(wireless_dev->st_missed_beacon, wireless_dev->rd_missed_beacon, (collected_number)wireless_dev->missed_beacon);
436 -
424 rrdset_done(wireless_dev->st_missed_beacon);
425 }
426
collectors/proc.plugin/proc_pagetypeinfo.c
+1 -5
@@ -316,10 +316,8 @@ int do_proc_pagetypeinfo(int update_every, usec_t dt) {
316
317 // Global system per order
318 if (st_order) {
319 - rrdset_next(st_order);
320 - for (o = 0; o < pageorders_cnt; o++) {
319 + for (o = 0; o < pageorders_cnt; o++)
320 rrddim_set_by_pointer(st_order, systemorders[o].rd, systemorders[o].size);
322 - }
321 rrdset_done(st_order);
322 }
323
@@ -330,10 +328,8 @@ int do_proc_pagetypeinfo(int update_every, usec_t dt) {
328 if (!st_nodezonetype[p])
329 continue;
330
333 - rrdset_next(st_nodezonetype[p]);
331 for (o = 0; o < pageorders_cnt; o++)
332 rrddim_set_by_pointer(st_nodezonetype[p], pagelines[p].rd[o], pagelines[p].free_pages_size[o]);
336 -
333 rrdset_done(st_nodezonetype[p]);
334 }
335 }
collectors/proc.plugin/proc_pressure.c
+2 -4
@@ -91,9 +91,8 @@ static void proc_pressure_do_resource(procfile *ff, int res_idx, int some) {
91 rrddim_add(pcs->share_time.st, some ? "some 60" : "full 60", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
92 pcs->share_time.rd300 =
93 rrddim_add(pcs->share_time.st, some ? "some 300" : "full 300", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
94 - } else {
95 - rrdset_next(pcs->share_time.st);
94 }
95 +
96 pcs->share_time.value10 = strtod(procfile_lineword(ff, some ? 0 : 1, 2), NULL);
97 pcs->share_time.value60 = strtod(procfile_lineword(ff, some ? 0 : 1, 4), NULL);
98 pcs->share_time.value300 = strtod(procfile_lineword(ff, some ? 0 : 1, 6), NULL);
@@ -113,9 +112,8 @@ static void proc_pressure_do_resource(procfile *ff, int res_idx, int some) {
112 pressure_update_every,
113 RRDSET_TYPE_LINE);
114 pcs->total_time.rdtotal = rrddim_add(pcs->total_time.st, "time", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
116 - } else {
117 - rrdset_next(pcs->total_time.st);
115 }
116 +
117 pcs->total_time.value_total = str2ull(procfile_lineword(ff, some ? 0 : 1, 8)) / 1000;
118 }
119
collectors/proc.plugin/proc_softirqs.c
+2 -5
@@ -128,7 +128,7 @@ int do_proc_softirqs(int update_every, usec_t dt) {
128 // --------------------------------------------------------------------
129
130 static RRDSET *st_system_softirqs = NULL;
131 - if(unlikely(!st_system_softirqs))
131 + if(unlikely(!st_system_softirqs)) {
132 st_system_softirqs = rrdset_create_localhost(
133 "system"
134 , "softirqs"
@@ -143,8 +143,7 @@ int do_proc_softirqs(int update_every, usec_t dt) {
143 , update_every
144 , RRDSET_TYPE_STACKED
145 );
146 - else
147 - rrdset_next(st_system_softirqs);
146 + }
147
148 for(l = 0; l < lines ;l++) {
149 struct interrupt *irr = irrindex(irrs, l, cpus);
@@ -222,8 +221,6 @@ int do_proc_softirqs(int update_every, usec_t dt) {
221 snprintfz(core, 50, "cpu%d", c);
222 rrdlabels_add(core_st[c]->rrdlabels, "cpu", core, RRDLABEL_SRC_AUTO);
223 }
225 - else
226 - rrdset_next(core_st[c]);
224
225 for(l = 0; l < lines ;l++) {
226 struct interrupt *irr = irrindex(irrs, l, cpus);
collectors/proc.plugin/proc_spl_kstat_zfs.c
+1 -2
@@ -285,8 +285,7 @@ int update_zfs_pool_state_chart(const DICTIONARY_ITEM *item, void *pool_p, void
285 pool->rd_offline = rrddim_add(pool->st, "offline", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
286 pool->rd_removed = rrddim_add(pool->st, "removed", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
287 pool->rd_unavail = rrddim_add(pool->st, "unavail", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
288 - } else
289 - rrdset_next(pool->st);
288 + }
289
290 rrddim_set_by_pointer(pool->st, pool->rd_online, pool->online);
291 rrddim_set_by_pointer(pool->st, pool->rd_degraded, pool->degraded);
collectors/proc.plugin/proc_stat.c
+6 -16
@@ -715,7 +715,6 @@ int do_proc_stat(int update_every, usec_t dt) {
715 if(unlikely(core == 0 && cpus_var == NULL))
716 cpus_var = rrdvar_custom_host_variable_add_and_acquire(localhost, "active_processors");
717 }
718 - else rrdset_next(cpu_chart->st);
718
719 rrddim_set_by_pointer(cpu_chart->st, cpu_chart->rd_user, user);
720 rrddim_set_by_pointer(cpu_chart->st, cpu_chart->rd_nice, nice);
@@ -756,7 +755,6 @@ int do_proc_stat(int update_every, usec_t dt) {
755
756 rd_interrupts = rrddim_add(st_intr, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
757 }
759 - else rrdset_next(st_intr);
758
759 rrddim_set_by_pointer(st_intr, rd_interrupts, value);
760 rrdset_done(st_intr);
@@ -786,7 +784,6 @@ int do_proc_stat(int update_every, usec_t dt) {
784
785 rd_switches = rrddim_add(st_ctxt, "switches", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
786 }
789 - else rrdset_next(st_ctxt);
787
788 rrddim_set_by_pointer(st_ctxt, rd_switches, value);
789 rrdset_done(st_ctxt);
@@ -828,7 +825,6 @@ int do_proc_stat(int update_every, usec_t dt) {
825
826 rd_started = rrddim_add(st_forks, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
827 }
831 - else rrdset_next(st_forks);
828
829 rrddim_set_by_pointer(st_forks, rd_started, processes);
830 rrdset_done(st_forks);
@@ -860,7 +856,6 @@ int do_proc_stat(int update_every, usec_t dt) {
856 rd_running = rrddim_add(st_processes, "running", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
857 rd_blocked = rrddim_add(st_processes, "blocked", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
858 }
863 - else rrdset_next(st_processes);
859
860 rrddim_set_by_pointer(st_processes, rd_running, running);
861 rrddim_set_by_pointer(st_processes, rd_blocked, blocked);
@@ -875,7 +870,7 @@ int do_proc_stat(int update_every, usec_t dt) {
870
871 static RRDSET *st_core_throttle_count = NULL;
872
878 - if (unlikely(!st_core_throttle_count))
873 + if (unlikely(!st_core_throttle_count)) {
874 st_core_throttle_count = rrdset_create_localhost(
875 "cpu"
876 , "core_throttling"
@@ -890,8 +885,7 @@ int do_proc_stat(int update_every, usec_t dt) {
885 , update_every
886 , RRDSET_TYPE_LINE
887 );
893 - else
894 - rrdset_next(st_core_throttle_count);
888 + }
889
890 chart_per_core_files(&all_cpu_charts[1], all_cpu_charts_size - 1, CORE_THROTTLE_COUNT_INDEX, st_core_throttle_count, 1, 1, RRD_ALGORITHM_INCREMENTAL);
891 rrdset_done(st_core_throttle_count);
@@ -905,7 +899,7 @@ int do_proc_stat(int update_every, usec_t dt) {
899
900 static RRDSET *st_package_throttle_count = NULL;
901
908 - if(unlikely(!st_package_throttle_count))
902 + if(unlikely(!st_package_throttle_count)) {
903 st_package_throttle_count = rrdset_create_localhost(
904 "cpu"
905 , "package_throttling"
@@ -920,8 +914,7 @@ int do_proc_stat(int update_every, usec_t dt) {
914 , update_every
915 , RRDSET_TYPE_LINE
916 );
923 - else
924 - rrdset_next(st_package_throttle_count);
917 + }
918
919 chart_per_core_files(&all_cpu_charts[1], all_cpu_charts_size - 1, PACKAGE_THROTTLE_COUNT_INDEX, st_package_throttle_count, 1, 1, RRD_ALGORITHM_INCREMENTAL);
920 rrdset_done(st_package_throttle_count);
@@ -954,7 +947,7 @@ int do_proc_stat(int update_every, usec_t dt) {
947
948 static RRDSET *st_scaling_cur_freq = NULL;
949
957 - if(unlikely(!st_scaling_cur_freq))
950 + if(unlikely(!st_scaling_cur_freq)) {
951 st_scaling_cur_freq = rrdset_create_localhost(
952 "cpu"
953 , "cpufreq"
@@ -969,8 +962,7 @@ int do_proc_stat(int update_every, usec_t dt) {
962 , update_every
963 , RRDSET_TYPE_LINE
964 );
972 - else
973 - rrdset_next(st_scaling_cur_freq);
965 + }
966
967 chart_per_core_files(&all_cpu_charts[1], all_cpu_charts_size - 1, CPU_FREQ_INDEX, st_scaling_cur_freq, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
968 rrdset_done(st_scaling_cur_freq);
@@ -1054,8 +1046,6 @@ int do_proc_stat(int update_every, usec_t dt) {
1046 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
1047 }
1048 }
1057 - else
1058 - rrdset_next(cpuidle_charts[core].st);
1049
1050 rrddim_set_by_pointer(cpuidle_charts[core].st, cpuidle_charts[core].active_time_rd, cpuidle_charts[core].active_time);
1051 for(state = 0; state < cpuidle_charts[core].cpuidle_state_len; state++) {
collectors/proc.plugin/proc_sys_kernel_random_entropy_avail.c
-2
@@ -40,10 +40,8 @@ int do_proc_sys_kernel_random_entropy_avail(int update_every, usec_t dt) {
40
41 rd = rrddim_add(st, "entropy", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
42 }
43 - else rrdset_next(st);
43
44 rrddim_set_by_pointer(st, rd, entropy);
45 rrdset_done(st);
47 -
46 return 0;
47 }
collectors/proc.plugin/proc_uptime.c
-4
@@ -35,12 +35,8 @@ int do_proc_uptime(int update_every, usec_t dt) {
35
36 rd = rrddim_add(st, "uptime", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
37 }
38 - else
39 - rrdset_next(st);
38
39 rrddim_set_by_pointer(st, rd, uptime_msec(uptime_filename));
42 -
40 rrdset_done(st);
44 -
41 return 0;
42 }
collectors/proc.plugin/proc_vmstat.c
-5
@@ -138,7 +138,6 @@ int do_proc_vmstat(int update_every, usec_t dt) {
138 rd_in = rrddim_add(st_swapio, "in", NULL, sysconf(_SC_PAGESIZE), 1024, RRD_ALGORITHM_INCREMENTAL);
139 rd_out = rrddim_add(st_swapio, "out", NULL, -sysconf(_SC_PAGESIZE), 1024, RRD_ALGORITHM_INCREMENTAL);
140 }
141 - else rrdset_next(st_swapio);
141
142 rrddim_set_by_pointer(st_swapio, rd_in, pswpin);
143 rrddim_set_by_pointer(st_swapio, rd_out, pswpout);
@@ -170,7 +169,6 @@ int do_proc_vmstat(int update_every, usec_t dt) {
169 rd_in = rrddim_add(st_io, "in", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
170 rd_out = rrddim_add(st_io, "out", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
171 }
173 - else rrdset_next(st_io);
172
173 rrddim_set_by_pointer(st_io, rd_in, pgpgin);
174 rrddim_set_by_pointer(st_io, rd_out, pgpgout);
@@ -204,7 +202,6 @@ int do_proc_vmstat(int update_every, usec_t dt) {
202 rd_minor = rrddim_add(st_pgfaults, "minor", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
203 rd_major = rrddim_add(st_pgfaults, "major", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
204 }
207 - else rrdset_next(st_pgfaults);
205
206 rrddim_set_by_pointer(st_pgfaults, rd_minor, pgfault);
207 rrddim_set_by_pointer(st_pgfaults, rd_major, pgmajfault);
@@ -240,7 +237,6 @@ int do_proc_vmstat(int update_every, usec_t dt) {
237
238 rd_oom_kill = rrddim_add(st_oom_kill, "kills", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
239 }
243 - else rrdset_next(st_oom_kill);
240
241 rrddim_set_by_pointer(st_oom_kill, rd_oom_kill, oom_kill);
242 rrdset_done(st_oom_kill);
@@ -295,7 +291,6 @@ int do_proc_vmstat(int update_every, usec_t dt) {
291 rd_hint_faults_local = rrddim_add(st_numa, "hint_faults_local", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
292 rd_pages_migrated = rrddim_add(st_numa, "pages_migrated", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
293 }
298 - else rrdset_next(st_numa);
294
295 rrddim_set_by_pointer(st_numa, rd_local, numa_local);
296 rrddim_set_by_pointer(st_numa, rd_foreign, numa_foreign);
collectors/proc.plugin/sys_block_zram.c
+29 -49
@@ -33,8 +33,6 @@ typedef struct zram_device {
33 RRDDIM *rd_alloc_efficiency;
34 } ZRAM_DEVICE;
35
36 - // --------------------------------------------------------------------
37 -
36 static int try_get_zram_major_number(procfile *file) {
37 size_t i;
38 unsigned int lines = procfile_lines(file);
@@ -179,7 +177,6 @@ static void free_device(DICTIONARY *dict, const char *name)
177 rrdset_obsolete_and_pointer_null(d->st_comp_ratio);
178 dictionary_del(dict, name);
179 }
182 - // --------------------------------------------------------------------
180
181 static inline int read_mm_stat(procfile *ff, MM_STAT *stats) {
182 ff = procfile_readall(ff);
@@ -204,64 +201,51 @@ static inline int read_mm_stat(procfile *ff, MM_STAT *stats) {
201 return 0;
202 }
203
207 -static inline int _collect_zram_metrics(const char* name, ZRAM_DEVICE *d, int advance, DICTIONARY* dict) {
204 +static int collect_zram_metrics(const DICTIONARY_ITEM *item, void *entry, void *data) {
205 + const char *name = dictionary_acquired_item_name(item);
206 + ZRAM_DEVICE *dev = entry;
207 + DICTIONARY *dict = data;
208 +
209 MM_STAT mm;
210 int value;
210 - if (unlikely(read_mm_stat(d->file, &mm) < 0))
211 - {
211 +
212 + if (unlikely(read_mm_stat(dev->file, &mm) < 0)) {
213 free_device(dict, name);
214 return -1;
215 }
216
216 - if (likely(advance))
217 - {
218 - rrdset_next(d->st_usage);
219 - rrdset_next(d->st_savings);
220 - rrdset_next(d->st_comp_ratio);
221 - rrdset_next(d->st_alloc_efficiency);
222 - }
217 // zram_usage
224 - rrddim_set_by_pointer(d->st_usage, d->rd_compr_data_size, mm.compr_data_size);
225 - rrddim_set_by_pointer(d->st_usage, d->rd_metadata_size, mm.mem_used_total - mm.compr_data_size);
226 - rrdset_done(d->st_usage);
218 + rrddim_set_by_pointer(dev->st_usage, dev->rd_compr_data_size, mm.compr_data_size);
219 + rrddim_set_by_pointer(dev->st_usage, dev->rd_metadata_size, mm.mem_used_total - mm.compr_data_size);
220 + rrdset_done(dev->st_usage);
221 +
222 // zram_savings
228 - rrddim_set_by_pointer(d->st_savings, d->rd_savings_size, mm.compr_data_size - mm.orig_data_size);
229 - rrddim_set_by_pointer(d->st_savings, d->rd_original_size, mm.orig_data_size);
230 - rrdset_done(d->st_savings);
223 + rrddim_set_by_pointer(dev->st_savings, dev->rd_savings_size, mm.compr_data_size - mm.orig_data_size);
224 + rrddim_set_by_pointer(dev->st_savings, dev->rd_original_size, mm.orig_data_size);
225 + rrdset_done(dev->st_savings);
226 +
227 // zram_ratio
228 value = mm.compr_data_size == 0 ? 1 : mm.orig_data_size * 100 / mm.compr_data_size;
233 - rrddim_set_by_pointer(d->st_comp_ratio, d->rd_comp_ratio, value);
234 - rrdset_done(d->st_comp_ratio);
229 + rrddim_set_by_pointer(dev->st_comp_ratio, dev->rd_comp_ratio, value);
230 + rrdset_done(dev->st_comp_ratio);
231 +
232 // zram_efficiency
233 value = mm.mem_used_total == 0 ? 100 : (mm.compr_data_size * 1000000 / mm.mem_used_total);
237 - rrddim_set_by_pointer(d->st_alloc_efficiency, d->rd_alloc_efficiency, value);
238 - rrdset_done(d->st_alloc_efficiency);
239 - return 0;
240 -}
241 -
242 -static int collect_first_zram_metrics(const DICTIONARY_ITEM *item, void *entry, void *data) {
243 - const char *name = dictionary_acquired_item_name(item);
244 -
245 - // collect without calling rrdset_next (init only)
246 - return _collect_zram_metrics(name, (ZRAM_DEVICE *)entry, 0, (DICTIONARY *)data);
247 -}
248 -
249 -static int collect_zram_metrics(const DICTIONARY_ITEM *item, void *entry, void *data) {
250 - const char *name = dictionary_acquired_item_name(item);
234 + rrddim_set_by_pointer(dev->st_alloc_efficiency, dev->rd_alloc_efficiency, value);
235 + rrdset_done(dev->st_alloc_efficiency);
236
252 - // collect with calling rrdset_next
253 - return _collect_zram_metrics(name, (ZRAM_DEVICE *)entry, 1, (DICTIONARY *)data);
237 + return 0;
238 }
239
256 - // --------------------------------------------------------------------
257 -
240 int do_sys_block_zram(int update_every, usec_t dt) {
259 - (void)dt;
241 static procfile *ff = NULL;
242 static DICTIONARY *devices = NULL;
243 static int initialized = 0;
244 static int device_count = 0;
245 int zram_id = -1;
246 +
247 + (void)dt;
248 +
249 if (unlikely(!initialized))
250 {
251 initialized = 1;
@@ -285,15 +269,11 @@ int do_sys_block_zram(int update_every, usec_t dt) {
269
270 devices = dictionary_create(DICT_OPTION_SINGLE_THREADED);
271 device_count = init_devices(devices, (unsigned int)zram_id, update_every);
288 - if (device_count < 1)
289 - return 1;
290 - dictionary_walkthrough_write(devices, collect_first_zram_metrics, devices);
291 - }
292 - else
293 - {
294 - if (unlikely(device_count < 1))
295 - return 1;
296 - dictionary_walkthrough_write(devices, collect_zram_metrics, devices);
272 }
273 +
274 + if (unlikely(device_count < 1))
275 + return 1;
276 +
277 + dictionary_walkthrough_write(devices, collect_zram_metrics, devices);
278 return 0;
279 }
\ No newline at end of file
collectors/proc.plugin/sys_class_infiniband.c
+5 -10
@@ -544,8 +544,7 @@ int do_sys_class_infiniband(int update_every, usec_t dt)
544 FOREACH_COUNTER_BYTES(GEN_RRD_DIM_ADD_CUSTOM, port, 4 * 8 * port->width, 1024, RRD_ALGORITHM_INCREMENTAL)
545
546 port->stv_speed = rrdsetvar_custom_chart_variable_add_and_acquire(port->st_bytes, "link_speed");
547 - } else
548 - rrdset_next(port->st_bytes);
547 + }
548
549 // Link read values to dimensions
550 FOREACH_COUNTER_BYTES(GEN_RRD_DIM_SETP, port)
@@ -578,8 +577,7 @@ int do_sys_class_infiniband(int update_every, usec_t dt)
577 // Create Dimensions
578 rrdset_flag_set(port->st_packets, RRDSET_FLAG_DETAIL);
579 FOREACH_COUNTER_PACKETS(GEN_RRD_DIM_ADD, port)
581 - } else
582 - rrdset_next(port->st_packets);
580 + }
581
582 // Link read values to dimensions
583 FOREACH_COUNTER_PACKETS(GEN_RRD_DIM_SETP, port)
@@ -608,8 +606,7 @@ int do_sys_class_infiniband(int update_every, usec_t dt)
606 // Create Dimensions
607 rrdset_flag_set(port->st_errors, RRDSET_FLAG_DETAIL);
608 FOREACH_COUNTER_ERRORS(GEN_RRD_DIM_ADD, port)
611 - } else
612 - rrdset_next(port->st_errors);
609 + }
610
611 // Link read values to dimensions
612 FOREACH_COUNTER_ERRORS(GEN_RRD_DIM_SETP, port)
@@ -658,8 +655,7 @@ int do_sys_class_infiniband(int update_every, usec_t dt)
655 port->name);
656 port->do_hwerrors = CONFIG_BOOLEAN_NO;
657 }
661 - } else
662 - rrdset_next(port->st_hwerrors);
658 + }
659 }
660
661 if (port->do_hwpackets != CONFIG_BOOLEAN_NO) {
@@ -695,8 +691,7 @@ int do_sys_class_infiniband(int update_every, usec_t dt)
691 port->name);
692 port->do_hwpackets = CONFIG_BOOLEAN_NO;
693 }
698 - } else
699 - rrdset_next(port->st_hwpackets);
694 + }
695 }
696
697 // Update values to rrd (done by vendor-specific function)
collectors/proc.plugin/sys_class_power_supply.c
-4
@@ -365,8 +365,6 @@ int do_sys_class_power_supply(int update_every, usec_t dt) {
365
366 add_labels_to_power_supply(ps, ps->capacity->st);
367 }
368 - else
369 - rrdset_next(ps->capacity->st);
368
369 if(unlikely(!ps->capacity->rd)) ps->capacity->rd = rrddim_add(ps->capacity->st, "capacity", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
370 rrddim_set_by_pointer(ps->capacity->st, ps->capacity->rd, ps->capacity->value);
@@ -398,8 +396,6 @@ int do_sys_class_power_supply(int update_every, usec_t dt) {
396
397 add_labels_to_power_supply(ps, pr->st);
398 }
401 - else
402 - rrdset_next(pr->st);
399
400 struct ps_property_dim *pd;
401 for(pd = pr->property_dim_root; pd; pd = pd->next) {
collectors/proc.plugin/sys_devices_system_edac_mc.c
-4
@@ -150,8 +150,6 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
150 , RRDSET_TYPE_LINE
151 );
152 }
153 - else
154 - rrdset_next(ce_st);
153
154 for(m = mc_root; m; m = m->next) {
155 if (m->ce_count_filename && m->ce_updated) {
@@ -189,8 +187,6 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
187 , RRDSET_TYPE_LINE
188 );
189 }
192 - else
193 - rrdset_next(ue_st);
190
191 for(m = mc_root; m; m = m->next) {
192 if (m->ue_count_filename && m->ue_updated) {
collectors/proc.plugin/sys_devices_system_node.c
-1
@@ -127,7 +127,6 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {
127 rrddim_add(m->numastat_st, "other_node", "other", 1, 1, RRD_ALGORITHM_INCREMENTAL);
128
129 }
130 - else rrdset_next(m->numastat_st);
130
131 size_t lines = procfile_lines(m->numastat_ff), l;
132 for(l = 0; l < lines; l++) {
collectors/proc.plugin/sys_fs_btrfs.c
-4
@@ -587,7 +587,6 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
587
588 add_labels_to_btrfs(node, node->st_allocation_disks);
589 }
590 - else rrdset_next(node->st_allocation_disks);
590
591 // unsigned long long disk_used = node->allocation_data_disk_used + node->allocation_metadata_disk_used + node->allocation_system_disk_used;
592 unsigned long long disk_total = node->allocation_data_disk_total + node->allocation_metadata_disk_total + node->allocation_system_disk_total;
@@ -642,7 +641,6 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
641
642 add_labels_to_btrfs(node, node->st_allocation_data);
643 }
645 - else rrdset_next(node->st_allocation_data);
644
645 rrddim_set_by_pointer(node->st_allocation_data, node->rd_allocation_data_free, node->allocation_data_total_bytes - node->allocation_data_bytes_used);
646 rrddim_set_by_pointer(node->st_allocation_data, node->rd_allocation_data_used, node->allocation_data_bytes_used);
@@ -688,7 +686,6 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
686
687 add_labels_to_btrfs(node, node->st_allocation_metadata);
688 }
691 - else rrdset_next(node->st_allocation_metadata);
689
690 rrddim_set_by_pointer(node->st_allocation_metadata, node->rd_allocation_metadata_free, node->allocation_metadata_total_bytes - node->allocation_metadata_bytes_used - node->allocation_global_rsv_size);
691 rrddim_set_by_pointer(node->st_allocation_metadata, node->rd_allocation_metadata_used, node->allocation_metadata_bytes_used);
@@ -734,7 +731,6 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
731
732 add_labels_to_btrfs(node, node->st_allocation_system);
733 }
737 - else rrdset_next(node->st_allocation_system);
734
735 rrddim_set_by_pointer(node->st_allocation_system, node->rd_allocation_system_free, node->allocation_system_total_bytes - node->allocation_system_bytes_used);
736 rrddim_set_by_pointer(node->st_allocation_system, node->rd_allocation_system_used, node->allocation_system_bytes_used);
collectors/proc.plugin/sys_kernel_mm_ksm.c
-7
@@ -119,8 +119,6 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
119 rd_volatile = rrddim_add(st_mem_ksm, "volatile", NULL, -1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
120 //rd_to_scan = rrddim_add(st_mem_ksm, "to_scan", "to scan", -1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
121 }
122 - else
123 - rrdset_next(st_mem_ksm);
122
123 rrddim_set_by_pointer(st_mem_ksm, rd_shared, pages_shared * page_size);
124 rrddim_set_by_pointer(st_mem_ksm, rd_unshared, pages_unshared * page_size);
@@ -156,8 +154,6 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
154 rd_savings = rrddim_add(st_mem_ksm_savings, "savings", NULL, -1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
155 rd_offered = rrddim_add(st_mem_ksm_savings, "offered", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
156 }
159 - else
160 - rrdset_next(st_mem_ksm_savings);
157
158 rrddim_set_by_pointer(st_mem_ksm_savings, rd_savings, saved * page_size);
159 rrddim_set_by_pointer(st_mem_ksm_savings, rd_offered, offered * page_size);
@@ -189,11 +185,8 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
185
186 rd_savings = rrddim_add(st_mem_ksm_ratios, "savings", NULL, 1, 10000, RRD_ALGORITHM_ABSOLUTE);
187 }
192 - else
193 - rrdset_next(st_mem_ksm_ratios);
188
189 rrddim_set_by_pointer(st_mem_ksm_ratios, rd_savings, offered ? (saved * 1000000) / offered : 0);
196 -
190 rrdset_done(st_mem_ksm_ratios);
191 }
192
collectors/proc.plugin/zfs_common.c
-52
@@ -67,8 +67,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
67 rd_arc_target_min_size = rrddim_add(st_arc_size, "min", "min (hard limit)", 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
68 rd_arc_target_max_size = rrddim_add(st_arc_size, "max", "max (high water)", 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
69 }
70 - else
71 - rrdset_next(st_arc_size);
70
71 rrddim_set_by_pointer(st_arc_size, rd_arc_size, arcstats.size);
72 rrddim_set_by_pointer(st_arc_size, rd_arc_target_size, arcstats.c);
@@ -105,8 +103,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
103 rd_l2_asize = rrddim_add(st_l2_size, "actual", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
104 rd_l2_size = rrddim_add(st_l2_size, "size", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
105 }
108 - else
109 - rrdset_next(st_l2_size);
106
107 rrddim_set_by_pointer(st_l2_size, rd_l2_size, arcstats.l2_size);
108 rrddim_set_by_pointer(st_l2_size, rd_l2_asize, arcstats.l2_asize);
@@ -149,8 +145,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
145 if(arcstats.l2exist)
146 rd_l2read = rrddim_add(st_reads, "l2reads", "l2", 1, 1, RRD_ALGORITHM_INCREMENTAL);
147 }
152 - else
153 - rrdset_next(st_reads);
148
149 rrddim_set_by_pointer(st_reads, rd_aread, aread);
150 rrddim_set_by_pointer(st_reads, rd_dread, dread);
@@ -191,8 +185,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
185 rd_l2_read_bytes = rrddim_add(st_l2bytes, "read", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
186 rd_l2_write_bytes = rrddim_add(st_l2bytes, "write", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
187 }
194 - else
195 - rrdset_next(st_l2bytes);
188
189 rrddim_set_by_pointer(st_l2bytes, rd_l2_read_bytes, arcstats.l2_read_bytes);
190 rrddim_set_by_pointer(st_l2bytes, rd_l2_write_bytes, arcstats.l2_write_bytes);
@@ -227,8 +219,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
219 rd_ahits = rrddim_add(st_ahits, "hits", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
220 rd_amisses = rrddim_add(st_ahits, "misses", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
221 }
230 - else
231 - rrdset_next(st_ahits);
222
223 rrddim_set_by_pointer(st_ahits, rd_ahits, arcstats.hits);
224 rrddim_set_by_pointer(st_ahits, rd_amisses, arcstats.misses);
@@ -257,8 +247,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
247 rd_ahits_rate = rrddim_add(st_ahits_rate, "hits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
248 rd_amisses_rate = rrddim_add(st_ahits_rate, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
249 }
260 - else
261 - rrdset_next(st_ahits_rate);
250
251 rrddim_set_by_pointer(st_ahits_rate, rd_ahits_rate, arcstats.hits);
252 rrddim_set_by_pointer(st_ahits_rate, rd_amisses_rate, arcstats.misses);
@@ -293,8 +281,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
281 rd_dhits = rrddim_add(st_dhits, "hits", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
282 rd_dmisses = rrddim_add(st_dhits, "misses", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
283 }
296 - else
297 - rrdset_next(st_dhits);
284
285 rrddim_set_by_pointer(st_dhits, rd_dhits, dhit);
286 rrddim_set_by_pointer(st_dhits, rd_dmisses, dmiss);
@@ -323,8 +309,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
309 rd_dhits_rate = rrddim_add(st_dhits_rate, "hits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
310 rd_dmisses_rate = rrddim_add(st_dhits_rate, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
311 }
326 - else
327 - rrdset_next(st_dhits_rate);
312
313 rrddim_set_by_pointer(st_dhits_rate, rd_dhits_rate, dhit);
314 rrddim_set_by_pointer(st_dhits_rate, rd_dmisses_rate, dmiss);
@@ -359,8 +343,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
343 rd_phits = rrddim_add(st_phits, "hits", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
344 rd_pmisses = rrddim_add(st_phits, "misses", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
345 }
362 - else
363 - rrdset_next(st_phits);
346
347 rrddim_set_by_pointer(st_phits, rd_phits, phit);
348 rrddim_set_by_pointer(st_phits, rd_pmisses, pmiss);
@@ -389,8 +371,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
371 rd_phits_rate = rrddim_add(st_phits_rate, "hits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
372 rd_pmisses_rate = rrddim_add(st_phits_rate, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
373 }
392 - else
393 - rrdset_next(st_phits_rate);
374
375 rrddim_set_by_pointer(st_phits_rate, rd_phits_rate, phit);
376 rrddim_set_by_pointer(st_phits_rate, rd_pmisses_rate, pmiss);
@@ -425,8 +405,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
405 rd_mhits = rrddim_add(st_mhits, "hits", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
406 rd_mmisses = rrddim_add(st_mhits, "misses", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
407 }
428 - else
429 - rrdset_next(st_mhits);
408
409 rrddim_set_by_pointer(st_mhits, rd_mhits, mhit);
410 rrddim_set_by_pointer(st_mhits, rd_mmisses, mmiss);
@@ -455,8 +433,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
433 rd_mhits_rate = rrddim_add(st_mhits_rate, "hits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
434 rd_mmisses_rate = rrddim_add(st_mhits_rate, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
435 }
458 - else
459 - rrdset_next(st_mhits_rate);
436
437 rrddim_set_by_pointer(st_mhits_rate, rd_mhits_rate, mhit);
438 rrddim_set_by_pointer(st_mhits_rate, rd_mmisses_rate, mmiss);
@@ -491,8 +467,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
467 rd_l2hits = rrddim_add(st_l2hits, "hits", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
468 rd_l2misses = rrddim_add(st_l2hits, "misses", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
469 }
494 - else
495 - rrdset_next(st_l2hits);
470
471 rrddim_set_by_pointer(st_l2hits, rd_l2hits, l2hit);
472 rrddim_set_by_pointer(st_l2hits, rd_l2misses, l2miss);
@@ -521,8 +495,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
495 rd_l2hits_rate = rrddim_add(st_l2hits_rate, "hits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
496 rd_l2misses_rate = rrddim_add(st_l2hits_rate, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
497 }
524 - else
525 - rrdset_next(st_l2hits_rate);
498
499 rrddim_set_by_pointer(st_l2hits_rate, rd_l2hits_rate, l2hit);
500 rrddim_set_by_pointer(st_l2hits_rate, rd_l2misses_rate, l2miss);
@@ -564,8 +536,6 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
536 rd_mru = rrddim_add(st_list_hits, "mru", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
537 rd_mrug = rrddim_add(st_list_hits, "mrug", "mru ghost", 1, 1, RRD_ALGORITHM_INCREMENTAL);
538 }
567 - else
568 - rrdset_next(st_list_hits);
539
540 rrddim_set_by_pointer(st_list_hits, rd_mfu, arcstats.mfu_hits);
541 rrddim_set_by_pointer(st_list_hits, rd_mru, arcstats.mru_hits);
@@ -630,8 +600,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
600 rd_most_recent = rrddim_add(st_arc_size_breakdown, "recent", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_ROW_TOTAL);
601 rd_most_frequent = rrddim_add(st_arc_size_breakdown, "frequent", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_ROW_TOTAL);
602 }
633 - else
634 - rrdset_next(st_arc_size_breakdown);
603
604 rrddim_set_by_pointer(st_arc_size_breakdown, rd_most_recent, mru_size);
605 rrddim_set_by_pointer(st_arc_size_breakdown, rd_most_frequent, mfu_size);
@@ -678,8 +646,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
646 rd_indirect = rrddim_add(st_memory, "indirect", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
647 #endif
648 }
681 - else
682 - rrdset_next(st_memory);
649
650 #ifndef __FreeBSD__
651 rrddim_set_by_pointer(st_memory, rd_direct, arcstats.memory_direct_count);
@@ -726,8 +692,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
692 rd_mutex_misses = rrddim_add(st_important_ops, "mtxmis", "mutex miss", 1, 1, RRD_ALGORITHM_INCREMENTAL);
693 rd_hash_collisions = rrddim_add(st_important_ops, "hash_collisions", "hash collisions", 1, 1, RRD_ALGORITHM_INCREMENTAL);
694 }
729 - else
730 - rrdset_next(st_important_ops);
695
696 rrddim_set_by_pointer(st_important_ops, rd_deleted, arcstats.deleted);
697 rrddim_set_by_pointer(st_important_ops, rd_evict_skips, arcstats.evict_skip);
@@ -764,8 +728,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
728 rd_actual_hits = rrddim_add(st_actual_hits, "hits", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
729 rd_actual_misses = rrddim_add(st_actual_hits, "misses", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
730 }
767 - else
768 - rrdset_next(st_actual_hits);
731
732 rrddim_set_by_pointer(st_actual_hits, rd_actual_hits, real_hits);
733 rrddim_set_by_pointer(st_actual_hits, rd_actual_misses, real_misses);
@@ -794,8 +756,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
756 rd_actual_hits_rate = rrddim_add(st_actual_hits_rate, "hits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
757 rd_actual_misses_rate = rrddim_add(st_actual_hits_rate, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
758 }
797 - else
798 - rrdset_next(st_actual_hits_rate);
759
760 rrddim_set_by_pointer(st_actual_hits_rate, rd_actual_hits_rate, real_hits);
761 rrddim_set_by_pointer(st_actual_hits_rate, rd_actual_misses_rate, real_misses);
@@ -830,8 +790,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
790 rd_demand_data_hits = rrddim_add(st_demand_data_hits, "hits", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
791 rd_demand_data_misses = rrddim_add(st_demand_data_hits, "misses", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
792 }
833 - else
834 - rrdset_next(st_demand_data_hits);
793
794 rrddim_set_by_pointer(st_demand_data_hits, rd_demand_data_hits, arcstats.demand_data_hits);
795 rrddim_set_by_pointer(st_demand_data_hits, rd_demand_data_misses, arcstats.demand_data_misses);
@@ -860,8 +818,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
818 rd_demand_data_hits_rate = rrddim_add(st_demand_data_hits_rate, "hits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
819 rd_demand_data_misses_rate = rrddim_add(st_demand_data_hits_rate, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
820 }
863 - else
864 - rrdset_next(st_demand_data_hits_rate);
821
822 rrddim_set_by_pointer(st_demand_data_hits_rate, rd_demand_data_hits_rate, arcstats.demand_data_hits);
823 rrddim_set_by_pointer(st_demand_data_hits_rate, rd_demand_data_misses_rate, arcstats.demand_data_misses);
@@ -897,8 +853,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
853 rd_prefetch_data_hits = rrddim_add(st_prefetch_data_hits, "hits", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
854 rd_prefetch_data_misses = rrddim_add(st_prefetch_data_hits, "misses", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
855 }
900 - else
901 - rrdset_next(st_prefetch_data_hits);
856
857 rrddim_set_by_pointer(st_prefetch_data_hits, rd_prefetch_data_hits, arcstats.prefetch_data_hits);
858 rrddim_set_by_pointer(st_prefetch_data_hits, rd_prefetch_data_misses, arcstats.prefetch_data_misses);
@@ -927,8 +881,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
881 rd_prefetch_data_hits_rate = rrddim_add(st_prefetch_data_hits_rate, "hits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
882 rd_prefetch_data_misses_rate = rrddim_add(st_prefetch_data_hits_rate, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
883 }
930 - else
931 - rrdset_next(st_prefetch_data_hits_rate);
884
885 rrddim_set_by_pointer(st_prefetch_data_hits_rate, rd_prefetch_data_hits_rate, arcstats.prefetch_data_hits);
886 rrddim_set_by_pointer(st_prefetch_data_hits_rate, rd_prefetch_data_misses_rate, arcstats.prefetch_data_misses);
@@ -963,8 +915,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
915 rd_hash_elements_current = rrddim_add(st_hash_elements, "current", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
916 rd_hash_elements_max = rrddim_add(st_hash_elements, "max", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
917 }
966 - else
967 - rrdset_next(st_hash_elements);
918
919 rrddim_set_by_pointer(st_hash_elements, rd_hash_elements_current, arcstats.hash_elements);
920 rrddim_set_by_pointer(st_hash_elements, rd_hash_elements_max, arcstats.hash_elements_max);
@@ -999,8 +949,6 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int sho
949 rd_hash_chains_current = rrddim_add(st_hash_chains, "current", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
950 rd_hash_chains_max = rrddim_add(st_hash_chains, "max", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
951 }
1002 - else
1003 - rrdset_next(st_hash_chains);
952
953 rrddim_set_by_pointer(st_hash_chains, rd_hash_chains_current, arcstats.hash_chains);
954 rrddim_set_by_pointer(st_hash_chains, rd_hash_chains_max, arcstats.hash_chain_max);
collectors/statsd.plugin/statsd.c
+1 -19
@@ -1671,7 +1671,6 @@ static inline void statsd_private_chart_gauge(STATSD_METRIC *m) {
1671 if(m->options & STATSD_METRIC_OPTION_CHART_DIMENSION_COUNT)
1672 m->rd_count = rrddim_add(m->st, "events", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1673 }
1674 - else rrdset_next(m->st);
1674
1675 rrddim_set_by_pointer(m->st, m->rd_value, m->last);
1676
@@ -1712,7 +1711,6 @@ static inline void statsd_private_chart_counter_or_meter(STATSD_METRIC *m, const
1711 if(m->options & STATSD_METRIC_OPTION_CHART_DIMENSION_COUNT)
1712 m->rd_count = rrddim_add(m->st, "events", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1713 }
1715 - else rrdset_next(m->st);
1714
1715 rrddim_set_by_pointer(m->st, m->rd_value, m->last);
1716
@@ -1753,7 +1751,6 @@ static inline void statsd_private_chart_set(STATSD_METRIC *m) {
1751 if(m->options & STATSD_METRIC_OPTION_CHART_DIMENSION_COUNT)
1752 m->rd_count = rrddim_add(m->st, "events", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1753 }
1756 - else rrdset_next(m->st);
1754
1755 rrddim_set_by_pointer(m->st, m->rd_value, m->last);
1756
@@ -1792,7 +1789,6 @@ static inline void statsd_private_chart_dictionary(STATSD_METRIC *m) {
1789 if(m->options & STATSD_METRIC_OPTION_CHART_DIMENSION_COUNT)
1790 m->rd_count = rrddim_add(m->st, "events", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1791 }
1795 - else rrdset_next(m->st);
1792
1793 STATSD_METRIC_DICTIONARY_ITEM *t;
1794 dfe_start_read(m->dictionary.dict, t) {
@@ -1844,7 +1840,6 @@ static inline void statsd_private_chart_timer_or_histogram(STATSD_METRIC *m, con
1840 if(m->options & STATSD_METRIC_OPTION_CHART_DIMENSION_COUNT)
1841 m->rd_count = rrddim_add(m->st, "events", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1842 }
1847 - else rrdset_next(m->st);
1843
1844 rrddim_set_by_pointer(m->st, m->histogram.ext->rd_min, m->histogram.ext->last_min);
1845 rrddim_set_by_pointer(m->st, m->histogram.ext->rd_max, m->histogram.ext->last_max);
@@ -2245,7 +2240,6 @@ static inline void statsd_update_app_chart(STATSD_APP *app, STATSD_APP_CHART *ch
2240 rrdset_flag_set(chart->st, RRDSET_FLAG_STORE_FIRST);
2241 // rrdset_flag_set(chart->st, RRDSET_FLAG_DEBUG);
2242 }
2248 - else rrdset_next(chart->st);
2243
2244 STATSD_APP_CHART_DIM *dim;
2245 for(dim = chart->dimensions; dim ;dim = dim->next) {
@@ -2761,7 +2755,7 @@ void *statsd_main(void *ptr) {
2755 heartbeat_init(&hb);
2756 while(!netdata_exit) {
2757 worker_is_idle();
2764 - usec_t hb_dt = heartbeat_next(&hb, step);
2758 + heartbeat_next(&hb, step);
2759
2760 worker_is_busy(WORKER_STATSD_FLUSH_GAUGES);
2761 statsd_flush_index_metrics(&statsd.gauges, statsd_flush_gauge);
@@ -2791,18 +2785,6 @@ void *statsd_main(void *ptr) {
2785 break;
2786
2787 if(global_statistics_enabled) {
2794 - if(likely(hb_dt)) {
2795 - rrdset_next(st_metrics);
2796 - rrdset_next(st_useful_metrics);
2797 - rrdset_next(st_events);
2798 - rrdset_next(st_reads);
2799 - rrdset_next(st_bytes);
2800 - rrdset_next(st_packets);
2801 - rrdset_next(st_tcp_connects);
2802 - rrdset_next(st_tcp_connected);
2803 - rrdset_next(st_pcharts);
2804 - }
2805 -
2788 rrddim_set_by_pointer(st_metrics, rd_metrics_gauge, (collected_number)statsd.gauges.metrics);
2789 rrddim_set_by_pointer(st_metrics, rd_metrics_counter, (collected_number)statsd.counters.metrics);
2790 rrddim_set_by_pointer(st_metrics, rd_metrics_timer, (collected_number)statsd.timers.metrics);
collectors/tc.plugin/plugin_tc.c
-8
@@ -421,7 +421,6 @@ static inline void tc_device_commit(struct tc_device *d) {
421 rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
422 }
423 else {
424 - rrdset_next(d->st_bytes);
424 if(unlikely(d->name_updated))
425 rrdset_reset_name(d->st_bytes, string2str(d->name));
426
@@ -483,8 +482,6 @@ static inline void tc_device_commit(struct tc_device *d) {
482 rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
483 }
484 else {
486 - rrdset_next(d->st_packets);
487 -
485 if(unlikely(d->name_updated)) {
486 char name[RRD_ID_LENGTH_MAX + 1];
487 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_packets", string2str(d->name?d->name:d->id));
@@ -549,8 +546,6 @@ static inline void tc_device_commit(struct tc_device *d) {
546 rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
547 }
548 else {
552 - rrdset_next(d->st_dropped);
553 -
549 if(unlikely(d->name_updated)) {
550 char name[RRD_ID_LENGTH_MAX + 1];
551 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_dropped", string2str(d->name?d->name:d->id));
@@ -615,8 +610,6 @@ static inline void tc_device_commit(struct tc_device *d) {
610 rrdlabels_add(d->st_bytes->rrdlabels, "family", string2str(d->family?d->family:d->id), RRDLABEL_SRC_AUTO);
611 }
612 else {
618 - rrdset_next(d->st_tokens);
619 -
613 if(unlikely(d->name_updated)) {
614 char name[RRD_ID_LENGTH_MAX + 1];
615 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_tokens", string2str(d->name?d->name:d->id));
@@ -683,7 +676,6 @@ static inline void tc_device_commit(struct tc_device *d) {
676 }
677 else {
678 debug(D_TC_LOOP, "TC: Updating _ctokens chart for device '%s'", string2str(d->name?d->name:d->id));
686 - rrdset_next(d->st_ctokens);
679
680 if(unlikely(d->name_updated)) {
681 char name[RRD_ID_LENGTH_MAX + 1];
collectors/timex.plugin/plugin_timex.c
+2 -8
@@ -109,8 +109,6 @@ void *timex_main(void *ptr)
109 RRDSET_TYPE_LINE);
110
111 rd_sync_state = rrddim_add(st_sync_state, "state", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
112 - } else {
113 - rrdset_next(st_sync_state);
112 }
113
114 rrddim_set_by_pointer(st_sync_state, rd_sync_state, sync_state != TIME_ERROR ? 1 : 0);
@@ -137,13 +135,11 @@ void *timex_main(void *ptr)
135 sta_codes[i].rd =
136 rrddim_add(st_clock_status, sta_codes[i].name, NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
137 }
140 - } else {
141 - rrdset_next(st_clock_status);
138 }
139
144 - for (int i = 0; sta_codes[i].name != NULL; i++) {
140 + for (int i = 0; sta_codes[i].name != NULL; i++)
141 rrddim_set_by_pointer(st_clock_status, sta_codes[i].rd, timex_buf.status & sta_codes[i].code ? 1 : 0);
146 - }
142 +
143 rrdset_done(st_clock_status);
144 }
145
@@ -167,8 +163,6 @@ void *timex_main(void *ptr)
163 RRDSET_TYPE_LINE);
164
165 rd_offset = rrddim_add(st_offset, "offset", NULL, 1, divisor, RRD_ALGORITHM_ABSOLUTE);
170 - } else {
171 - rrdset_next(st_offset);
166 }
167
168 rrddim_set_by_pointer(st_offset, rd_offset, timex_buf.offset);
configure.ac
-1
@@ -1700,7 +1700,6 @@ AC_CONFIG_FILES([
1700 collectors/apps.plugin/Makefile
1701 collectors/cgroups.plugin/Makefile
1702 collectors/charts.d.plugin/Makefile
1703 - collectors/checks.plugin/Makefile
1703 collectors/diskspace.plugin/Makefile
1704 collectors/timex.plugin/Makefile
1705 collectors/fping.plugin/Makefile
daemon/global_statistics.c
+14 -90
@@ -206,8 +206,6 @@ static void global_statistics_charts(void) {
206 rd_cpu_user = rrddim_add(st_cpu, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
207 rd_cpu_system = rrddim_add(st_cpu, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
208 }
209 - else
210 - rrdset_next(st_cpu);
209
210 rrddim_set_by_pointer(st_cpu, rd_cpu_user, me.ru_utime.tv_sec * 1000000ULL + me.ru_utime.tv_usec);
211 rrddim_set_by_pointer(st_cpu, rd_cpu_system, me.ru_stime.tv_sec * 1000000ULL + me.ru_stime.tv_usec);
@@ -236,8 +234,7 @@ static void global_statistics_charts(void) {
234 RRDSET_TYPE_LINE);
235
236 rd_uptime = rrddim_add(st_uptime, "uptime", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
239 - } else
240 - rrdset_next(st_uptime);
237 + }
238
239 rrddim_set_by_pointer(st_uptime, rd_uptime, netdata_uptime);
240 rrdset_done(st_uptime);
@@ -267,8 +264,6 @@ static void global_statistics_charts(void) {
264
265 rd_clients = rrddim_add(st_clients, "clients", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
266 }
270 - else
271 - rrdset_next(st_clients);
267
268 rrddim_set_by_pointer(st_clients, rd_clients, gs.connected_clients);
269 rrdset_done(st_clients);
@@ -298,8 +293,6 @@ static void global_statistics_charts(void) {
293
294 rd_requests = rrddim_add(st_reqs, "requests", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
295 }
301 - else
302 - rrdset_next(st_reqs);
296
297 rrddim_set_by_pointer(st_reqs, rd_requests, (collected_number) gs.web_requests);
298 rrdset_done(st_reqs);
@@ -331,8 +324,6 @@ static void global_statistics_charts(void) {
324 rd_in = rrddim_add(st_bytes, "in", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
325 rd_out = rrddim_add(st_bytes, "out", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
326 }
334 - else
335 - rrdset_next(st_bytes);
327
328 rrddim_set_by_pointer(st_bytes, rd_in, (collected_number) gs.bytes_received);
329 rrddim_set_by_pointer(st_bytes, rd_out, (collected_number) gs.bytes_sent);
@@ -365,8 +356,6 @@ static void global_statistics_charts(void) {
356 rd_average = rrddim_add(st_duration, "average", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
357 rd_max = rrddim_add(st_duration, "max", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
358 }
368 - else
369 - rrdset_next(st_duration);
359
360 uint64_t gweb_usec = gs.web_usec;
361 uint64_t gweb_requests = gs.web_requests;
@@ -413,8 +402,6 @@ static void global_statistics_charts(void) {
402
403 rd_savings = rrddim_add(st_compression, "savings", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
404 }
416 - else
417 - rrdset_next(st_compression);
405
406 // since we don't lock here to read the global statistics
407 // read the smaller value first
@@ -460,8 +447,6 @@ static void global_statistics_charts(void) {
447
448 rd_queries = rrddim_add(st_rrdr_queries, "queries", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
449 }
463 - else
464 - rrdset_next(st_rrdr_queries);
450
451 rrddim_set_by_pointer(st_rrdr_queries, rd_queries, (collected_number)gs.rrdr_queries_made);
452
@@ -494,8 +479,6 @@ static void global_statistics_charts(void) {
479 rd_points_read = rrddim_add(st_rrdr_points, "read", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
480 rd_points_generated = rrddim_add(st_rrdr_points, "generated", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
481 }
497 - else
498 - rrdset_next(st_rrdr_points);
482
483 rrddim_set_by_pointer(st_rrdr_points, rd_points_read, (collected_number)gs.rrdr_db_points_read);
484 rrddim_set_by_pointer(st_rrdr_points, rd_points_generated, (collected_number)gs.rrdr_result_points_generated);
@@ -527,8 +510,6 @@ static void global_statistics_charts(void) {
510
511 rd_queries = rrddim_add(st_sqlite3_queries, "queries", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
512 }
530 - else
531 - rrdset_next(st_sqlite3_queries);
513
514 rrddim_set_by_pointer(st_sqlite3_queries, rd_queries, (collected_number)gs.sqlite3_queries_made);
515
@@ -562,8 +543,6 @@ static void global_statistics_charts(void) {
543 rd_busy = rrddim_add(st_sqlite3_queries_by_status, "busy", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
544 rd_locked = rrddim_add(st_sqlite3_queries_by_status, "locked", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
545 }
565 - else
566 - rrdset_next(st_sqlite3_queries_by_status);
546
547 rrddim_set_by_pointer(st_sqlite3_queries_by_status, rd_ok, (collected_number)gs.sqlite3_queries_made);
548 rrddim_set_by_pointer(st_sqlite3_queries_by_status, rd_failed, (collected_number)gs.sqlite3_queries_failed);
@@ -597,8 +576,6 @@ static void global_statistics_charts(void) {
576
577 rd_rows = rrddim_add(st_sqlite3_rows, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
578 }
600 - else
601 - rrdset_next(st_sqlite3_rows);
579
580 rrddim_set_by_pointer(st_sqlite3_rows, rd_rows, (collected_number)gs.sqlite3_rows);
581
@@ -633,8 +610,6 @@ static void global_statistics_charts(void) {
610 rd_cache_spill = rrddim_add(st_sqlite3_cache, "cache_spill", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
611 rd_cache_write = rrddim_add(st_sqlite3_cache, "cache_write", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
612 }
636 - else
637 - rrdset_next(st_sqlite3_cache);
613
614 rrddim_set_by_pointer(st_sqlite3_cache, rd_cache_hit, (collected_number)gs.sqlite3_metadata_cache_hit);
615 rrddim_set_by_pointer(st_sqlite3_cache, rd_cache_miss, (collected_number)gs.sqlite3_metadata_cache_miss);
@@ -672,8 +647,6 @@ static void global_statistics_charts(void) {
647 rd_cache_spill = rrddim_add(st_sqlite3_cache, "cache_spill", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
648 rd_cache_write = rrddim_add(st_sqlite3_cache, "cache_write", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
649 }
675 - else
676 - rrdset_next(st_sqlite3_cache);
650
651 rrddim_set_by_pointer(st_sqlite3_cache, rd_cache_hit, (collected_number)gs.sqlite3_context_cache_hit);
652 rrddim_set_by_pointer(st_sqlite3_cache, rd_cache_miss, (collected_number)gs.sqlite3_context_cache_miss);
@@ -750,8 +723,7 @@ static void dbengine_statistics_charts(void) {
723 RRDSET_TYPE_LINE);
724
725 rd_savings = rrddim_add(st_compression, "savings", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
753 - } else
754 - rrdset_next(st_compression);
726 + }
727
728 unsigned long long ratio;
729 unsigned long long compressed_content_size = stats_array[12];
@@ -790,8 +762,7 @@ static void dbengine_statistics_charts(void) {
762 RRDSET_TYPE_LINE);
763
764 rd_hit_ratio = rrddim_add(st_pg_cache_hit_ratio, "ratio", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
793 - } else
794 - rrdset_next(st_pg_cache_hit_ratio);
765 + }
766
767 static unsigned long long old_hits = 0;
768 static unsigned long long old_misses = 0;
@@ -849,8 +820,7 @@ static void dbengine_statistics_charts(void) {
820 rd_evictions = rrddim_add(st_pg_cache_pages, "evictions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
821 rd_used_by_collectors =
822 rrddim_add(st_pg_cache_pages, "used_by_collectors", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
852 - } else
853 - rrdset_next(st_pg_cache_pages);
823 + }
824
825 rrddim_set_by_pointer(st_pg_cache_pages, rd_descriptors, (collected_number)stats_array[27]);
826 rrddim_set_by_pointer(st_pg_cache_pages, rd_populated, (collected_number)stats_array[3]);
@@ -890,8 +860,7 @@ static void dbengine_statistics_charts(void) {
860 rd_deletions = rrddim_add(st_long_term_pages, "deletions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
861 rd_flushing_pressure_deletions = rrddim_add(
862 st_long_term_pages, "flushing_pressure_deletions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
893 - } else
894 - rrdset_next(st_long_term_pages);
863 + }
864
865 rrddim_set_by_pointer(st_long_term_pages, rd_total, (collected_number)stats_array[2]);
866 rrddim_set_by_pointer(st_long_term_pages, rd_insertions, (collected_number)stats_array[5]);
@@ -925,8 +894,7 @@ static void dbengine_statistics_charts(void) {
894
895 rd_reads = rrddim_add(st_io_stats, "reads", NULL, 1, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
896 rd_writes = rrddim_add(st_io_stats, "writes", NULL, -1, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
928 - } else
929 - rrdset_next(st_io_stats);
897 + }
898
899 rrddim_set_by_pointer(st_io_stats, rd_reads, (collected_number)stats_array[17]);
900 rrddim_set_by_pointer(st_io_stats, rd_writes, (collected_number)stats_array[15]);
@@ -957,8 +925,7 @@ static void dbengine_statistics_charts(void) {
925
926 rd_reads = rrddim_add(st_io_stats, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
927 rd_writes = rrddim_add(st_io_stats, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
960 - } else
961 - rrdset_next(st_io_stats);
928 + }
929
930 rrddim_set_by_pointer(st_io_stats, rd_reads, (collected_number)stats_array[18]);
931 rrddim_set_by_pointer(st_io_stats, rd_writes, (collected_number)stats_array[16]);
@@ -992,8 +959,7 @@ static void dbengine_statistics_charts(void) {
959 rd_fs_errors = rrddim_add(st_errors, "fs_errors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
960 pg_cache_over_half_dirty_events =
961 rrddim_add(st_errors, "pg_cache_over_half_dirty_events", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
995 - } else
996 - rrdset_next(st_errors);
962 + }
963
964 rrddim_set_by_pointer(st_errors, rd_io_errors, (collected_number)stats_array[30]);
965 rrddim_set_by_pointer(st_errors, rd_fs_errors, (collected_number)stats_array[31]);
@@ -1025,8 +991,7 @@ static void dbengine_statistics_charts(void) {
991
992 rd_fd_current = rrddim_add(st_fd, "current", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
993 rd_fd_max = rrddim_add(st_fd, "max", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1028 - } else
1029 - rrdset_next(st_fd);
994 + }
995
996 rrddim_set_by_pointer(st_fd, rd_fd_current, (collected_number)stats_array[32]);
997 /* Careful here, modify this accordingly if the File-Descriptor budget ever changes */
@@ -1067,8 +1032,7 @@ static void dbengine_statistics_charts(void) {
1032 rd_cache_metadata = rrddim_add(st_ram_usage, "cache metadata", NULL, 1, 1024*1024, RRD_ALGORITHM_ABSOLUTE);
1033 rd_pages_metadata = rrddim_add(st_ram_usage, "pages metadata", NULL, 1, 1024*1024, RRD_ALGORITHM_ABSOLUTE);
1034 rd_index_metadata = rrddim_add(st_ram_usage, "index metadata", NULL, 1, 1024*1024, RRD_ALGORITHM_ABSOLUTE);
1070 - } else
1071 - rrdset_next(st_ram_usage);
1035 + }
1036
1037 API_producers = (collected_number)stats_array[0];
1038 pages_on_disk = (collected_number)stats_array[2];
@@ -1124,8 +1088,7 @@ static void update_strings_charts() {
1088 rd_ops_searches = rrddim_add(st_ops, "searches", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1089 rd_ops_duplications = rrddim_add(st_ops, "duplications", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1090 rd_ops_releases = rrddim_add(st_ops, "releases", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1127 - } else
1128 - rrdset_next(st_ops);
1091 + }
1092
1093 rrddim_set_by_pointer(st_ops, rd_ops_inserts, (collected_number)inserts);
1094 rrddim_set_by_pointer(st_ops, rd_ops_deletes, (collected_number)deletes);
@@ -1151,8 +1114,7 @@ static void update_strings_charts() {
1114
1115 rd_entries_entries = rrddim_add(st_entries, "entries", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1116 rd_entries_refs = rrddim_add(st_entries, "references", NULL, 1, -1, RRD_ALGORITHM_ABSOLUTE);
1154 - } else
1155 - rrdset_next(st_entries);
1117 + }
1118
1119 rrddim_set_by_pointer(st_entries, rd_entries_entries, (collected_number)entries);
1120 rrddim_set_by_pointer(st_entries, rd_entries_refs, (collected_number)references);
@@ -1174,8 +1136,7 @@ static void update_strings_charts() {
1136 , RRDSET_TYPE_AREA);
1137
1138 rd_mem = rrddim_add(st_mem, "memory", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1177 - } else
1178 - rrdset_next(st_mem);
1139 + }
1140
1141 rrddim_set_by_pointer(st_mem, rd_mem, (collected_number)memory);
1142 rrdset_done(st_mem);
@@ -1205,8 +1166,7 @@ static void update_heartbeat_charts() {
1166 rd_heartbeat_min = rrddim_add(st_heartbeat, "min", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1167 rd_heartbeat_max = rrddim_add(st_heartbeat, "max", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1168 rd_heartbeat_avg = rrddim_add(st_heartbeat, "average", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1208 - } else
1209 - rrdset_next(st_heartbeat);
1169 + }
1170
1171 usec_t min, max, average;
1172 size_t count;
@@ -1313,8 +1273,6 @@ static void update_dictionary_category_charts(struct dictionary_categories *c) {
1273
1274 rrdlabels_add(c->st_dicts->rrdlabels, "category", stats.name, RRDLABEL_SRC_AUTO);
1275 }
1316 - else
1317 - rrdset_next(c->st_dicts);
1276
1277 rrddim_set_by_pointer(c->st_dicts, c->rd_dicts_active, (collected_number)stats.dictionaries.active);
1278 rrddim_set_by_pointer(c->st_dicts, c->rd_dicts_deleted, (collected_number)stats.dictionaries.deleted);
@@ -1357,8 +1315,6 @@ static void update_dictionary_category_charts(struct dictionary_categories *c) {
1315
1316 rrdlabels_add(c->st_items->rrdlabels, "category", stats.name, RRDLABEL_SRC_AUTO);
1317 }
1360 - else
1361 - rrdset_next(c->st_items);
1318
1319 rrddim_set_by_pointer(c->st_items, c->rd_items_entries, stats.items.entries);
1320 rrddim_set_by_pointer(c->st_items, c->rd_items_pending_deletion, stats.items.pending_deletion);
@@ -1416,8 +1372,6 @@ static void update_dictionary_category_charts(struct dictionary_categories *c) {
1372
1373 rrdlabels_add(c->st_ops->rrdlabels, "category", stats.name, RRDLABEL_SRC_AUTO);
1374 }
1419 - else
1420 - rrdset_next(c->st_ops);
1375
1376 rrddim_set_by_pointer(c->st_ops, c->rd_ops_creations, (collected_number)stats.ops.creations);
1377 rrddim_set_by_pointer(c->st_ops, c->rd_ops_destructions, (collected_number)stats.ops.destructions);
@@ -1471,8 +1425,6 @@ static void update_dictionary_category_charts(struct dictionary_categories *c) {
1425
1426 rrdlabels_add(c->st_callbacks->rrdlabels, "category", stats.name, RRDLABEL_SRC_AUTO);
1427 }
1474 - else
1475 - rrdset_next(c->st_callbacks);
1428
1429 rrddim_set_by_pointer(c->st_callbacks, c->rd_callbacks_inserts, (collected_number)stats.callbacks.inserts);
1430 rrddim_set_by_pointer(c->st_callbacks, c->rd_callbacks_conflicts, (collected_number)stats.callbacks.conflicts);
@@ -1518,8 +1470,6 @@ static void update_dictionary_category_charts(struct dictionary_categories *c) {
1470
1471 rrdlabels_add(c->st_memory->rrdlabels, "category", stats.name, RRDLABEL_SRC_AUTO);
1472 }
1521 - else
1522 - rrdset_next(c->st_memory);
1473
1474 rrddim_set_by_pointer(c->st_memory, c->rd_memory_indexed, (collected_number)stats.memory.indexed);
1475 rrddim_set_by_pointer(c->st_memory, c->rd_memory_values, (collected_number)stats.memory.values);
@@ -1564,8 +1514,6 @@ static void update_dictionary_category_charts(struct dictionary_categories *c) {
1514
1515 rrdlabels_add(c->st_spins->rrdlabels, "category", stats.name, RRDLABEL_SRC_AUTO);
1516 }
1567 - else
1568 - rrdset_next(c->st_spins);
1517
1518 rrddim_set_by_pointer(c->st_spins, c->rd_spins_use, (collected_number)stats.spin_locks.use);
1519 rrddim_set_by_pointer(c->st_spins, c->rd_spins_search, (collected_number)stats.spin_locks.search);
@@ -1653,8 +1601,6 @@ static void malloc_trace_statistics(void) {
1601 , RRDSET_TYPE_STACKED
1602 );
1603 }
1656 - else
1657 - rrdset_next(tmp.st_memory);
1604
1605 if(!tmp.st_ops) {
1606 tmp.st_ops = rrdset_create_localhost(
@@ -1672,8 +1618,6 @@ static void malloc_trace_statistics(void) {
1618 , RRDSET_TYPE_LINE
1619 );
1620 }
1675 - else
1676 - rrdset_next(tmp.st_ops);
1621
1622 if(!tmp.st_allocations) {
1623 tmp.st_allocations = rrdset_create_localhost(
@@ -1691,8 +1635,6 @@ static void malloc_trace_statistics(void) {
1635 , RRDSET_TYPE_STACKED
1636 );
1637 }
1694 - else
1695 - rrdset_next(tmp.st_allocations);
1638
1639 if(!tmp.st_avg_alloc) {
1640 tmp.st_avg_alloc = rrdset_create_localhost(
@@ -1710,8 +1652,6 @@ static void malloc_trace_statistics(void) {
1652 , RRDSET_TYPE_LINE
1653 );
1654 }
1713 - else
1714 - rrdset_next(tmp.st_avg_alloc);
1655
1656 malloc_trace_walkthrough(do_memory_trace_item, &tmp);
1657
@@ -1880,8 +1820,6 @@ static void workers_total_cpu_utilization_chart(void) {
1820 RRDSET_TYPE_STACKED);
1821 }
1822
1883 - rrdset_next(st);
1884 -
1823 for(i = 0; all_workers_utilization[i].name ;i++) {
1824 struct worker_utilization *wu = &all_workers_utilization[i];
1825 if(!wu->workers_cpu_registered) continue;
@@ -1942,8 +1880,6 @@ static void workers_utilization_update_chart(struct worker_utilization *wu) {
1880 if(unlikely(!wu->rd_workers_time_avg))
1881 wu->rd_workers_time_avg = rrddim_add(wu->st_workers_time, "average", NULL, 1, WORKER_CHART_DECIMAL_PRECISION, RRD_ALGORITHM_ABSOLUTE);
1882
1945 - rrdset_next(wu->st_workers_time);
1946 -
1883 if(unlikely(wu->workers_min_busy_time == WORKERS_MIN_PERCENT_DEFAULT)) wu->workers_min_busy_time = 0.0;
1884
1885 if(wu->rd_workers_time_min)
@@ -1995,8 +1931,6 @@ static void workers_utilization_update_chart(struct worker_utilization *wu) {
1931 if(unlikely(!wu->rd_workers_cpu_avg))
1932 wu->rd_workers_cpu_avg = rrddim_add(wu->st_workers_cpu, "average", NULL, 1, WORKER_CHART_DECIMAL_PRECISION, RRD_ALGORITHM_ABSOLUTE);
1933
1998 - rrdset_next(wu->st_workers_cpu);
1999 -
1934 if(unlikely(wu->workers_cpu_min == WORKERS_MIN_PERCENT_DEFAULT)) wu->workers_cpu_min = 0.0;
1935
1936 if(wu->rd_workers_cpu_min)
@@ -2039,8 +1973,6 @@ static void workers_utilization_update_chart(struct worker_utilization *wu) {
1973 );
1974 }
1975
2042 - rrdset_next(wu->st_workers_jobs_per_job_type);
2043 -
1976 {
1977 size_t i;
1978 for(i = 0; i < WORKER_UTILIZATION_MAX_JOB_TYPES ;i++) {
@@ -2084,8 +2016,6 @@ static void workers_utilization_update_chart(struct worker_utilization *wu) {
2016 );
2017 }
2018
2087 - rrdset_next(wu->st_workers_busy_per_job_type);
2088 -
2019 {
2020 size_t i;
2021 for(i = 0; i < WORKER_UTILIZATION_MAX_JOB_TYPES ;i++) {
@@ -2132,8 +2062,6 @@ static void workers_utilization_update_chart(struct worker_utilization *wu) {
2062 wu->rd_workers_threads_free = rrddim_add(wu->st_workers_threads, "free", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
2063 wu->rd_workers_threads_busy = rrddim_add(wu->st_workers_threads, "busy", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
2064 }
2135 - else
2136 - rrdset_next(wu->st_workers_threads);
2065
2066 rrddim_set_by_pointer(wu->st_workers_threads, wu->rd_workers_threads_free, (collected_number)(wu->workers_registered - wu->workers_busy));
2067 rrddim_set_by_pointer(wu->st_workers_threads, wu->rd_workers_threads_busy, (collected_number)(wu->workers_busy));
@@ -2187,8 +2115,6 @@ static void workers_utilization_update_chart(struct worker_utilization *wu) {
2115 wu->per_job_type[i].rd_max = rrddim_add(wu->per_job_type[i].st, "max", NULL, 1, WORKER_CHART_DECIMAL_PRECISION, RRD_ALGORITHM_ABSOLUTE);
2116 wu->per_job_type[i].rd_avg = rrddim_add(wu->per_job_type[i].st, "average", NULL, 1, WORKER_CHART_DECIMAL_PRECISION, RRD_ALGORITHM_ABSOLUTE);
2117 }
2190 - else
2191 - rrdset_next(wu->per_job_type[i].st);
2118
2119 rrddim_set_by_pointer(wu->per_job_type[i].st, wu->per_job_type[i].rd_min, (collected_number)(wu->per_job_type[i].min_value * WORKER_CHART_DECIMAL_PRECISION));
2120 rrddim_set_by_pointer(wu->per_job_type[i].st, wu->per_job_type[i].rd_max, (collected_number)(wu->per_job_type[i].max_value * WORKER_CHART_DECIMAL_PRECISION));
@@ -2245,8 +2171,6 @@ static void workers_utilization_update_chart(struct worker_utilization *wu) {
2171 wu->per_job_type[i].rd_max = rrddim_add(wu->per_job_type[i].st, "max", NULL, 1, WORKER_CHART_DECIMAL_PRECISION, RRD_ALGORITHM_ABSOLUTE);
2172 wu->per_job_type[i].rd_avg = rrddim_add(wu->per_job_type[i].st, "average", NULL, 1, WORKER_CHART_DECIMAL_PRECISION, RRD_ALGORITHM_ABSOLUTE);
2173 }
2248 - else
2249 - rrdset_next(wu->per_job_type[i].st);
2174
2175 rrddim_set_by_pointer(wu->per_job_type[i].st, wu->per_job_type[i].rd_min, (collected_number)(wu->per_job_type[i].min_value * WORKER_CHART_DECIMAL_PRECISION));
2176 rrddim_set_by_pointer(wu->per_job_type[i].st, wu->per_job_type[i].rd_max, (collected_number)(wu->per_job_type[i].max_value * WORKER_CHART_DECIMAL_PRECISION));
daemon/static_threads.c
-10
@@ -4,7 +4,6 @@
4
5 void *aclk_main(void *ptr);
6 void *analytics_main(void *ptr);
7 -void *checks_main(void *ptr);
7 void *cpuidlejitter_main(void *ptr);
8 void *global_statistics_main(void *ptr);
9 void *health_main(void *ptr);
@@ -26,15 +25,6 @@ const struct netdata_static_thread static_threads_common[] = {
25 .init_routine = NULL,
26 .start_routine = timex_main
27 },
29 - {
30 - .name = "PLUGIN[check]",
31 - .config_section = CONFIG_SECTION_PLUGINS,
32 - .config_name = "checks",
33 - .enabled = 0,
34 - .thread = NULL,
35 - .init_routine = NULL,
36 - .start_routine = checks_main
37 - },
28 {
29 .name = "PLUGIN[idlejitter]",
30 .config_section = CONFIG_SECTION_PLUGINS,
daemon/unit_test.c
+15 -4
@@ -1206,7 +1206,9 @@ int run_test(struct test *test)
1206 rrddim_set(st, "dim2", test->feed2[c]);
1207 }
1208
1209 - rrdset_done(st);
1209 + struct timeval now;
1210 + now_realtime_timeval(&now);
1211 + rrdset_timed_done(st, now, false);
1212
1213 // align the first entry to second boundary
1214 if(!c) {
@@ -1797,7 +1799,10 @@ static void test_dbengine_create_charts(RRDHOST *host, RRDSET *st[CHARTS], RRDDI
1799 for (j = 0; j < DIMS; ++j) {
1800 rrddim_set_by_pointer_fake_time(rd[i][j], 69, 2 * API_RELATIVE_TIME_MAX); // set first value to 69
1801 }
1800 - rrdset_done(st[i]);
1802 +
1803 + struct timeval now;
1804 + now_realtime_timeval(&now);
1805 + rrdset_timed_done(st[i], now, false);
1806 }
1807 // Fluh pages for subsequent real values
1808 for (i = 0 ; i < CHARTS ; ++i) {
@@ -1831,7 +1836,8 @@ static time_t test_dbengine_create_metrics(RRDSET *st[CHARTS], RRDDIM *rd[CHARTS
1836 }
1837 for (c = 0; c < REGION_POINTS[current_region] ; ++c) {
1838 time_now += update_every; // time_now = start + (c + 1) * update_every
1834 - for (i = 0 ; i < CHARTS ; ++i) {
1839 +
1840 + for (i = 0 ; i < CHARTS ; ++i) {
1841 st[i]->usec_since_last_update = USEC_PER_SEC * update_every;
1842
1843 for (j = 0; j < DIMS; ++j) {
@@ -1839,7 +1845,12 @@ static time_t test_dbengine_create_metrics(RRDSET *st[CHARTS], RRDDIM *rd[CHARTS
1845 j * REGION_POINTS[current_region] + c;
1846 rrddim_set_by_pointer_fake_time(rd[i][j], next, time_now);
1847 }
1842 - rrdset_done(st[i]);
1848 +
1849 + struct timeval now;
1850 + now.tv_sec = time_now;
1851 + now.tv_usec = 0;
1852 +
1853 + rrdset_timed_done(st[i], now, false);
1854 }
1855 }
1856 return time_now; //time_end
database/rrd.h
+1 -1
@@ -1253,7 +1253,7 @@ void rrdset_next_usec(RRDSET *st, usec_t microseconds);
1253 void rrdset_timed_next(RRDSET *st, struct timeval now, usec_t microseconds);
1254 #define rrdset_next(st) rrdset_next_usec(st, 0ULL)
1255
1256 -void rrdset_timed_done(RRDSET *st, struct timeval now);
1256 +void rrdset_timed_done(RRDSET *st, struct timeval now, bool pending_rrdset_next);
1257 void rrdset_done(RRDSET *st);
1258
1259 void rrdset_is_obsolete(RRDSET *st);
database/rrdset.c
+5 -2
@@ -1386,12 +1386,15 @@ void rrdset_done(RRDSET *st) {
1386 struct timeval now;
1387
1388 now_realtime_timeval(&now);
1389 - rrdset_timed_done(st, now);
1389 + rrdset_timed_done(st, now, /* pending_rrdset_next = */ st->counter_done != 0);
1390 }
1391
1392 -void rrdset_timed_done(RRDSET *st, struct timeval now) {
1392 +void rrdset_timed_done(RRDSET *st, struct timeval now, bool pending_rrdset_next) {
1393 if(unlikely(netdata_exit)) return;
1394
1395 + if (pending_rrdset_next)
1396 + rrdset_next(st);
1397 +
1398 debug(D_RRD_CALLS, "rrdset_done() for chart '%s'", rrdset_name(st));
1399
1400 RRDDIM *rd;
exporting/send_internal_metrics.c
-25
@@ -40,9 +40,6 @@ void send_main_rusage(RRDSET *st_rusage, RRDDIM *rd_user, RRDDIM *rd_system)
40 struct rusage thread;
41 getrusage(RUSAGE_THREAD, &thread);
42
43 - if (likely(st_rusage->counter_done))
44 - rrdset_next(st_rusage);
45 -
43 rrddim_set_by_pointer(st_rusage, rd_user, thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec);
44 rrddim_set_by_pointer(st_rusage, rd_system, thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec);
45
@@ -132,50 +129,28 @@ void send_internal_metrics(struct instance *instance)
129 // ------------------------------------------------------------------------
130 // update the monitoring charts
131
135 - if (likely(stats->st_metrics->counter_done))
136 - rrdset_next(stats->st_metrics);
137 -
132 rrddim_set_by_pointer(stats->st_metrics, stats->rd_buffered_metrics, stats->buffered_metrics);
133 rrddim_set_by_pointer(stats->st_metrics, stats->rd_lost_metrics, stats->lost_metrics);
134 rrddim_set_by_pointer(stats->st_metrics, stats->rd_sent_metrics, stats->sent_metrics);
141 -
135 rrdset_done(stats->st_metrics);
136
144 - // ------------------------------------------------------------------------
145 -
146 - if (likely(stats->st_bytes->counter_done))
147 - rrdset_next(stats->st_bytes);
148 -
137 rrddim_set_by_pointer(stats->st_bytes, stats->rd_buffered_bytes, stats->buffered_bytes);
138 rrddim_set_by_pointer(stats->st_bytes, stats->rd_lost_bytes, stats->lost_bytes);
139 rrddim_set_by_pointer(stats->st_bytes, stats->rd_sent_bytes, stats->sent_bytes);
140 rrddim_set_by_pointer(stats->st_bytes, stats->rd_received_bytes, stats->received_bytes);
153 -
141 rrdset_done(stats->st_bytes);
142
156 - // ------------------------------------------------------------------------
157 -
158 - if (likely(stats->st_ops->counter_done))
159 - rrdset_next(stats->st_ops);
160 -
143 rrddim_set_by_pointer(stats->st_ops, stats->rd_transmission_successes, stats->transmission_successes);
144 rrddim_set_by_pointer(stats->st_ops, stats->rd_data_lost_events, stats->data_lost_events);
145 rrddim_set_by_pointer(stats->st_ops, stats->rd_reconnects, stats->reconnects);
146 rrddim_set_by_pointer(stats->st_ops, stats->rd_transmission_failures, stats->transmission_failures);
147 rrddim_set_by_pointer(stats->st_ops, stats->rd_receptions, stats->receptions);
166 -
148 rrdset_done(stats->st_ops);
149
169 - // ------------------------------------------------------------------------
170 -
150 struct rusage thread;
151 getrusage(RUSAGE_THREAD, &thread);
152
174 - if (likely(stats->st_rusage->counter_done))
175 - rrdset_next(stats->st_rusage);
176 -
153 rrddim_set_by_pointer(stats->st_rusage, stats->rd_user, thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec);
154 rrddim_set_by_pointer(stats->st_rusage, stats->rd_system, thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec);
179 -
155 rrdset_done(stats->st_rusage);
156 }
ml/ADCharts.cc
+5 -10
@@ -44,8 +44,7 @@ void ml::updateDimensionsChart(RRDHOST *RH,
44 1, 1, RRD_ALGORITHM_ABSOLUTE);
45 NumAnomalousDimensionsRD = rrddim_add(RS, "anomalous", NULL,
46 1, 1, RRD_ALGORITHM_ABSOLUTE);
47 - } else
48 - rrdset_next(RS);
47 + }
48
49 rrddim_set_by_pointer(RS, NumTotalDimensionsRD, NumNormalDimensions + NumAnomalousDimensions);
50 rrddim_set_by_pointer(RS, NumTrainedDimensionsRD, NumTrainedDimensions);
@@ -84,8 +83,7 @@ void ml::updateHostAndDetectionRateCharts(RRDHOST *RH, collected_number AnomalyR
83
84 AnomalyRateRD = rrddim_add(HostRateRS, "anomaly_rate", NULL,
85 1, 100, RRD_ALGORITHM_ABSOLUTE);
87 - } else
88 - rrdset_next(HostRateRS);
86 + }
87
88 rrddim_set_by_pointer(HostRateRS, AnomalyRateRD, AnomalyRate);
89 rrdset_done(HostRateRS);
@@ -121,8 +119,7 @@ void ml::updateHostAndDetectionRateCharts(RRDHOST *RH, collected_number AnomalyR
119 1, 1, RRD_ALGORITHM_ABSOLUTE);
120 NewAnomalyEventRD = rrddim_add(AnomalyDetectionRS, "new_anomaly_event", NULL,
121 1, 1, RRD_ALGORITHM_ABSOLUTE);
124 - } else
125 - rrdset_next(AnomalyDetectionRS);
122 + }
123
124 /*
125 * Compute the values of the dimensions based on the host rate chart
@@ -189,8 +186,7 @@ void ml::updateDetectionChart(RRDHOST *RH) {
186
187 UserRD = rrddim_add(RS, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
188 SystemRD = rrddim_add(RS, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
192 - } else
193 - rrdset_next(RS);
189 + }
190
191 struct rusage TRU;
192 getrusage(RUSAGE_THREAD, &TRU);
@@ -228,8 +224,7 @@ void ml::updateTrainingChart(RRDHOST *RH, struct rusage *TRU) {
224
225 UserRD = rrddim_add(RS, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
226 SystemRD = rrddim_add(RS, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
231 - } else
232 - rrdset_next(RS);
227 + }
228
229 rrddim_set_by_pointer(RS, UserRD, TRU->ru_utime.tv_sec * 1000000ULL + TRU->ru_utime.tv_usec);
230 rrddim_set_by_pointer(RS, SystemRD, TRU->ru_stime.tv_sec * 1000000ULL + TRU->ru_stime.tv_usec);
registry/registry.c
-3
@@ -379,7 +379,6 @@ void registry_statistics(void) {
379
380 rrddim_add(sts, "sessions", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
381 }
382 - else rrdset_next(sts);
382
383 rrddim_set(sts, "sessions", registry.usages_count);
384 rrdset_done(sts);
@@ -408,7 +407,6 @@ void registry_statistics(void) {
407 rrddim_add(stc, "persons_urls", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
408 rrddim_add(stc, "machines_urls", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
409 }
411 - else rrdset_next(stc);
410
411 rrddim_set(stc, "persons", registry.persons_count);
412 rrddim_set(stc, "machines", registry.machines_count);
@@ -441,7 +439,6 @@ void registry_statistics(void) {
439 rrddim_add(stm, "persons_urls", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
440 rrddim_add(stm, "machines_urls", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
441 }
444 - else rrdset_next(stm);
442
443 rrddim_set(stm, "persons", registry.persons_memory + dictionary_stats_for_registry(registry.persons));
444 rrddim_set(stm, "machines", registry.machines_memory + dictionary_stats_for_registry(registry.machines));