rotation-api: pass session name explicitly

[lttng-tools.git] / src / bin / lttng / commands / enable_rotation.c

diff --git a/src/bin/lttng/commands/enable_rotation.c b/src/bin/lttng/commands/enable_rotation.c
index 80fc495ba8de8dcbf94a76bf98cc9c164e3f8ef3..81a55b24c8aaec4810cec9ce54bcbc1621d1a6ea 100644 (file)
--- a/src/bin/lttng/commands/enable_rotation.c
+++ b/src/bin/lttng/commands/enable_rotation.c
@@ -36,6 +36,12 @@
 static char *opt_session_name;
 static struct mi_writer *writer;
 
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-enable-rotation.1.h>
+;
+#endif
+
 enum {
        OPT_HELP = 1,
        OPT_LIST_OPTIONS,
@@ -63,11 +69,6 @@ static int setup_rotate(char *session_name, uint64_t timer, uint64_t size)
                goto error;
        }
 
-       ret = lttng_rotation_schedule_attr_set_session_name(attr, session_name);
-       if (ret < 0) {
-               goto error;
-       }
-
        if (lttng_opt_mi) {
                /* Open rotation_schedule element */
                ret = mi_lttng_writer_open_element(writer,
@@ -108,7 +109,7 @@ static int setup_rotate(char *session_name, uint64_t timer, uint64_t size)
                }
        }
 
-       ret = lttng_rotation_set_schedule(attr);
+       ret = lttng_rotation_set_schedule(session_name, attr);
        if (ret) {
                ERR("%s", lttng_strerror(ret));
                if (lttng_opt_mi) {
@@ -146,6 +147,7 @@ static int setup_rotate(char *session_name, uint64_t timer, uint64_t size)
 error:
        ret = -1;
 end:
+       lttng_rotation_schedule_attr_destroy(attr);
        return ret;
 }