fixed rpm build; (#4503)
Costa Tsaousis committed
Oct 26, 2018 at 20:34 UTC
bcdfedbe8215fdf461b61900eba2a9de4be6c0b8
13 files changed
+44
-2
backends/backends.c
+2
@@ -59,6 +59,7 @@ calculated_number backend_calculate_value_from_stored_data(
59
, time_t *last_timestamp // the timestamp that should be reported to backend
60
) {
61
RRDHOST *host = st->rrdhost;
62
+ (void)host;
63
64
// find the edges of the rrd database for this chart
65
time_t first_t = rrdset_first_entry_t(st);
@@ -170,6 +171,7 @@ static SIMPLE_PATTERN *hosts_pattern = NULL;
171
172
inline int backends_can_send_rrdset(BACKEND_OPTIONS backend_options, RRDSET *st) {
173
RRDHOST *host = st->rrdhost;
174
+ (void)host;
175
176
if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_BACKEND_IGNORE)))
177
return 0;
database/rrddimvar.c
+3
@@ -153,6 +153,7 @@ static inline void rrddimvar_create_variables(RRDDIMVAR *rs) {
153
154
RRDDIMVAR *rrddimvar_create(RRDDIM *rd, RRDVAR_TYPE type, const char *prefix, const char *suffix, void *value, RRDVAR_OPTIONS options) {
155
RRDSET *st = rd->rrdset;
156
+ (void)st;
157
158
debug(D_VARIABLES, "RRDDIMSET create for chart id '%s' name '%s', dimension id '%s', name '%s%s%s'", st->id, st->name, rd->id, (prefix)?prefix:"", rd->name, (suffix)?suffix:"");
159
@@ -179,6 +180,8 @@ RRDDIMVAR *rrddimvar_create(RRDDIM *rd, RRDVAR_TYPE type, const char *prefix, co
180
181
void rrddimvar_rename_all(RRDDIM *rd) {
182
RRDSET *st = rd->rrdset;
183
+ (void)st;
184
+
185
debug(D_VARIABLES, "RRDDIMSET rename for chart id '%s' name '%s', dimension id '%s', name '%s'", st->id, st->name, rd->id, rd->name);
186
187
RRDDIMVAR *rs, *next = rd->variables;
database/rrdset.c
+4
@@ -206,6 +206,8 @@ inline void rrdset_isnot_obsolete(RRDSET *st) {
206
207
inline void rrdset_update_heterogeneous_flag(RRDSET *st) {
208
RRDHOST *host = st->rrdhost;
209
+ (void)host;
210
+
211
RRDDIM *rd;
212
213
rrdset_flag_clear(st, RRDSET_FLAG_HOMEGENEOUS_CHECK);
@@ -930,6 +932,8 @@ static inline size_t rrdset_done_interpolate(
932
size_t stored_entries = 0; // the number of entries we have stored in the db, during this call to rrdset_done()
933
934
usec_t first_ut = last_stored_ut, last_ut = 0;
935
+ (void)first_ut;
936
+
937
ssize_t iterations = (ssize_t)((now_collect_ut - last_stored_ut) / (update_every_ut));
938
if((now_collect_ut % (update_every_ut)) == 0) iterations++;
939
libnetdata/locks/locks.c
+11
@@ -84,6 +84,7 @@ int __netdata_mutex_unlock(netdata_mutex_t *mutex) {
84
85
int netdata_mutex_init_debug( const char *file, const char *function, const unsigned long line, netdata_mutex_t *mutex) {
86
usec_t start = 0;
87
+ (void)start;
88
89
if(unlikely(debug_flags & D_LOCKS)) {
90
start = now_boottime_usec();
@@ -99,6 +100,7 @@ int netdata_mutex_init_debug( const char *file, const char *function, const unsi
100
101
int netdata_mutex_lock_debug( const char *file, const char *function, const unsigned long line, netdata_mutex_t *mutex) {
102
usec_t start = 0;
103
+ (void)start;
104
105
if(unlikely(debug_flags & D_LOCKS)) {
106
start = now_boottime_usec();
@@ -114,6 +116,7 @@ int netdata_mutex_lock_debug( const char *file, const char *function, const unsi
116
117
int netdata_mutex_trylock_debug( const char *file, const char *function, const unsigned long line, netdata_mutex_t *mutex) {
118
usec_t start = 0;
119
+ (void)start;
120
121
if(unlikely(debug_flags & D_LOCKS)) {
122
start = now_boottime_usec();
@@ -129,6 +132,7 @@ int netdata_mutex_trylock_debug( const char *file, const char *function, const u
132
133
int netdata_mutex_unlock_debug( const char *file, const char *function, const unsigned long line, netdata_mutex_t *mutex) {
134
usec_t start = 0;
135
+ (void)start;
136
137
if(unlikely(debug_flags & D_LOCKS)) {
138
start = now_boottime_usec();
@@ -217,6 +221,7 @@ int __netdata_rwlock_trywrlock(netdata_rwlock_t *rwlock) {
221
222
int netdata_rwlock_destroy_debug( const char *file, const char *function, const unsigned long line, netdata_rwlock_t *rwlock) {
223
usec_t start = 0;
224
+ (void)start;
225
226
if(unlikely(debug_flags & D_LOCKS)) {
227
start = now_boottime_usec();
@@ -232,6 +237,7 @@ int netdata_rwlock_destroy_debug( const char *file, const char *function, const
237
238
int netdata_rwlock_init_debug( const char *file, const char *function, const unsigned long line, netdata_rwlock_t *rwlock) {
239
usec_t start = 0;
240
+ (void)start;
241
242
if(unlikely(debug_flags & D_LOCKS)) {
243
start = now_boottime_usec();
@@ -247,6 +253,7 @@ int netdata_rwlock_init_debug( const char *file, const char *function, const uns
253
254
int netdata_rwlock_rdlock_debug( const char *file, const char *function, const unsigned long line, netdata_rwlock_t *rwlock) {
255
usec_t start = 0;
256
+ (void)start;
257
258
if(unlikely(debug_flags & D_LOCKS)) {
259
start = now_boottime_usec();
@@ -262,6 +269,7 @@ int netdata_rwlock_rdlock_debug( const char *file, const char *function, const u
269
270
int netdata_rwlock_wrlock_debug( const char *file, const char *function, const unsigned long line, netdata_rwlock_t *rwlock) {
271
usec_t start = 0;
272
+ (void)start;
273
274
if(unlikely(debug_flags & D_LOCKS)) {
275
start = now_boottime_usec();
@@ -277,6 +285,7 @@ int netdata_rwlock_wrlock_debug( const char *file, const char *function, const u
285
286
int netdata_rwlock_unlock_debug( const char *file, const char *function, const unsigned long line, netdata_rwlock_t *rwlock) {
287
usec_t start = 0;
288
+ (void)start;
289
290
if(unlikely(debug_flags & D_LOCKS)) {
291
start = now_boottime_usec();
@@ -292,6 +301,7 @@ int netdata_rwlock_unlock_debug( const char *file, const char *function, const u
301
302
int netdata_rwlock_tryrdlock_debug( const char *file, const char *function, const unsigned long line, netdata_rwlock_t *rwlock) {
303
usec_t start = 0;
304
+ (void)start;
305
306
if(unlikely(debug_flags & D_LOCKS)) {
307
start = now_boottime_usec();
@@ -307,6 +317,7 @@ int netdata_rwlock_tryrdlock_debug( const char *file, const char *function, cons
317
318
int netdata_rwlock_trywrlock_debug( const char *file, const char *function, const unsigned long line, netdata_rwlock_t *rwlock) {
319
usec_t start = 0;
320
+ (void)start;
321
322
if(unlikely(debug_flags & D_LOCKS)) {
323
start = now_boottime_usec();
libnetdata/procfile/procfile.c
+1
@@ -454,6 +454,7 @@ procfile *procfile_reopen(procfile *ff, const char *filename, const char *separa
454
void procfile_print(procfile *ff) {
455
size_t lines = procfile_lines(ff), l;
456
char *s;
457
+ (void)s;
458
459
debug(D_PROCFILE, "File '%s' with %zu lines and %zu words", procfile_filename(ff), ff->lines->len, ff->words->len);
460
libnetdata/socket/socket.c
+4
@@ -602,6 +602,8 @@ static inline int connect_to_this_ip46(int protocol, int socktype, const char *h
602
603
case PF_INET6: {
604
struct sockaddr_in6 *pSadrIn6 = (struct sockaddr_in6 *) ai->ai_addr;
605
+ (void)pSadrIn6;
606
+
607
debug(D_CONNECT_TO,"ai_addr = sin6_family: %d (AF_INET = %d, AF_INET6 = %d), sin6_addr: '%s', sin6_port: '%s', sin6_flowinfo: %u, sin6_scope_id: %u",
608
pSadrIn6->sin6_family,
609
AF_INET,
@@ -1431,6 +1433,8 @@ void poll_events(LISTEN_SOCKETS *sockets
1433
1434
usec_t timer_usec = timer_milliseconds * USEC_PER_MS;
1435
usec_t now_usec = 0, next_timer_usec = 0, last_timer_usec = 0;
1436
+ (void)last_timer_usec;
1437
+
1438
if(unlikely(timer_usec)) {
1439
now_usec = now_boottime_usec();
1440
next_timer_usec = now_usec - (now_usec % timer_usec) + timer_usec;
streaming/rrdpush.c
+2
@@ -316,6 +316,8 @@ static int rrdpush_sender_thread_custom_host_variables_callback(void *rrdvar_ptr
316
317
static void rrdpush_sender_thread_send_custom_host_variables(RRDHOST *host) {
318
int ret = rrdvar_callback_for_all_host_variables(host, rrdpush_sender_thread_custom_host_variables_callback, host);
319
+ (void)ret;
320
+
321
debug(D_STREAM, "RRDVAR sent %d VARIABLES", ret);
322
}
323
web/api/Makefile.am
+2
-1
@@ -3,9 +3,10 @@
3
AUTOMAKE_OPTIONS = subdir-objects
4
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
5
6
-SUBDIR = \
6
+SUBDIRS = \
7
badges \
8
queries \
9
+ exporters \
10
$(NULL)
11
12
dist_noinst_DATA = \
web/api/exporters/Makefile.am
+5
@@ -3,6 +3,11 @@
3
AUTOMAKE_OPTIONS = subdir-objects
4
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
5
6
+SUBDIRS = \
7
+ shell \
8
+ prometheus \
9
+ $(NULL)
10
+
11
dist_noinst_DATA = \
12
README.md \
13
$(NULL)
web/api/queries/Makefile.am
+2
@@ -5,11 +5,13 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
5
6
SUBDIRS = \
7
average \
8
+ des \
9
incremental_sum \
10
max \
11
min \
12
sum \
13
median \
14
+ ses \
15
stddev \
16
$(NULL)
17
web/api/queries/query.c
+2
-1
@@ -504,7 +504,7 @@ static inline void do_dimension(
504
// ----------------------------------------------------------------------------
505
// fill RRDR for the whole chart
506
507
-
507
+#ifdef NETDATA_INTERNAL_CHECKS
508
static void rrd2rrdr_log_request_response_metdata(RRDR *r
509
, RRDR_GROUPING group_method
510
, int aligned
@@ -571,6 +571,7 @@ static void rrd2rrdr_log_request_response_metdata(RRDR *r
571
, msg
572
);
573
}
574
+#endif // NETDATA_INTERNAL_CHECKS
575
576
RRDR *rrd2rrdr(
577
RRDSET *st
web/server/static/static-threaded.c
+2
@@ -164,6 +164,8 @@ static void web_server_del_callback(POLLINFO *pi) {
164
w->pollinfo_slot = 0;
165
if(unlikely(w->pollinfo_filecopy_slot)) {
166
POLLINFO *fpi = pollinfo_from_slot(pi->p, w->pollinfo_filecopy_slot); // POLLINFO of the client socket
167
+ (void)fpi;
168
+
169
debug(D_WEB_CLIENT, "%llu: THE CLIENT WILL BE FRED BY READING FILE JOB ON FD %d", w->id, fpi->fd);
170
}
171
else {
web/server/web_client.c
+4
@@ -1593,6 +1593,8 @@ ssize_t web_client_read_file(struct web_client *w)
1593
ssize_t bytes = read(w->ifd, &w->response.data->buffer[w->response.data->len], (size_t)left);
1594
if(likely(bytes > 0)) {
1595
size_t old = w->response.data->len;
1596
+ (void)old;
1597
+
1598
w->response.data->len += bytes;
1599
w->response.data->buffer[w->response.data->len] = '\0';
1600
@@ -1646,6 +1648,8 @@ ssize_t web_client_receive(struct web_client *w)
1648
w->stats_received_bytes += bytes;
1649
1650
size_t old = w->response.data->len;
1651
+ (void)old;
1652
+
1653
w->response.data->len += bytes;
1654
w->response.data->buffer[w->response.data->len] = '\0';
1655