Cleanup: sessiond_id is never used by relayd_create_session_2_*

[lttng-tools.git] / src / common / relayd / relayd.c

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 242abbedff15c5c2f079460cb8805dbc567268cd..b4fd35c738af0e24b1a056e2b1545a5653dae239 100644 (file)
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -123,8 +123,8 @@ error:
  * support the live reading capability.
  */
 static int relayd_create_session_2_4(struct lttcomm_relayd_sock *rsock,
-               uint64_t *session_id, char *session_name, char *hostname,
-               int session_live_timer, unsigned int snapshot)
+               char *session_name, char *hostname, int session_live_timer,
+               unsigned int snapshot)
 {
        int ret;
        struct lttcomm_relayd_create_session_2_4 msg;
@@ -154,8 +154,7 @@ error:
 /*
  * RELAYD_CREATE_SESSION from 2.1 to 2.3.
  */
-static int relayd_create_session_2_1(struct lttcomm_relayd_sock *rsock,
-               uint64_t *session_id)
+static int relayd_create_session_2_1(struct lttcomm_relayd_sock *rsock)
 {
        int ret;
 
@@ -192,11 +191,11 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_i
                case 1:
                case 2:
                case 3:
-                       ret = relayd_create_session_2_1(rsock, session_id);
+                       ret = relayd_create_session_2_1(rsock);
                        break;
                case 4:
                default:
-                       ret = relayd_create_session_2_4(rsock, session_id, session_name,
+                       ret = relayd_create_session_2_4(rsock, session_name,
                                        hostname, session_live_timer, snapshot);
                        break;
        }
@@ -1086,6 +1085,56 @@ error:
        return ret;
 }
 
+int relayd_rotate_pending(struct lttcomm_relayd_sock *rsock, uint64_t chunk_id)
+{
+       int ret;
+       struct lttcomm_relayd_rotate_pending msg;
+       struct lttcomm_relayd_rotate_pending_reply reply;
+
+       /* Code flow error. Safety net. */
+       assert(rsock);
+
+       DBG("Querying relayd for rotate pending with chunk_id %" PRIu64,
+                       chunk_id);
+
+       memset(&msg, 0, sizeof(msg));
+       msg.chunk_id = htobe64(chunk_id);
+
+       /* Send command */
+       ret = send_command(rsock, RELAYD_ROTATE_PENDING, (void *) &msg,
+                       sizeof(msg), 0);
+       if (ret < 0) {
+               goto error;
+       }
+
+       /* Receive response */
+       ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+       if (ret < 0) {
+               goto error;
+       }
+
+       reply.generic.ret_code = be32toh(reply.generic.ret_code);
+
+       /* Return session id or negative ret code. */
+       if (reply.generic.ret_code != LTTNG_OK) {
+               ret = -reply.generic.ret_code;
+               ERR("Relayd rotate pending replied with error %d", ret);
+               goto error;
+       } else {
+               /* No error, just rotate pending state */
+               if (reply.is_pending == 0 || reply.is_pending == 1) {
+                       ret = reply.is_pending;
+                       DBG("Relayd rotate pending command completed successfully with result \"%s\"",
+                                       ret ? "rotation pending" : "rotation NOT pending");
+               } else {
+                       ret = -LTTNG_ERR_UNK;
+               }
+       }
+
+error:
+       return ret;
+}
+
 int relayd_mkdir(struct lttcomm_relayd_sock *rsock, const char *path)
 {
        int ret;