#include <string.h>
#include <unistd.h>
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
#include "liblttsessiondcomm.h"
#include "lttngerr.h"
/* Communication structure to ltt-sessiond */
static struct lttcomm_session_msg lsm;
-static struct lttcomm_lttng_msg llm;
+static struct lttcomm_lttng_header llh;
/* Prototypes */
static int check_tracing_group(const char *grp_name);
-static int ask_sessiond(enum lttcomm_command_type lct, void **buf);
+static int ask_sessiond(enum lttcomm_sessiond_command 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);
*
* Return size of data (only payload, not header).
*/
-static int ask_sessiond(enum lttcomm_command_type lct, void **buf)
+static int ask_sessiond(enum lttcomm_sessiond_command lct, void **buf)
{
int ret;
size_t size;
void *data = NULL;
+ ret = lttng_connect_sessiond();
+ if (ret < 0) {
+ goto end;
+ }
+
lsm.cmd_type = lct;
/* Send command to session daemon */
}
/* Get header from data transmission */
- ret = recv_data_sessiond(&llm, sizeof(llm));
+ ret = recv_data_sessiond(&llh, sizeof(llh));
if (ret < 0) {
goto end;
}
/* Check error code if OK */
- if (llm.ret_code != LTTCOMM_OK) {
- ret = -llm.ret_code;
+ if (llh.ret_code != LTTCOMM_OK) {
+ ret = -llh.ret_code;
goto end;
}
- size = llm.size_payload;
+ size = llh.payload_size;
if (size == 0) {
goto end;
}
ret = size;
end:
- /* Reset lsm data struct */
+ lttng_disconnect_sessiond();
memset(&lsm, 0, sizeof(lsm));
return ret;
}
return lttcomm_get_readable_code(code);
}
+/*
+ * lttng_ust_start_trace
+ *
+ * Request a trace start for pid.
+ */
+int lttng_ust_start_trace(pid_t pid)
+{
+ int ret;
+
+ lsm.pid = pid;
+ ret = ask_sessiond(UST_START_TRACE, NULL);
+
+ return ret;
+}
+
+/*
+ * lttng_ust_stop_trace
+ *
+ * Request a trace stop for pid.
+ */
+int lttng_ust_stop_trace(pid_t pid)
+{
+ int ret;
+
+ lsm.pid = pid;
+ ret = ask_sessiond(UST_STOP_TRACE, NULL);
+
+ return ret;
+}
+
/*
* lttng_ust_create_trace
*
return ret / sizeof(pid_t);
}
+/*
+ * lttng_list_traces
+ *
+ * Ask the session daemon for all traces (kernel and ust)
+ * for the session identified by uuid.
+ *
+ * Return the number of traces.
+ */
+int lttng_list_traces(uuid_t *uuid, struct lttng_trace **traces)
+{
+ int ret;
+
+ uuid_copy(lsm.session_id, *uuid);
+
+ ret = ask_sessiond(LTTNG_LIST_TRACES, (void **) traces);
+ if (ret < 0) {
+ return ret;
+ }
+
+ return ret / sizeof(struct lttng_trace);
+}
+
/*
* lttng_create_session
*
goto end;
}
- uuid_copy(*session_id, llm.session_id);
+ uuid_copy(*session_id, llh.session_id);
end:
return ret;
*
* Set the session uuid for current lsm.
*/
-void lttng_set_current_session_uuid(char *uuid)
+void lttng_set_current_session_uuid(uuid_t *uuid)
{
- uuid_parse(uuid, lsm.session_id);
+ uuid_copy(lsm.session_id, *uuid);
}
/*