/*
- * 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
bool connection_get(struct relay_connection *conn)
{
- bool has_ref = false;
-
- pthread_mutex_lock(&conn->reflock);
- if (conn->ref.refcount != 0) {
- has_ref = true;
- urcu_ref_get(&conn->ref);
- }
- pthread_mutex_unlock(&conn->reflock);
-
- return has_ref;
+ return urcu_ref_get_unless_zero(&conn->ref);
}
struct relay_connection *connection_get_by_sock(struct lttng_ht *relay_connections_ht,
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),
return conn;
}
+int connection_reset_protocol_state(struct relay_connection *connection)
+{
+ int ret = 0;
+
+ switch (connection->type) {
+ case RELAY_DATA:
+ connection->protocol.data.state_id =
+ DATA_CONNECTION_STATE_RECEIVE_HEADER;
+ memset(&connection->protocol.data.state.receive_header,
+ 0,
+ sizeof(connection->protocol.data.state.receive_header));
+ connection->protocol.data.state.receive_header.left_to_receive =
+ sizeof(struct lttcomm_relayd_data_hdr);
+ break;
+ case RELAY_CONTROL:
+ connection->protocol.ctrl.state_id =
+ CTRL_CONNECTION_STATE_RECEIVE_HEADER;
+ memset(&connection->protocol.ctrl.state.receive_header,
+ 0,
+ sizeof(connection->protocol.ctrl.state.receive_header));
+ connection->protocol.data.state.receive_header.left_to_receive =
+ sizeof(struct lttcomm_relayd_hdr);
+ ret = lttng_dynamic_buffer_set_size(
+ &connection->protocol.ctrl.reception_buffer,
+ sizeof(struct lttcomm_relayd_hdr));
+ if (ret) {
+ ERR("Failed to reinitialize control connection reception buffer size to %zu bytes.", sizeof(struct lttcomm_relayd_hdr));
+ goto end;
+ }
+ break;
+ default:
+ goto end;
+ }
+ DBG("Reset communication state of relay connection (fd = %i)",
+ connection->sock->fd);
+end:
+ return ret;
+}
+
struct relay_connection *connection_create(struct lttcomm_sock *sock,
enum connection_type type)
{
PERROR("zmalloc relay connection");
goto end;
}
- pthread_mutex_init(&conn->reflock, NULL);
urcu_ref_init(&conn->ref);
conn->type = type;
conn->sock = sock;
lttng_ht_node_init_ulong(&conn->sock_n, (unsigned long) conn->sock->fd);
+ if (conn->type == RELAY_CONTROL) {
+ lttng_dynamic_buffer_init(&conn->protocol.ctrl.reception_buffer);
+ }
+ connection_reset_protocol_state(conn);
end:
return conn;
}
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);
}
iter.iter.node = &conn->sock_n.node;
ret = lttng_ht_del(conn->socket_ht, &iter);
- assert(!ret);
+ LTTNG_ASSERT(!ret);
}
if (conn->session) {
void connection_put(struct relay_connection *conn)
{
rcu_read_lock();
- pthread_mutex_lock(&conn->reflock);
urcu_ref_put(&conn->ref, connection_release);
- pthread_mutex_unlock(&conn->reflock);
rcu_read_unlock();
}
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;
}
+
+int connection_set_session(struct relay_connection *conn,
+ struct relay_session *session)
+{
+ int ret = 0;
+
+ LTTNG_ASSERT(conn);
+ LTTNG_ASSERT(session);
+ LTTNG_ASSERT(!conn->session);
+
+ if (connection_get(conn)) {
+ if (session_get(session)) {
+ conn->session = session;
+ } else {
+ ERR("Failed to get session reference in connection_set_session()");
+ ret = -1;
+ }
+ connection_put(conn);
+ } else {
+ ERR("Failed to get connection reference in connection_set_session()");
+ ret = -1;
+ }
+ return ret;
+}