/* Communication structure to ltt-sessiond */
static struct lttcomm_session_msg lsm;
-static struct lttcomm_lttng_header llh;
+static struct lttcomm_lttng_msg llm;
/* Prototypes */
static int check_tracing_group(const char *grp_name);
}
/* Get header from data transmission */
- ret = recv_data_sessiond(&llh, sizeof(llh));
+ ret = recv_data_sessiond(&llm, sizeof(llm));
if (ret < 0) {
goto end;
}
/* Check error code if OK */
- if (llh.ret_code != LTTCOMM_OK) {
- ret = -llh.ret_code;
+ if (llm.ret_code != LTTCOMM_OK) {
+ ret = -llm.ret_code;
goto end;
}
- size = llh.payload_size;
+ size = llm.trace_name_offset + llm.data_size;
if (size == 0) {
goto end;
}
end:
lttng_disconnect_sessiond();
- memset(&lsm, 0, sizeof(lsm));
return ret;
}
+/*
+ * BEGIN KERNEL CONTROL
+ */
+
+/*
+ * lttng_kernel_enable_event
+ *
+ * Enable an event in the kernel tracer.
+ */
+int lttng_kernel_enable_event(char *event_name)
+{
+ strncpy(lsm.u.event.event_name, event_name, NAME_MAX);
+ return ask_sessiond(KERNEL_ENABLE_EVENT, NULL);
+}
+
+/*
+ * lttng_kernel_disable_event
+ *
+ * Disable an event in the kernel tracer.
+ */
+int lttng_kernel_disable_event(char *event_name)
+{
+ strncpy(lsm.u.event.event_name, event_name, NAME_MAX);
+ return ask_sessiond(KERNEL_DISABLE_EVENT, NULL);
+}
+
+/*
+ * lttng_kernel_create_session
+ *
+ * Create a session in the kernel tracer.
+ */
+int lttng_kernel_create_session(void)
+{
+ return ask_sessiond(KERNEL_CREATE_SESSION, NULL);
+}
+
+/*
+ * lttng_kernel_create_channel
+ *
+ * Create a channel in the kernel tracer.
+ */
+int lttng_kernel_create_channel(void)
+{
+ return ask_sessiond(KERNEL_CREATE_CHANNEL, NULL);
+}
+
+/*
+ * lttng_kernel_open_metadata
+ *
+ * Open metadata in the kernel tracer.
+ */
+int lttng_kernel_open_metadata(void)
+{
+ return ask_sessiond(KERNEL_OPEN_METADATA, NULL);
+}
+
+/*
+ * lttng_kernel_start_tracing
+ *
+ * Start kernel tracing.
+ */
+int lttng_kernel_start_tracing(void)
+{
+ return ask_sessiond(KERNEL_START_TRACE, NULL);
+}
+
+/*
+ * lttng_kernel_stop_tracing
+ *
+ * Stop kernel tracing.
+ */
+int lttng_kernel_stop_tracing(void)
+{
+ return ask_sessiond(KERNEL_STOP_TRACE, NULL);
+}
+
+/*
+ * END KERNEL CONTROL
+ */
+
/*
* lttng_get_readable_code
*
{
int ret;
- uuid_copy(lsm.session_id, *uuid);
+ uuid_copy(lsm.session_uuid, *uuid);
ret = ask_sessiond(LTTNG_LIST_TRACES, (void **) traces);
if (ret < 0) {
/*
* lttng_create_session
*
- * Create a brand new session using name. Allocate
- * the session_id param pointing to the UUID.
+ * Create a brand new session using name.
*/
-int lttng_create_session(char *name, uuid_t *session_id)
+int lttng_create_session(char *name)
{
int ret;
goto end;
}
- uuid_copy(*session_id, llh.session_id);
-
end:
return ret;
}
{
int ret;
- uuid_copy(lsm.session_id, *uuid);
+ uuid_copy(lsm.session_uuid, *uuid);
ret = ask_sessiond(LTTNG_DESTROY_SESSION, NULL);
if (ret < 0) {
*/
void lttng_set_current_session_uuid(uuid_t *uuid)
{
- uuid_copy(lsm.session_id, *uuid);
+ uuid_copy(lsm.session_uuid, *uuid);
}
/*
/* Are we in the tracing group ? */
ret = check_tracing_group(tracing_group);
- if (ret < 0) {
+ if (ret < 0 && getuid() != 0) {
if (sprintf(sessiond_sock_path, DEFAULT_HOME_CLIENT_UNIX_SOCK,
getenv("HOME")) < 0) {
return -ENOMEM;