Fix UST renaming and update ust headers

[lttng-tools.git] / ltt-sessiond / ust-ctl.c

diff --git a/ltt-sessiond/ust-ctl.c b/ltt-sessiond/ust-ctl.c
index 5f4e8a9fcefe09dda5fecef4335de708b35b85a2..6f73bfc6659237c97e93c0729abb7422d48d65e0 100644 (file)
--- a/ltt-sessiond/ust-ctl.c
+++ b/ltt-sessiond/ust-ctl.c
@@ -27,6 +27,43 @@
 
 #include "ust-comm.h"
 #include "ust-ctl.h"
+#include "../hashtable/hash.h"
+
+/*
+ * Init command for tracer with cmd type and correct handle.
+ */
+static void init_command(int cmd, int handle, struct lttcomm_ust_msg *command)
+{
+       memset(command, 0, sizeof(struct lttcomm_ust_msg));
+
+       command->cmd = cmd;
+       command->handle = handle;
+}
+
+/*
+ * Generic send command to ust tracer. Caller must free reply.
+ */
+static struct lttcomm_ust_reply *send_command(int sock,
+               struct lttcomm_ust_msg *command)
+{
+       struct lttcomm_ust_reply *reply;
+
+       reply = ustcomm_send_command(sock, command);
+       if (reply == NULL) {
+               goto error;
+       }
+
+       if (reply->ret_code != LTTCOMM_OK) {
+               ERR("Return code (%d): %s", reply->ret_code,
+                               lttcomm_get_readable_code(reply->ret_code));
+               goto error;
+       }
+
+       return reply;
+
+error:
+       return NULL;
+}
 
 /*
  * Send registration done packet to the application.
@@ -59,32 +96,131 @@ error:
 
 /*
  * Create an UST session on the tracer.
+ *
+ * Return handle if success else negative value.
  */
-int ustctl_create_session(struct ltt_ust_session *session)
+int ustctl_create_session(int sock, struct ltt_ust_session *session)
 {
+       int ret;
        struct lttcomm_ust_msg command;
-       struct lttcomm_ust_reply *reply;
-
-       DBG("Creating UST session for app pid:%d", session->app->pid);
+       struct lttcomm_ust_reply *reply = NULL;
 
        command.cmd = LTTNG_UST_SESSION;
        command.handle = LTTNG_UST_ROOT_HANDLE;
 
-       reply = ustcomm_send_command(session->app->sock, &command);
+       reply = ustcomm_send_command(sock, &command);
        if (reply == NULL) {
                goto error;
        }
 
-       if (reply->ret_code != LTTCOMM_OK) {
-               DBG("Return code: %s", lttcomm_get_readable_code(reply->ret_code));
+       /* Save session handle */
+       ret = reply->ret_val;
+       free(reply);
+
+       DBG2("ustctl create session command successful with handle %d", ret);
+
+       return ret;
+
+error:
+       free(reply);
+       return -1;
+}
+
+/*
+ * Create UST channel to the tracer.
+ *
+ * Return handle if success else negative value.
+ */
+int ustctl_create_channel(int sock, struct ltt_ust_session *session,
+               struct lttng_ust_channel *channel)
+{
+       int ret;
+       struct lttcomm_ust_msg command;
+       struct lttcomm_ust_reply *reply = NULL;
+
+       init_command(LTTNG_UST_CHANNEL, session->handle, &command);
+       /* Copy channel attributes to command */
+       memcpy(&command.u.channel, channel, sizeof(command.u.channel));
+
+       /* Send command to tracer */
+       reply = send_command(sock, &command);
+       if (reply == NULL) {
                goto error;
        }
 
-       /* Save session handle */
-       session->handle = reply->handle;
+       ret = reply->ret_val;
+       free(reply);
+
+       return ret;
+
+error:
+       free(reply);
+       return -1;
+}
+
+/*
+ * Enable UST channel.
+ */
+int ustctl_enable_channel(int sock, struct ltt_ust_session *session,
+               struct ltt_ust_channel *chan)
+{
+       struct lttcomm_ust_msg command;
+       struct lttcomm_ust_reply *reply = NULL;
+
+       init_command(LTTNG_UST_ENABLE, chan->handle, &command);
+
+       reply = ustcomm_send_command(sock, &command);
+       if (reply == NULL) {
+               goto error;
+       }
+
+       if (reply->handle != chan->handle) {
+               ERR("Receive wrong handle from UST reply on enable channel");
+               goto error;
+       }
+
+       chan->enabled = 1;
+       free(reply);
+
+       DBG2("ustctl enable channel successful for sock %d", sock);
+       return 0;
+
+error:
+       free(reply);
+       return -1;
+}
+
+/*
+ * Disable UST channel.
+ */
+int ustctl_disable_channel(int sock, struct ltt_ust_session *session,
+               struct ltt_ust_channel *chan)
+{
+       struct lttcomm_ust_msg command;
+       struct lttcomm_ust_reply *reply = NULL;
+
+       memset(&command, 0, sizeof(command));
+
+       command.cmd = LTTNG_UST_DISABLE;
+       command.handle = chan->handle;
+
+       reply = ustcomm_send_command(sock, &command);
+       if (reply == NULL) {
+               goto error;
+       }
+
+       if (reply->handle != chan->handle) {
+               ERR("Receive wrong handle from UST reply on enable channel");
+               goto error;
+       }
+
+       chan->enabled = 1;
+       free(reply);
 
+       DBG2("ustctl disable channel successful for sock %d", sock);
        return 0;
 
 error:
+       free(reply);
        return -1;
 }