X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=7b9647436ac82e059fdc61aa7216ddbbe9ca9dfc;hp=5e146931e5e31d848d99232068c9c4c8b59aca5a;hb=cf0bcb51ea857687a353d2851e572dba6cc63cb0;hpb=83b45089a2624e885b0f0308be7ba5b061b23282

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 5e146931e..7b9647436 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -245,7 +245,7 @@ end:
  */
 static void list_lttng_channels(enum lttng_domain_type domain,
 		struct ltt_session *session, struct lttng_channel *channels,
-		struct lttcomm_channel_extended *chan_exts)
+		struct lttng_channel_extended *chan_exts)
 {
 	int i = 0, ret;
 	struct ltt_kernel_channel *kchan;
@@ -259,6 +259,10 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 			cds_list_for_each_entry(kchan,
 					&session->kernel_session->channel_list.head, list) {
 				uint64_t discarded_events, lost_packets;
+				struct lttng_channel_extended *extended;
+
+				extended = (struct lttng_channel_extended *)
+						kchan->channel->attr.extended.ptr;
 
 				ret = get_kernel_runtime_stats(session, kchan,
 						&discarded_events, &lost_packets);
@@ -271,6 +275,8 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 				chan_exts[i].discarded_events =
 						discarded_events;
 				chan_exts[i].lost_packets = lost_packets;
+				chan_exts[i].monitor_timer_interval =
+						extended->monitor_timer_interval;
 				i++;
 			}
 		}
@@ -323,6 +329,8 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 			}
 			chan_exts[i].discarded_events = discarded_events;
 			chan_exts[i].lost_packets = lost_packets;
+			chan_exts[i].monitor_timer_interval =
+					uchan->monitor_timer_interval;
 			i++;
 		}
 		rcu_read_unlock();
@@ -1681,7 +1689,7 @@ int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
 				free(attr);
 				goto error;
 			}
-			free(attr);
+			channel_attr_destroy(attr);
 			chan_ust_created = 1;
 		}
 
@@ -2179,7 +2187,7 @@ error:
 	free(filter_expression);
 	free(filter);
 	free(exclusion);
-	free(attr);
+	channel_attr_destroy(attr);
 	rcu_read_unlock();
 	return ret;
 }
@@ -2948,8 +2956,8 @@ ssize_t cmd_list_channels(enum lttng_domain_type domain,
 
 	if (nb_chan > 0) {
 		const size_t channel_size = sizeof(struct lttng_channel) +
-			sizeof(struct lttcomm_channel_extended);
-		struct lttcomm_channel_extended *channel_exts;
+			sizeof(struct lttng_channel_extended);
+		struct lttng_channel_extended *channel_exts;
 
 		payload_size = nb_chan * channel_size;
 		*channels = zmalloc(payload_size);