rotate timer ready, need UI/API

[lttng-tools.git] / src / bin / lttng-sessiond / cmd.c

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 38d0dac58f0935c65651621cf80c7cb72f9d146b..c250c654a35df34f9139a74a319fc95b86b2a429 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -4165,10 +4165,12 @@ int cmd_rotate_session(struct ltt_session *session,
 
        assert(session);
 
-       *rotate_return = zmalloc(sizeof(struct lttng_rotate_session_return));
-       if (!*rotate_return) {
-               ret = -ENOMEM;
-               goto end;
+       if (rotate_return) {
+               *rotate_return = zmalloc(sizeof(struct lttng_rotate_session_return));
+               if (!*rotate_return) {
+                       ret = -ENOMEM;
+                       goto end;
+               }
        }
 
        if (session->live_timer || session->snapshot_mode ||
@@ -4255,8 +4257,10 @@ int cmd_rotate_session(struct ltt_session *session,
                }
        }
 
-       (*rotate_return)->rotate_id = session->rotate_count;
-       (*rotate_return)->status = LTTNG_ROTATE_STARTED;
+       if (rotate_return) {
+               (*rotate_return)->rotate_id = session->rotate_count;
+               (*rotate_return)->status = LTTNG_ROTATE_STARTED;
+       }
 
        DBG("Cmd rotate session %s, rotate_id %" PRIu64, session->name,
                        session->rotate_count);
@@ -4265,7 +4269,9 @@ int cmd_rotate_session(struct ltt_session *session,
        goto end;
 
 error:
-       (*rotate_return)->status = LTTNG_ROTATE_ERROR;
+       if (rotate_return) {
+               (*rotate_return)->status = LTTNG_ROTATE_ERROR;
+       }
 end:
        return ret;
 }