Fix: Check for NULL hash tables on relay daemon teardown

The relay daemon will log any "leaked" object on exit. However,
some errors encountered early-on during the daemon's
initialization may result in the teardown being executed with
uninitialized hash tables.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index 7fffea8af4d29145e97cb320786cc0265531106b..d1c2098f8591a3a8c9c5e87b022f43e8fff627ee 100644 (file)
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -230,6 +230,10 @@ void print_sessions(void)
        struct lttng_ht_iter iter;
        struct relay_session *session;
 
        struct lttng_ht_iter iter;
        struct relay_session *session;
 

+       if (!sessions_ht) {
+               return;
+       }
+

        rcu_read_lock();
        cds_lfht_for_each_entry(sessions_ht->ht, &iter.iter, session,
                        session_n.node) {
        rcu_read_lock();
        cds_lfht_for_each_entry(sessions_ht->ht, &iter.iter, session,
                        session_n.node) {

diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c
index cbd7ceb88d4874a9866b2b4973d111f174d80edc..335a1cf5f79de497f3002beb3ae0a2a983da355f 100644 (file)
--- a/src/bin/lttng-relayd/stream.c
+++ b/src/bin/lttng-relayd/stream.c
@@ -446,6 +446,10 @@ void print_relay_streams(void)
        struct lttng_ht_iter iter;
        struct relay_stream *stream;
 
        struct lttng_ht_iter iter;
        struct relay_stream *stream;
 

+       if (!relay_streams_ht) {
+               return;
+       }
+

        rcu_read_lock();
        cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream,
                        node.node) {
        rcu_read_lock();
        cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream,
                        node.node) {

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index 623f94ca7fca4d059254d36bfc902ea030d17a03..7c59cd05d88ea3797569e87d8d964d67aa61e562 100644 (file)
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -338,6 +338,10 @@ void print_viewer_streams(void)
        struct lttng_ht_iter iter;
        struct relay_viewer_stream *vstream;
 
        struct lttng_ht_iter iter;
        struct relay_viewer_stream *vstream;
 

+       if (!viewer_streams_ht) {
+               return;
+       }
+

        rcu_read_lock();
        cds_lfht_for_each_entry(viewer_streams_ht->ht, &iter.iter, vstream,
                        stream_n.node) {
        rcu_read_lock();
        cds_lfht_for_each_entry(viewer_streams_ht->ht, &iter.iter, vstream,
                        stream_n.node) {