Support for --default-name and --default-output in create command

configure.ac

@@ -981,6 +981,8 @@ AC_CONFIG_FILES([
 	tests/regression/tools/wildcard/Makefile
 	tests/regression/tools/crash/Makefile
 	tests/regression/tools/metadata-regen/Makefile
+	tests/regression/tools/templates/Makefile
+	tests/regression/tools/templates/sessions/Makefile
 	tests/regression/ust/Makefile
 	tests/regression/ust/nprocesses/Makefile
 	tests/regression/ust/high-throughput/Makefile

doc/man/lttng-create.1.txt

@@ -200,6 +200,9 @@ option:-o, option:--output='PATH'::
 option:--shm-path='PATH'::
     Create shared memory holding buffers at 'PATH'.
 
+option:--default-output::
+    Use the default output associated to the session's mode.
+
 
 URL
 ~~~
@@ -224,6 +227,11 @@ In <<local-mode,local>> mode, 'URL' must start with `file://` followed
 by the destination path on the local file system.
 
 
+Name
+~~~~
+option:--default-name::
+    Generate a session name of the form `auto-YYYYmmdd-HHMMSS`.
+
 include::common-cmd-help-options.txt[]
 
 

doc/man/lttng-save.1.txt

@@ -54,6 +54,11 @@ option:-f, option:--force::
 option:-o, option:--output-path='PATH'::
     Set output directory path to 'PATH'.
 
+option:--omit-name::
+    Omit session name(s) from saved session configuration(s).
+
+option:--omit-output::
+    Omit session output(s) from saved session configuration(s).
 
 include::common-cmd-help-options.txt[]
 

include/lttng/save-internal.h

@@ -33,7 +33,11 @@ struct lttng_save_session_attr {
 	/* Destination of the session configuration. See lttng(1) for URL format. */
 	char configuration_url[PATH_MAX];
 	/* Overwrite the session configuration file if it exists. */
-	uint32_t overwrite;
+	uint8_t overwrite;
+	/* Omit the sessions' name(s). */
+	uint8_t omit_name;
+	/* Omit the sessions' output(s). */
+	uint8_t omit_output;
 } LTTNG_PACKED;
 
 #endif /* LTTNG_SAVE_INTERNAL_ABI_H */

include/lttng/save.h

@@ -59,6 +59,18 @@ const char *lttng_save_session_attr_get_output_url(
  */
 int lttng_save_session_attr_get_overwrite(
 	struct lttng_save_session_attr *attr);
+/*
+ * Return the omit name configuration attribute. This attribute indicates
+ * whether or not the saved sessions' names should be omitted.
+ */
+int lttng_save_session_attr_get_omit_name(
+	struct lttng_save_session_attr *attr);
+/*
+ * Return the omit output configuration attribute. This attribute indicates
+ * whether or not the saved sessions' output configuration should be omitted.
+ */
+int lttng_save_session_attr_get_omit_output(
+	struct lttng_save_session_attr *attr);
 
 /*
  * Save session attribute setter family functions.
@@ -86,6 +98,18 @@ int lttng_save_session_attr_set_output_url(
  */
 int lttng_save_session_attr_set_overwrite(
 	struct lttng_save_session_attr *attr, int overwrite);
+/*
+ * Set the omit name attribute. If set to true, the sessions' names are omitted
+ * from the resulting session configuration file.
+ */
+int lttng_save_session_attr_set_omit_name(
+	struct lttng_save_session_attr *attr, int omit_name);
+/*
+ * Set the omit output attribute. If set to true, the sessions' output
+ * configurations are omitted from the resulting session configuration file.
+ */
+int lttng_save_session_attr_set_omit_output(
+	struct lttng_save_session_attr *attr, int omit_output);
 
 /*
  * Save session configuration(s).

src/bin/lttng-sessiond/save.c

@@ -1856,6 +1856,7 @@ int save_session(struct ltt_session *session,
 	struct config_writer *writer = NULL;
 	size_t session_name_len;
 	const char *provided_path;
+	bool omit_name, omit_output;
 
 	assert(session);
 	assert(attr);
@@ -1871,6 +1872,18 @@ int save_session(struct ltt_session *session,
 		goto end;
 	}
 
+	ret = lttng_save_session_attr_get_omit_name(attr);
+	if (ret < 0) {
+		goto end;
+	}
+	omit_name = !!ret;
+
+	ret = lttng_save_session_attr_get_omit_output(attr);
+	if (ret < 0) {
+		goto end;
+	}
+	omit_output = !!ret;
+
 	provided_path = lttng_save_session_attr_get_output_url(attr);
 	if (provided_path) {
 		DBG3("Save session in provided path %s", provided_path);
@@ -1963,11 +1976,13 @@ int save_session(struct ltt_session *session,
 		goto end;
 	}
 
-	ret = config_writer_write_element_string(writer, config_element_name,
-			session->name);
-	if (ret) {
-		ret = LTTNG_ERR_SAVE_IO_FAIL;
-		goto end;
+	if (!omit_name) {
+		ret = config_writer_write_element_string(writer,
+				config_element_name, session->name);
+		if (ret) {
+			ret = LTTNG_ERR_SAVE_IO_FAIL;
+			goto end;
+		}
 	}
 
 	if(session->shm_path[0] != '\0') {
@@ -2023,9 +2038,11 @@ int save_session(struct ltt_session *session,
 		}
 	}
 
-	ret = save_session_output(writer, session);
-	if (ret) {
-		goto end;
+	if (!omit_output) {
+		ret = save_session_output(writer, session);
+		if (ret) {
+			goto end;
+		}
 	}
 
 	/* /session */

src/bin/lttng-sessiond/utils.c

@@ -55,8 +55,7 @@ void ht_cleanup_push(struct lttng_ht *ht)
 	if (!ht) {
 		return;
 	}
-	if (fd < 0)
-		return;
+	assert(fd >= 0);
 	ret = lttng_write(fd, &ht, sizeof(ht));
 	if (ret < sizeof(ht)) {
 		PERROR("write ht cleanup pipe %d", fd);