static char sessiond_sock_path[PATH_MAX];
/* Communication structure to ltt-sessiond */
-static struct lttcomm_lttng_msg llm;
static struct lttcomm_session_msg lsm;
+static struct lttcomm_lttng_msg llm;
/* Prototypes */
static int check_tracing_group(const char *grp_name);
-static int ask_sessiond(void);
+static int ask_sessiond(enum lttcomm_command_type lct, void **buf);
+static int recv_data_sessiond(void *buf, size_t len);
+static int send_data_sessiond(void);
static int set_session_daemon_path(void);
-static void reset_data_struct(void);
-
-int lttng_connect_sessiond(void);
-int lttng_create_session(const char *name, char *session_id);
-int lttng_check_session_daemon(void);
/* Variables */
static char *tracing_group;
static int connected;
/*
- * ask_sessiond
+ * send_data_sessiond
*
- * Send lttcomm_session_msg to the daemon and wait
- * for the reply. Data replied will be put in llm
+ * Send lttcomm_session_msg to the session daemon.
*
* On success, return 0
* On error, return error code
*/
-static int ask_sessiond(void)
+static int send_data_sessiond(void)
{
int ret;
if (!connected) {
- ret = -ECONNREFUSED;
- goto error;
+ ret = -ENOTCONN;
+ goto end;
}
ret = lttcomm_send_unix_sock(sessiond_socket, &lsm, sizeof(lsm));
+
+end:
+ return ret;
+}
+
+/*
+ * recv_data_sessiond
+ *
+ * Receive data from the sessiond socket.
+ *
+ * On success, return 0
+ * On error, return recv() error code
+ */
+static int recv_data_sessiond(void *buf, size_t len)
+{
+ int ret;
+
+ if (!connected) {
+ ret = -ENOTCONN;
+ goto end;
+ }
+
+ ret = lttcomm_recv_unix_sock(sessiond_socket, buf, len);
+ if (ret < 0) {
+ goto end;
+ }
+
+end:
+ return ret;
+}
+
+/*
+ * ask_sessiond
+ *
+ * Ask the session daemon a specific command
+ * and put the data into buf.
+ *
+ * Return size of data (only payload, not header).
+ */
+static int ask_sessiond(enum lttcomm_command_type lct, void **buf)
+{
+ int ret;
+ size_t size;
+ void *data = NULL;
+
+ lsm.cmd_type = lct;
+
+ /* Send command to session daemon */
+ ret = send_data_sessiond();
if (ret < 0) {
- goto error;
+ goto end;
}
- ret = lttcomm_recv_unix_sock(sessiond_socket, &llm, sizeof(llm));
+ /* Get header from data transmission */
+ ret = recv_data_sessiond(&llm, sizeof(llm));
if (ret < 0) {
- goto error;
+ goto end;
}
- /* Check return code */
+ /* Check error code if OK */
if (llm.ret_code != LTTCOMM_OK) {
ret = -llm.ret_code;
- goto error;
+ goto end;
}
- return 0;
+ size = llm.size_payload;
+ if (size == 0) {
+ goto end;
+ }
-error:
+ data = (void*) malloc(size);
+
+ /* Get payload data */
+ ret = recv_data_sessiond(data, size);
+ if (ret < 0) {
+ goto end;
+ }
+
+ *buf = data;
+ ret = size;
+
+end:
+ /* Reset lsm data struct */
+ memset(&lsm, 0, sizeof(lsm));
return ret;
}
}
/*
- * lttng_create_session
+ * lttng_ust_create_trace
*
- * Create a tracing session using "name" to the session daemon.
- * If no name is given, the auto session creation is set and
- * the daemon will take care of finding a name.
+ * Request a trace creation for pid.
+ */
+int lttng_ust_create_trace(pid_t pid)
+{
+ int ret;
+
+ lsm.pid = pid;
+ ret = ask_sessiond(UST_CREATE_TRACE, NULL);
+
+ return ret;
+}
+
+/*
+ * lttng_ust_list_apps
+ *
+ * Ask the session daemon for all UST traceable
+ * applications.
*
- * On success, return 0 and session_id point to the uuid str.
- * On error, negative value is returned.
+ * Return the number of pids.
+ * On error, return negative value.
*/
-int lttng_create_session(const char *name, char *session_id)
+int lttng_ust_list_apps(pid_t **pids)
{
int ret;
- lsm.cmd_type = LTTNG_CREATE_SESSION;
- if (name == NULL) {
- lsm.u.create_session.auto_session = 1;
- } else {
- strncpy(lsm.session_name, name, strlen(name));
- lsm.u.create_session.auto_session = 0;
+ ret = ask_sessiond(UST_LIST_APPS, (void**) pids);
+ if (ret < 0) {
+ return ret;
}
- /* Ask the session daemon */
- ret = ask_sessiond();
+ return ret / sizeof(pid_t);
+}
+
+/*
+ * lttng_create_session
+ *
+ * Create a brand new session using name. Allocate
+ * the session_id param pointing to the UUID.
+ */
+int lttng_create_session(char *name, uuid_t *session_id)
+{
+ int ret;
+
+ strncpy(lsm.session_name, name, sizeof(lsm.session_name));
+ lsm.session_name[sizeof(lsm.session_name) - 1] = '\0';
+
+ ret = ask_sessiond(LTTNG_CREATE_SESSION, NULL);
if (ret < 0) {
goto end;
}
- /* Unparse session ID */
- uuid_unparse(llm.session_id, session_id);
+ uuid_copy(*session_id, llm.session_id);
end:
- reset_data_struct();
-
return ret;
}
/*
- * lttng_ust_list_apps
+ * lttng_destroy_session
*
- * Ask the session daemon for all UST traceable
- * applications.
- *
- * Return the size of pids.
+ * Destroy session using name.
*/
-size_t lttng_ust_list_apps(pid_t **pids)
+int lttng_destroy_session(uuid_t *uuid)
{
int ret;
- lsm.cmd_type = UST_LIST_APPS;
+ uuid_copy(lsm.session_id, *uuid);
- ret = ask_sessiond();
+ ret = ask_sessiond(LTTNG_DESTROY_SESSION, NULL);
if (ret < 0) {
- goto error;
+ goto end;
}
- *pids = llm.u.list_apps.pids;
+end:
+ return ret;
+}
- return llm.u.list_apps.size;
+/*
+ * lttng_list_sessions
+ *
+ * Ask the session daemon for all available sessions.
+ *
+ * Return number of session.
+ * On error, return negative value.
+ */
+int lttng_list_sessions(struct lttng_session **sessions)
+{
+ int ret;
-error:
- return ret;
+ ret = ask_sessiond(LTTNG_LIST_SESSIONS, (void**) sessions);
+ if (ret < 0) {
+ return ret;
+ }
+
+ return ret / sizeof(struct lttng_session);
}
/*
return 0;
}
+/*
+ * lttng_disconnect_sessiond
+ *
+ * Clean disconnect the session daemon.
+ */
+int lttng_disconnect_sessiond(void)
+{
+ int ret = 0;
+
+ if (connected) {
+ ret = lttcomm_close_unix_sock(sessiond_socket);
+ sessiond_socket = 0;
+ connected = 0;
+ }
+
+ return ret;
+}
+
+/*
+ * lttng_set_current_session_uuid
+ *
+ * Set the session uuid for current lsm.
+ */
+void lttng_set_current_session_uuid(char *uuid)
+{
+ uuid_parse(uuid, lsm.session_id);
+}
+
/*
* lttng_set_tracing_group
*
return 0;
}
-/*
- * reset_data_struct
- *
- * Reset session daemon structures.
- */
-static void reset_data_struct(void)
-{
- memset(&lsm, 0, sizeof(lsm));
- memset(&llm, 0, sizeof(llm));
-}
-
/*
* set_session_daemon_path
*
projects / lttng-tools.git / blobdiff