X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=6c8ad411a3ab7de446f8a8bdda20c4b552dad6b6;hb=0c7bcad5eaa11b368460759fc87f949e8c56b98f;hp=3b67923b9cae45ce088b02853c19d7b0e31799bc;hpb=4f50c803f026f217d37588c46265b5c2fb9a1195;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 3b67923b9..6c8ad411a 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -1386,34 +1386,37 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain,
 
 	memset(attr, 0, sizeof(struct lttng_channel_attr));
 
+	/* Same for all domains. */
+	attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
+	attr->tracefile_size = DEFAULT_CHANNEL_TRACEFILE_SIZE;
+	attr->tracefile_count = DEFAULT_CHANNEL_TRACEFILE_COUNT;
+
 	switch (domain->type) {
 	case LTTNG_DOMAIN_KERNEL:
-		attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
-		attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
-		attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
-
+		attr->switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER;
+		attr->read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER;
 		attr->subbuf_size = default_get_kernel_channel_subbuf_size();
 		attr->num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
 		attr->output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
-		attr->tracefile_size = DEFAULT_KERNEL_CHANNEL_TRACEFILE_SIZE;
-		attr->tracefile_count = DEFAULT_KERNEL_CHANNEL_TRACEFILE_COUNT;
 		break;
 	case LTTNG_DOMAIN_UST:
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-		attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
-		attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
-		attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
-
-		attr->subbuf_size = default_get_ust_channel_subbuf_size();
-		attr->num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
-		attr->output = DEFAULT_UST_CHANNEL_OUTPUT;
-		attr->tracefile_size = DEFAULT_UST_CHANNEL_TRACEFILE_SIZE;
-		attr->tracefile_count = DEFAULT_UST_CHANNEL_TRACEFILE_COUNT;
-		break;
+		switch (domain->buf_type) {
+		case LTTNG_BUFFER_PER_UID:
+			attr->subbuf_size = default_get_ust_uid_channel_subbuf_size();
+			attr->num_subbuf = DEFAULT_UST_UID_CHANNEL_SUBBUF_NUM;
+			attr->output = DEFAULT_UST_UID_CHANNEL_OUTPUT;
+			attr->switch_timer_interval = DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER;
+			attr->read_timer_interval = DEFAULT_UST_UID_CHANNEL_READ_TIMER;
+			break;
+		case LTTNG_BUFFER_PER_PID:
+		default:
+			attr->subbuf_size = default_get_ust_pid_channel_subbuf_size();
+			attr->num_subbuf = DEFAULT_UST_PID_CHANNEL_SUBBUF_NUM;
+			attr->output = DEFAULT_UST_PID_CHANNEL_OUTPUT;
+			attr->switch_timer_interval = DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER;
+			attr->read_timer_interval = DEFAULT_UST_PID_CHANNEL_READ_TIMER;
+			break;
+		}
 	default:
 		/* Default behavior: leave set to 0. */
 		break;
@@ -1494,7 +1497,7 @@ int lttng_set_consumer_url(struct lttng_handle *handle,
 }
 
 /*
- * [OBSELETE]
+ * [OBSOLETE]
  */
 int lttng_enable_consumer(struct lttng_handle *handle)
 {
@@ -1502,7 +1505,7 @@ int lttng_enable_consumer(struct lttng_handle *handle)
 }
 
 /*
- * [OBSELETE]
+ * [OBSOLETE]
  */
 int lttng_disable_consumer(struct lttng_handle *handle)
 {
@@ -1596,7 +1599,12 @@ int lttng_health_check(enum lttng_health_component c)
 	ret = reply.ret_code;
 
 close_error:
-	close(sock);
+	{
+		int closeret;
+
+		closeret = close(sock);
+		assert(!closeret);
+	}
 
 error:
 	return ret;
@@ -1647,8 +1655,14 @@ int _lttng_create_session_ext(const char *name, const char *url,
 	lsm.u.uri.size = size;
 
 	if (size > 0 && uris[0].dtype != LTTNG_DST_PATH && strlen(uris[0].subdir) == 0) {
-		ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s-%s", name,
-				datetime);
+		/* Don't append datetime if the name was automatically created. */
+		if (strncmp(name, DEFAULT_SESSION_NAME "-",
+					strlen(DEFAULT_SESSION_NAME) + 1)) {
+			ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s-%s",
+					name, datetime);
+		} else {
+			ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s", name);
+		}
 		if (ret < 0) {
 			PERROR("snprintf uri subdir");
 			ret = -LTTNG_ERR_FATAL;