configure: add '-Wredundant-decls' to warning flags

Change-Id: I5329ebe83aab40e6796b506c28e853b4af3c5e99
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index 65f9b0f75e57ad85d1161944a826d834b7962d10..f75991a90148425ce99f8f990da8027b12f89000 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,7 @@ m4_define([WARN_FLAGS_COMMON_LIST], [ dnl
   -Wall dnl
   -Wnull-dereference dnl
   -Wundef dnl
+  -Wredundant-decls dnl
   -Wmissing-noreturn dnl
   -Wlogical-op dnl
   dnl We currently get this warning when building with Clang:

diff --git a/doc/examples/trigger-condition-event-matches/Makefile.am b/doc/examples/trigger-condition-event-matches/Makefile.am
index cb5512ed0e6e7737cdef4465e606e9671cb5442c..f42b6fe840c47044385f7154785dfa7dcd817155 100644 (file)
--- a/doc/examples/trigger-condition-event-matches/Makefile.am
+++ b/doc/examples/trigger-condition-event-matches/Makefile.am
@@ -2,6 +2,8 @@
 
 AM_CPPFLAGS += -I$(srcdir)
 
+AM_CFLAGS += -Wno-redundant-decls
+
 LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
 dist_noinst_SCRIPTS = demo.sh
 EXTRA_DIST = README.md

diff --git a/src/bin/lttng-consumerd/health-consumerd.cpp b/src/bin/lttng-consumerd/health-consumerd.cpp
index ec30af5ddc1f1fd5517365bd94622da89278c17c..fe2f6d22c5d43192440120f04368bac06ef079bb 100644 (file)
--- a/src/bin/lttng-consumerd/health-consumerd.cpp
+++ b/src/bin/lttng-consumerd/health-consumerd.cpp
@@ -144,7 +144,7 @@ end:
 /*
  * Thread managing health check socket.
  */
-void *thread_manage_health(void *data)
+void *thread_manage_health_consumerd(void *data)
 {
        int sock = -1, new_sock = -1, ret, i, pollfd, err = -1;
        uint32_t revents, nb_fd;

diff --git a/src/bin/lttng-consumerd/health-consumerd.h b/src/bin/lttng-consumerd/health-consumerd.h
index 42ec9ea94e87eedfe9c5c3c00cc8fcc6561f6ade..9faa081d4ed1625697010cf2f177b462f1b9018c 100644 (file)
--- a/src/bin/lttng-consumerd/health-consumerd.h
+++ b/src/bin/lttng-consumerd/health-consumerd.h
@@ -23,7 +23,7 @@ enum health_type_consumerd {
 /* Consumerd health monitoring */
 extern struct health_app *health_consumerd;
 
-void *thread_manage_health(void *data);
+void *thread_manage_health_consumerd(void *data);
 
 extern int health_quit_pipe[2];
 

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.cpp b/src/bin/lttng-consumerd/lttng-consumerd.cpp
index 91617a11a061813b3ded9e40b3767f89dfa8a561..73238b4fb7171e36303a56cb36628a471c545a67 100644 (file)
--- a/src/bin/lttng-consumerd/lttng-consumerd.cpp
+++ b/src/bin/lttng-consumerd/lttng-consumerd.cpp
@@ -502,7 +502,7 @@ int main(int argc, char **argv)
 
        /* Create thread to manage the client socket */
        ret = pthread_create(&health_thread, default_pthread_attr(),
-                       thread_manage_health, (void *) NULL);
+                       thread_manage_health_consumerd, (void *) NULL);
        if (ret) {
                errno = ret;
                PERROR("pthread_create health");

diff --git a/src/bin/lttng-relayd/health-relayd.cpp b/src/bin/lttng-relayd/health-relayd.cpp
index 265c70d2e5ff0008aeb07073dbc71949d6185a03..b832ffe0e5e81c8c09e794f53f015dd8342228b3 100644 (file)
--- a/src/bin/lttng-relayd/health-relayd.cpp
+++ b/src/bin/lttng-relayd/health-relayd.cpp
@@ -259,7 +259,7 @@ end:
 /*
  * Thread managing health check socket.
  */
-void *thread_manage_health(void *data)
+void *thread_manage_health_relayd(void *data)
 {
        int sock = -1, new_sock = -1, ret, i, pollfd, err = -1;
        uint32_t revents, nb_fd;

diff --git a/src/bin/lttng-relayd/health-relayd.h b/src/bin/lttng-relayd/health-relayd.h
index 3384f49aeaab6d517fb106277bc36d49c5aa7fcc..4cd3ec1e7f4d25d9566f13c9f50c4a910d9f0ce7 100644 (file)
--- a/src/bin/lttng-relayd/health-relayd.h
+++ b/src/bin/lttng-relayd/health-relayd.h
@@ -29,6 +29,6 @@ extern struct health_app *health_relayd;
 
 extern int health_quit_pipe[2];
 
-void *thread_manage_health(void *data);
+void *thread_manage_health_relayd(void *data);
 
 #endif /* HEALTH_RELAYD_H */

diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp
index 72bf30b7ec10589ce797b83af494bc6f7e782e78..2b10618767926f745edfba8593c7496265593ba3 100644 (file)
--- a/src/bin/lttng-relayd/main.cpp
+++ b/src/bin/lttng-relayd/main.cpp
@@ -4424,7 +4424,7 @@ int main(int argc, char **argv)
 
        /* Create thread to manage the client socket */
        ret = pthread_create(&health_thread, default_pthread_attr(),
-                       thread_manage_health, (void *) NULL);
+                       thread_manage_health_relayd, (void *) NULL);
        if (ret) {
                errno = ret;
                PERROR("pthread_create health");

diff --git a/src/bin/lttng-sessiond/cmd.h b/src/bin/lttng-sessiond/cmd.h
index bd2d939741d2a40adf080c528b9d267ec57d78a5..13d540e25f929ef7d85d2d678c9df8fc39499049 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.h
+++ b/src/bin/lttng-sessiond/cmd.h
@@ -117,8 +117,6 @@ enum lttng_error_code cmd_list_events(enum lttng_domain_type domain,
 enum lttng_error_code cmd_list_channels(enum lttng_domain_type domain,
                struct ltt_session *session,
                struct lttng_payload *payload);
-ssize_t cmd_list_domains(struct ltt_session *session,
-               struct lttng_domain **domains);
 void cmd_list_lttng_sessions(struct lttng_session *sessions,
                size_t session_count, uid_t uid, gid_t gid);
 enum lttng_error_code cmd_list_tracepoint_fields(enum lttng_domain_type domain,

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 2ba44fa526291fbf0f229fc0d7f1c067eff98633..4b9e313dc4a96659634fb35eebe88bdb1c22d75b 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -251,7 +251,8 @@ BUILT_SOURCES += filter/filter-parser.hpp
 
 # Disable some warning flags for generated sources.
 FILTER_WARN_FLAGS = \
-       -Wno-null-dereference
+       -Wno-null-dereference \
+       -Wno-redundant-decls
 
 libfilter_la_CFLAGS = $(AM_CFLAGS) $(FILTER_WARN_FLAGS)
 libfilter_la_CXXFLAGS = -include filter-symbols.h $(AM_CXXFLAGS) $(FILTER_WARN_FLAGS)

diff --git a/src/common/consumer/consumer-stream.h b/src/common/consumer/consumer-stream.h
index c9af63cd83841c10a542e015aba3d6c3eb5fd69d..021742e431f62f469162779168002d7024408f7c 100644 (file)
--- a/src/common/consumer/consumer-stream.h
+++ b/src/common/consumer/consumer-stream.h
@@ -136,16 +136,6 @@ int consumer_stream_enable_metadata_bucketization(
 void consumer_stream_metadata_set_version(
                struct lttng_consumer_stream *stream, uint64_t new_version);
 
-/*
- * Set the version of a metadata stream (i.e. following a metadata
- * regeneration).
- *
- * Changing the version of a metadata stream will cause any bucketized metadata
- * to be discarded and will mark the metadata stream for future `reset`.
- */
-void consumer_stream_metadata_set_version(
-               struct lttng_consumer_stream *stream, uint64_t new_version);
-
 /*
  * Attempt to open a packet in a stream.
  *

diff --git a/tests/regression/tools/filtering/Makefile.am b/tests/regression/tools/filtering/Makefile.am
index 919307e175b79a8c000bf4e9fc10cb01f6483167..4a851c32ff17ef8c61316619ca62979c37000f5e 100644 (file)
--- a/tests/regression/tools/filtering/Makefile.am
+++ b/tests/regression/tools/filtering/Makefile.am
@@ -3,6 +3,13 @@
 AM_CPPFLAGS += -I$(top_srcdir)/tests -I$(srcdir)
 
 if HAVE_LIBLTTNG_UST_CTL
+# Disable some warnings flags to accomodate the tracepoint headers
+WARN_FLAGS = \
+       -Wno-redundant-decls
+
+AM_CFLAGS += $(WARN_FLAGS)
+AM_CXXFLAGS += $(WARN_FLAGS)
+
 noinst_PROGRAMS = gen-ust-events
 gen_ust_events_SOURCES = gen-ust-events.c tp.c tp.h
 gen_ust_events_LDADD = $(UST_LIBS) $(DL_LIBS)

diff --git a/tests/regression/ust/baddr-statedump/Makefile.am b/tests/regression/ust/baddr-statedump/Makefile.am
index 35de5f9416a3b2eceb9c42251f1a9c5088fd9e74..f8fe263955ee18b51b906c1fb93545b403933a5e 100644 (file)
--- a/tests/regression/ust/baddr-statedump/Makefile.am
+++ b/tests/regression/ust/baddr-statedump/Makefile.am
@@ -6,6 +6,10 @@ objcopy_verbose_0 = @echo OBJCOPY $@;
 
 AM_CPPFLAGS += -I$(srcdir) -g
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 noinst_PROGRAMS = prog
 prog_SOURCES = prog.c tp.c tp.h
 prog_LDADD = $(UST_LIBS) $(DL_LIBS)

diff --git a/tests/regression/ust/daemon/Makefile.am b/tests/regression/ust/daemon/Makefile.am
index c2a836ed4714f30d8442a26d374945923fa04014..48806e1b6c999ab360d0593695caa17bf987786d 100644 (file)
--- a/tests/regression/ust/daemon/Makefile.am
+++ b/tests/regression/ust/daemon/Makefile.am
@@ -2,6 +2,10 @@
 
 AM_CPPFLAGS += -I$(srcdir)
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 noinst_PROGRAMS = daemon
 daemon_SOURCES = daemon.c ust_tests_daemon.h
 daemon_LDADD = $(UST_LIBS) -llttng-ust-fork $(DL_LIBS)

diff --git a/tests/regression/ust/exit-fast/Makefile.am b/tests/regression/ust/exit-fast/Makefile.am
index 7ae169706c4a1d2433178baacd107e7de60b7528..30f05966be72102c915f3276fc3111006f70b269 100644 (file)
--- a/tests/regression/ust/exit-fast/Makefile.am
+++ b/tests/regression/ust/exit-fast/Makefile.am
@@ -2,6 +2,10 @@
 
 AM_CPPFLAGS += -I$(srcdir)
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 noinst_PROGRAMS = exit-fast
 exit_fast_SOURCES = exit-fast.c ust_tests_exitfast.h
 exit_fast_LDADD = $(UST_LIBS) $(DL_LIBS)

diff --git a/tests/regression/ust/fork/Makefile.am b/tests/regression/ust/fork/Makefile.am
index 4a0016f5bc7f6a336b31f315cb3ced21ccc24ac0..e01bd5d8edd99c940e065f558648fd5e552dca06 100644 (file)
--- a/tests/regression/ust/fork/Makefile.am
+++ b/tests/regression/ust/fork/Makefile.am
@@ -2,6 +2,10 @@
 
 AM_CPPFLAGS += -I$(srcdir)
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 noinst_PROGRAMS = fork fork2
 fork_SOURCES = fork.c ust_tests_fork.h
 fork_LDADD = $(UST_LIBS) -llttng-ust-fork $(DL_LIBS)

diff --git a/tests/regression/ust/high-throughput/Makefile.am b/tests/regression/ust/high-throughput/Makefile.am
index 8b7e65cd8736178a1f1d5ce38468708835f33bce..10863365185909d445e725806b21db149f1a9408 100644 (file)
--- a/tests/regression/ust/high-throughput/Makefile.am
+++ b/tests/regression/ust/high-throughput/Makefile.am
@@ -2,6 +2,10 @@
 
 AM_CPPFLAGS += -I$(srcdir)
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 noinst_PROGRAMS = gen-events
 gen_events_SOURCES = main.c tp.c tp.h
 gen_events_LDADD = $(UST_LIBS) $(DL_LIBS)

diff --git a/tests/regression/ust/linking/Makefile.am b/tests/regression/ust/linking/Makefile.am
index 424afd1c5776a8cc89bec902d701f6ecf66c0a9e..5edcb9374b5283d8def88a8022b71318f4f1424a 100644 (file)
--- a/tests/regression/ust/linking/Makefile.am
+++ b/tests/regression/ust/linking/Makefile.am
@@ -7,6 +7,10 @@
 # so disable that.
 AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers -Wno-format-nonliteral
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 # Set LIBS to nothing so the application does not link on useless
 # libraries.
 LIBS =

diff --git a/tests/regression/ust/low-throughput/Makefile.am b/tests/regression/ust/low-throughput/Makefile.am
index 7d5b21371d766545e4a323aa1280318fe3d86a7d..5e688c56d04a3016077eacae1e008976a2b912b5 100644 (file)
--- a/tests/regression/ust/low-throughput/Makefile.am
+++ b/tests/regression/ust/low-throughput/Makefile.am
@@ -2,6 +2,10 @@
 
 AM_CPPFLAGS += -I$(srcdir)
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 noinst_PROGRAMS = gen-events
 gen_events_SOURCES = main.c tp.c tp.h
 gen_events_LDADD = $(UST_LIBS) $(DL_LIBS)

diff --git a/tests/regression/ust/multi-lib/Makefile.am b/tests/regression/ust/multi-lib/Makefile.am
index 7d869c628eb7adc470608b2c7ff18519882b065e..7fdcb8ac1acdfc03fb9ba87dd9e8ad00fc2951cb 100644 (file)
--- a/tests/regression/ust/multi-lib/Makefile.am
+++ b/tests/regression/ust/multi-lib/Makefile.am
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 noinst_SCRIPTS = test_multi_lib
 EXTRA_DIST = test_multi_lib
 noinst_PROGRAMS = exec-with-callsites exec-without-callsites

diff --git a/tests/regression/ust/multi-session/Makefile.am b/tests/regression/ust/multi-session/Makefile.am
index 5f83c5133a7eae869d6645b6def20a38c0c1cd97..aaaf2ff0413a86ff34283d34ac454944bf79a451 100644 (file)
--- a/tests/regression/ust/multi-session/Makefile.am
+++ b/tests/regression/ust/multi-session/Makefile.am
@@ -2,6 +2,10 @@
 
 AM_CFLAGS += -I$(srcdir)
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 noinst_PROGRAMS = gen-nevents
 gen_nevents_SOURCES = gen-nevents.c tp.c ust_gen_nevents.h
 gen_nevents_LDADD = $(UST_LIBS) $(DL_LIBS)

diff --git a/tests/regression/ust/overlap/demo/Makefile.am b/tests/regression/ust/overlap/demo/Makefile.am
index 302baa770472bd735d6b62c0518ca48ae631f939..dbdf266e04459d57ba68aec344044e47e98c04f9 100644 (file)
--- a/tests/regression/ust/overlap/demo/Makefile.am
+++ b/tests/regression/ust/overlap/demo/Makefile.am
@@ -14,6 +14,10 @@ else
 
 AM_CPPFLAGS += -I$(srcdir)
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 # Force the shared flag on the noinst libraries since they are
 # only built static by default
 FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \

diff --git a/tests/regression/ust/type-declarations/Makefile.am b/tests/regression/ust/type-declarations/Makefile.am
index f24a8fbd5cb92c77236c3a67147dc1c2bf96a4fb..64bb56ce1f77b322d664ac9bf9267bd0053b595c 100644 (file)
--- a/tests/regression/ust/type-declarations/Makefile.am
+++ b/tests/regression/ust/type-declarations/Makefile.am
@@ -2,6 +2,10 @@
 
 AM_CPPFLAGS += -I$(srcdir)
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 noinst_PROGRAMS = type-declarations
 type_declarations_SOURCES = type-declarations.c ust_tests_td.h
 type_declarations_LDADD = $(UST_LIBS) $(DL_LIBS)

diff --git a/tests/regression/ust/ust-dl/Makefile.am b/tests/regression/ust/ust-dl/Makefile.am
index 2176b23bce4855bf770253ffc1304e646dc0155f..366b02bb0eb9daf13e10847a77e00bd8cee653cc 100644 (file)
--- a/tests/regression/ust/ust-dl/Makefile.am
+++ b/tests/regression/ust/ust-dl/Makefile.am
@@ -19,6 +19,10 @@ objcopy_verbose_0 = @echo "  OBJCOPY " $@;
 
 AM_CPPFLAGS += -I$(srcdir) -g
 
+# Disable some warnings flags to accomodate the tracepoint headers
+AM_CFLAGS += \
+       -Wno-redundant-decls
+
 noinst_PROGRAMS = prog
 prog_SOURCES = prog.c
 prog_LDADD = $(DL_LIBS)

diff --git a/tests/utils/testapp/gen-ust-events-ns/Makefile.am b/tests/utils/testapp/gen-ust-events-ns/Makefile.am
index 2e3ad0747ff767f512df37fefc1515f1d177565b..37bdc94fe786f3c7bfb2e1420e40ea1377b563ca 100644 (file)
--- a/tests/utils/testapp/gen-ust-events-ns/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events-ns/Makefile.am
@@ -4,6 +4,13 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(srcdir) \
               -I$(top_srcdir)/tests/utils/testapp
 
 if HAVE_LIBLTTNG_UST_CTL
+# Disable some warnings flags to accomodate the tracepoint headers
+WARN_FLAGS = \
+       -Wno-redundant-decls
+
+AM_CFLAGS += $(WARN_FLAGS)
+AM_CXXFLAGS += $(WARN_FLAGS)
+
 noinst_PROGRAMS = gen-ust-events-ns
 gen_ust_events_ns_SOURCES = \
        gen-ust-events-ns.cpp \

diff --git a/tests/utils/testapp/gen-ust-events/Makefile.am b/tests/utils/testapp/gen-ust-events/Makefile.am
index c05c665a1e0127a3616057e649f73cebb0bd5f34..1e89ddd67b0d8d72e47917f68a34bb2bcbea1404 100644 (file)
--- a/tests/utils/testapp/gen-ust-events/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events/Makefile.am
@@ -4,6 +4,13 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(srcdir) \
        -I$(top_srcdir)/tests/utils/testapp
 
 if HAVE_LIBLTTNG_UST_CTL
+# Disable some warnings flags to accomodate the tracepoint headers
+WARN_FLAGS = \
+       -Wno-redundant-decls
+
+AM_CFLAGS += $(WARN_FLAGS)
+AM_CXXFLAGS += $(WARN_FLAGS)
+
 noinst_PROGRAMS = gen-ust-events
 gen_ust_events_SOURCES = \
        gen-ust-events.cpp \

diff --git a/tests/utils/testapp/gen-ust-nevents-str/Makefile.am b/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
index 955200c2b9c248c47ec9e18ec7f22d8f114418b0..75c50bb1e2ee62bcd0b9f54aa95b063a9fe4eaee 100644 (file)
--- a/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
+++ b/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
@@ -4,6 +4,12 @@ AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils \
        -I$(top_srcdir)/tests/utils/testapp
 
 if HAVE_LIBLTTNG_UST_CTL
+WARN_FLAGS = \
+       -Wno-redundant-decls
+
+AM_CFLAGS += $(WARN_FLAGS)
+AM_CXXFLAGS += $(WARN_FLAGS)
+
 noinst_PROGRAMS = gen-ust-nevents-str
 gen_ust_nevents_str_SOURCES = \
        gen-ust-nevents-str.cpp \

diff --git a/tests/utils/testapp/gen-ust-nevents/Makefile.am b/tests/utils/testapp/gen-ust-nevents/Makefile.am
index cb869715dd47280f084de8a5a7f2699efe46e338..c2d36d7c951c370fe13ffc6d9a1eb518a9ac790a 100644 (file)
--- a/tests/utils/testapp/gen-ust-nevents/Makefile.am
+++ b/tests/utils/testapp/gen-ust-nevents/Makefile.am
@@ -4,6 +4,12 @@ AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils \
        -I$(top_srcdir)/tests/utils/testapp
 
 if HAVE_LIBLTTNG_UST_CTL
+WARN_FLAGS = \
+       -Wno-redundant-decls
+
+AM_CFLAGS += $(WARN_FLAGS)
+AM_CXXFLAGS += $(WARN_FLAGS)
+
 noinst_PROGRAMS = gen-ust-nevents
 gen_ust_nevents_SOURCES = \
        gen-ust-nevents.cpp \