Fix handling of sessiond respawn after a SIGKILL

[lttng-tools.git] / ltt-sessiond / trace.c

diff --git a/ltt-sessiond/trace.c b/ltt-sessiond/trace.c
index b6138f8f5837ea61b9e9e2fc31d7a2242e81c97e..c090f21063d60d8e38c3aecf6150e17195c8d45f 100644 (file)
--- a/ltt-sessiond/trace.c
+++ b/ltt-sessiond/trace.c
@@ -138,6 +138,7 @@ struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *cha
 
        lkc->fd = 0;
        lkc->stream_count = 0;
+       lkc->event_count = 0;
        lkc->enabled = 1;
        lkc->ctx = NULL;
        /* Init linked list */
@@ -184,6 +185,14 @@ struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev)
                                ev->attr.probe.symbol_name, LTTNG_SYM_NAME_LEN);
                break;
        case LTTNG_EVENT_FUNCTION:
+               attr->instrumentation = LTTNG_KERNEL_KRETPROBE;
+               attr->u.kretprobe.addr = ev->attr.probe.addr;
+               attr->u.kretprobe.offset = ev->attr.probe.offset;
+               attr->u.kretprobe.offset = ev->attr.probe.offset;
+               strncpy(attr->u.kretprobe.symbol_name,
+                               ev->attr.probe.symbol_name, LTTNG_SYM_NAME_LEN);
+               break;
+       case LTTNG_EVENT_FUNCTION_ENTRY:
                attr->instrumentation = LTTNG_KERNEL_FUNCTION;
                strncpy(attr->u.ftrace.symbol_name,
                                ev->attr.ftrace.symbol_name, LTTNG_SYM_NAME_LEN);
@@ -311,8 +320,8 @@ void trace_destroy_kernel_event(struct ltt_kernel_event *event)
 
 void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel)
 {
-       struct ltt_kernel_stream *stream;
-       struct ltt_kernel_event *event;
+       struct ltt_kernel_stream *stream, *stmp;
+       struct ltt_kernel_event *event, *etmp;
 
        DBG("[trace] Closing channel fd %d", channel->fd);
        /* Close kernel fd */
@@ -322,12 +331,12 @@ void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel)
        free(channel->channel);
 
        /* For each stream in the channel list */
-       cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
+       cds_list_for_each_entry_safe(stream, stmp, &channel->stream_list.head, list) {
                trace_destroy_kernel_stream(stream);
        }
 
        /* For each event in the channel list */
-       cds_list_for_each_entry(event, &channel->events_list.head, list) {
+       cds_list_for_each_entry_safe(event, etmp, &channel->events_list.head, list) {
                trace_destroy_kernel_event(event);
        }
 
@@ -349,7 +358,7 @@ void trace_destroy_kernel_metadata(struct ltt_kernel_metadata *metadata)
 
 void trace_destroy_kernel_session(struct ltt_kernel_session *session)
 {
-       struct ltt_kernel_channel *channel;
+       struct ltt_kernel_channel *channel, *ctmp;
 
        DBG("[trace] Closing session fd %d", session->fd);
        /* Close kernel fds */
@@ -363,7 +372,7 @@ void trace_destroy_kernel_session(struct ltt_kernel_session *session)
                trace_destroy_kernel_metadata(session->metadata);
        }
 
-       cds_list_for_each_entry(channel, &session->channel_list.head, list) {
+       cds_list_for_each_entry_safe(channel, ctmp, &session->channel_list.head, list) {
                trace_destroy_kernel_channel(channel);
        }