X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=8a88eccedb62ab788835468f56f193ce86d9b8fc;hp=88480c4b4e7b78fd63a2edc744618eadba0c36bc;hb=e9404c27e7cc9d841785e6c4292c1add19fbc1cc;hpb=40d253abbf635c6cf0b938298d56747cf67c11db

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index 88480c4b4..8a88ecced 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -41,6 +41,7 @@ struct lttng_channel *channel_new_default_attr(int dom,
 {
 	struct lttng_channel *chan;
 	const char *channel_name = DEFAULT_CHANNEL_NAME;
+	struct lttng_channel_extended *extended_attr = NULL;
 
 	chan = zmalloc(sizeof(struct lttng_channel));
 	if (chan == NULL) {
@@ -48,6 +49,14 @@ struct lttng_channel *channel_new_default_attr(int dom,
 		goto error_alloc;
 	}
 
+	extended_attr = zmalloc(sizeof(struct lttng_channel_extended));
+	if (!extended_attr) {
+		PERROR("zmalloc channel extended init");
+		goto error;
+	}
+
+	chan->attr.extended.ptr = extended_attr;
+
 	/* Same for all domains. */
 	chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
 	chan->attr.tracefile_size = DEFAULT_CHANNEL_TRACEFILE_SIZE;
@@ -63,6 +72,8 @@ struct lttng_channel *channel_new_default_attr(int dom,
 		chan->attr.switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER;
 		chan->attr.read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER;
 		chan->attr.live_timer_interval = DEFAULT_KERNEL_CHANNEL_LIVE_TIMER;
+		extended_attr->monitor_timer_interval =
+			DEFAULT_KERNEL_CHANNEL_MONITOR_TIMER;
 		break;
 	case LTTNG_DOMAIN_JUL:
 		channel_name = DEFAULT_JUL_CHANNEL_NAME;
@@ -86,6 +97,8 @@ common_ust:
 				DEFAULT_UST_UID_CHANNEL_READ_TIMER;
 			chan->attr.live_timer_interval =
 				DEFAULT_UST_UID_CHANNEL_LIVE_TIMER;
+			extended_attr->monitor_timer_interval =
+				DEFAULT_UST_UID_CHANNEL_MONITOR_TIMER;
 			break;
 		case LTTNG_BUFFER_PER_PID:
 		default:
@@ -97,7 +110,9 @@ common_ust:
 			chan->attr.read_timer_interval =
 				DEFAULT_UST_PID_CHANNEL_READ_TIMER;
 			chan->attr.live_timer_interval =
-				DEFAULT_UST_UID_CHANNEL_LIVE_TIMER;
+				DEFAULT_UST_PID_CHANNEL_LIVE_TIMER;
+			extended_attr->monitor_timer_interval =
+				DEFAULT_UST_PID_CHANNEL_MONITOR_TIMER;
 			break;
 		}
 		break;
@@ -113,11 +128,21 @@ common_ust:
 	return chan;
 
 error:
+	free(extended_attr);
 	free(chan);
 error_alloc:
 	return NULL;
 }
 
+void channel_attr_destroy(struct lttng_channel *channel)
+{
+	if (!channel) {
+		return;
+	}
+	free(channel->attr.extended.ptr);
+	free(channel);
+}
+
 /*
  * Disable kernel channel of the kernel session.
  */
@@ -249,7 +274,7 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 
 	ret = LTTNG_OK;
 error:
-	free(defattr);
+	channel_attr_destroy(defattr);
 	return ret;
 }
 
@@ -459,7 +484,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 		}
 	}
 
-	free(defattr);
+	channel_attr_destroy(defattr);
 	return LTTNG_OK;
 
 error_free_chan:
@@ -469,7 +494,7 @@ error_free_chan:
 	 */
 	trace_ust_destroy_channel(uchan);
 error:
-	free(defattr);
+	channel_attr_destroy(defattr);
 	return ret;
 }