sessiond: add clear notifier

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

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 7ef1880491620e245814209e371b7e0b14524ec2..0da2058fdf28dbbef05f0d2490cfbf49a089a294 100644 (file)
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -46,6 +46,11 @@ struct ltt_session_destroy_notifier_element {
        void *user_data;
 };
 
+struct ltt_session_clear_notifier_element {
+       ltt_session_clear_notifier notifier;
+       void *user_data;
+};
+
 /*
  * NOTES:
  *
@@ -491,7 +496,8 @@ int _session_set_trace_chunk_no_lock_check(struct ltt_session *session,
                        pthread_mutex_lock(socket->lock);
                        ret = consumer_create_trace_chunk(socket,
                                        relayd_id,
-                                       session->id, new_trace_chunk);
+                                       session->id, new_trace_chunk,
+                                       DEFAULT_UST_TRACE_DIR);
                        pthread_mutex_unlock(socket->lock);
                         if (ret) {
                                goto error;
@@ -521,7 +527,8 @@ int _session_set_trace_chunk_no_lock_check(struct ltt_session *session,
                        pthread_mutex_lock(socket->lock);
                        ret = consumer_create_trace_chunk(socket,
                                        relayd_id,
-                                       session->id, new_trace_chunk);
+                                       session->id, new_trace_chunk,
+                                       DEFAULT_KERNEL_TRACE_DIR);
                        pthread_mutex_unlock(socket->lock);
                         if (ret) {
                                goto error;
@@ -660,9 +667,9 @@ error:
        goto end;
 }
 
-int session_close_trace_chunk(const struct ltt_session *session,
+int session_close_trace_chunk(struct ltt_session *session,
                struct lttng_trace_chunk *trace_chunk,
-               const enum lttng_trace_chunk_command_type *close_command,
+               enum lttng_trace_chunk_command_type close_command,
                char *closed_trace_chunk_path)
 {
        int ret = 0;
@@ -672,13 +679,11 @@ int session_close_trace_chunk(const struct ltt_session *session,
        enum lttng_trace_chunk_status chunk_status;
        const time_t chunk_close_timestamp = time(NULL);
 
-       if (close_command) {
-               chunk_status = lttng_trace_chunk_set_close_command(
-                               trace_chunk, *close_command);
-               if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
-                       ret = -1;
-                       goto end;
-               }
+       chunk_status = lttng_trace_chunk_set_close_command(
+                       trace_chunk, close_command);
+       if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+               ret = -1;
+               goto end;
        }
 
        if (chunk_close_timestamp == (time_t) -1) {
@@ -769,6 +774,25 @@ void session_notify_destruction(const struct ltt_session *session)
        }
 }
 
+/*
+ * Fire each clear notifier once, and remove them from the array.
+ */
+void session_notify_clear(struct ltt_session *session)
+{
+       size_t i;
+       const size_t count = lttng_dynamic_array_get_count(
+                       &session->clear_notifiers);
+
+       for (i = 0; i < count; i++) {
+               const struct ltt_session_clear_notifier_element *element =
+                       lttng_dynamic_array_get_element(
+                                       &session->clear_notifiers, i);
+
+               element->notifier(session, element->user_data);
+       }
+       lttng_dynamic_array_clear(&session->clear_notifiers);
+}
+
 static
 void session_release(struct urcu_ref *ref)
 {
@@ -831,6 +855,7 @@ void session_release(struct urcu_ref *ref)
                session->ust_session = NULL;
        }
        lttng_dynamic_array_reset(&session->destroy_notifiers);
+       lttng_dynamic_array_reset(&session->clear_notifiers);
        free(session->last_archived_chunk_name);
        free(session->base_path);
        free(session);
@@ -899,6 +924,18 @@ int session_add_destroy_notifier(struct ltt_session *session,
                        &element);
 }
 
+int session_add_clear_notifier(struct ltt_session *session,
+               ltt_session_clear_notifier notifier, void *user_data)
+{
+       const struct ltt_session_clear_notifier_element element = {
+               .notifier = notifier,
+               .user_data = user_data
+       };
+
+       return lttng_dynamic_array_add_element(&session->clear_notifiers,
+                       &element);
+}
+
 /*
  * Return a ltt_session structure ptr that matches name. If no session found,
  * NULL is returned. This must be called with the session list lock held using
@@ -990,6 +1027,9 @@ enum lttng_error_code session_create(const char *name, uid_t uid, gid_t gid,
        lttng_dynamic_array_init(&new_session->destroy_notifiers,
                        sizeof(struct ltt_session_destroy_notifier_element),
                        NULL);
+       lttng_dynamic_array_init(&new_session->clear_notifiers,
+                       sizeof(struct ltt_session_clear_notifier_element),
+                       NULL);
        urcu_ref_init(&new_session->ref);
        pthread_mutex_init(&new_session->lock, NULL);
 
@@ -1184,6 +1224,11 @@ int session_reset_rotation_state(struct ltt_session *session,
                                chunk_id);
                lttng_trace_chunk_put(session->chunk_being_archived);
                session->chunk_being_archived = NULL;
+               /*
+                * Fire the clear reply notifiers if we are completing a clear
+                * rotation.
+                */
+               session_notify_clear(session);
        }
        return ret;
 }