Docs: relayd: document the lifetime of viewer session trace chunks

[lttng-tools.git] / src / bin / lttng-relayd / connection.c

diff --git a/src/bin/lttng-relayd/connection.c b/src/bin/lttng-relayd/connection.c
index eeaa0a559c74d3f7aa1ee6d5ffdfa146498ec195..e50784bf5aa44f6205d2f0624db3779dae2886eb 100644 (file)
--- a/src/bin/lttng-relayd/connection.c
+++ b/src/bin/lttng-relayd/connection.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- *                      David Goulet <dgoulet@efficios.com>
- *               2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -37,7 +27,7 @@ struct relay_connection *connection_get_by_sock(struct lttng_ht *relay_connectio
        struct lttng_ht_iter iter;
        struct relay_connection *conn = NULL;
 
-       assert(sock >= 0);
+       LTTNG_ASSERT(sock >= 0);
 
        rcu_read_lock();
        lttng_ht_lookup(relay_connections_ht, (void *)((unsigned long) sock),
@@ -127,6 +117,10 @@ static void rcu_free_connection(struct rcu_head *head)
                viewer_session_destroy(conn->viewer_session);
                conn->viewer_session = NULL;
        }
+       if (conn->type == RELAY_CONTROL) {
+               lttng_dynamic_buffer_reset(
+                               &conn->protocol.ctrl.reception_buffer);
+       }
        free(conn);
 }
 
@@ -146,7 +140,7 @@ static void connection_release(struct urcu_ref *ref)
 
                iter.iter.node = &conn->sock_n.node;
                ret = lttng_ht_del(conn->socket_ht, &iter);
-               assert(!ret);
+               LTTNG_ASSERT(!ret);
        }
 
        if (conn->session) {
@@ -171,7 +165,7 @@ void connection_put(struct relay_connection *conn)
 void connection_ht_add(struct lttng_ht *relay_connections_ht,
                struct relay_connection *conn)
 {
-       assert(!conn->in_socket_ht);
+       LTTNG_ASSERT(!conn->in_socket_ht);
        lttng_ht_add_unique_ulong(relay_connections_ht, &conn->sock_n);
        conn->in_socket_ht = 1;
        conn->socket_ht = relay_connections_ht;
@@ -182,9 +176,9 @@ int connection_set_session(struct relay_connection *conn,
 {
        int ret = 0;
 
-       assert(conn);
-       assert(session);
-       assert(!conn->session);
+       LTTNG_ASSERT(conn);
+       LTTNG_ASSERT(session);
+       LTTNG_ASSERT(!conn->session);
 
        if (connection_get(conn)) {
                if (session_get(session)) {