sessiond: Implement clear for sessions with local and remote output

[lttng-tools.git] / src / bin / lttng-sessiond / consumer.c

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 382815e6b3665ecb76cde7ce1edf5fbc37c4fe3f..f286df9434e930304486219826b4e54e20138c46 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -1588,11 +1588,36 @@ int consumer_clear_channel(struct consumer_socket *socket, uint64_t key,
        msg.cmd_type = LTTNG_CONSUMER_CLEAR_CHANNEL;
        msg.u.clear_channel.key = key;
 
-       if (output->type == CONSUMER_DST_NET) {
-               ERR("Relayd clear is not supported for now");
-               ret = -LTTNG_ERR_INVALID;
-               goto error;
+       health_code_update();
+
+       pthread_mutex_lock(socket->lock);
+       ret = consumer_send_msg(socket, &msg);
+       if (ret < 0) {
+               goto error_socket;
        }
+
+error_socket:
+       pthread_mutex_unlock(socket->lock);
+
+       health_code_update();
+       return ret;
+}
+
+static
+int consumer_msg_clear_session(struct consumer_socket *socket, uint64_t session_id,
+               struct consumer_output *output)
+{
+       int ret;
+       struct lttcomm_consumer_msg msg;
+
+       assert(socket);
+
+       DBG("Consumer clear session %" PRIu64, session_id);
+
+       memset(&msg, 0, sizeof(msg));
+       msg.cmd_type = LTTNG_CONSUMER_CLEAR_SESSION;
+       msg.u.clear_session.session_id = session_id;
+
        health_code_update();
 
        pthread_mutex_lock(socket->lock);
@@ -1604,7 +1629,46 @@ int consumer_clear_channel(struct consumer_socket *socket, uint64_t key,
 error_socket:
        pthread_mutex_unlock(socket->lock);
 
-error:
        health_code_update();
        return ret;
 }
+
+int consumer_clear_session(struct ltt_session *session)
+{
+       struct ltt_ust_session *usess = session->ust_session;
+       struct ltt_kernel_session *ksess = session->kernel_session;
+       int ret;
+
+       rcu_read_lock();
+       if (ksess) {
+               struct consumer_socket *socket;
+               struct lttng_ht_iter iter;
+
+               cds_lfht_for_each_entry(ksess->consumer->socks->ht, &iter.iter,
+                               socket, node.node) {
+                       ret = consumer_msg_clear_session(socket, session->id,
+                                       ksess->consumer);
+                       if (ret < 0) {
+                               goto error;
+                       }
+               }
+       }
+       if (usess) {
+               struct consumer_socket *socket;
+               struct lttng_ht_iter iter;
+
+               cds_lfht_for_each_entry(usess->consumer->socks->ht, &iter.iter,
+                               socket, node.node) {
+                       ret = consumer_msg_clear_session(socket, session->id,
+                                       usess->consumer);
+                       if (ret < 0) {
+                               goto error;
+                       }
+               }
+       }
+       rcu_read_unlock();
+       return 0;
+error:
+       rcu_read_unlock();
+       return ret;
+}