X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=liblttngctl%2Fliblttngctl.c;h=bd7dcb0c5b6f87cd146a8ceb2c5e064892a621ee;hp=2b4b8febc082b81c5daa3d708dac6b1c9aa9e519;hb=1fd70b72ff7f1c98e4629392236d76ca9083295f;hpb=826d496db7f18f2ae1f7e0d2f4fc381144ed04a4 diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c index 2b4b8febc..bd7dcb0c5 100644 --- a/liblttngctl/liblttngctl.c +++ b/liblttngctl/liblttngctl.c @@ -34,60 +34,122 @@ static int sessiond_socket; 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 error; + 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 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; + } + + data = (void*) malloc(size); + + /* Get payload data */ + ret = recv_data_sessiond(data, size); + if (ret < 0) { + goto end; + } -error: + *buf = data; + ret = size; + +end: + /* Reset lsm data struct */ + memset(&lsm, 0, sizeof(lsm)); return ret; } @@ -106,67 +168,72 @@ const char *lttng_get_readable_code(int code) } /* - * lttng_create_session + * lttng_ust_list_apps * - * 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. + * 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, char **session_id) +{ + int ret; + char *uuid; + + strncpy(lsm.session_name, name, sizeof(lsm.session_name)); + + ret = ask_sessiond(LTTNG_CREATE_SESSION, NULL); if (ret < 0) { goto end; } - /* Unparse session ID */ - uuid_unparse(llm.session_id, session_id); + /* Allocate UUID string length */ + uuid = malloc(UUID_STR_LEN); -end: - reset_data_struct(); + strncpy(uuid, llm.session_id, UUID_STR_LEN); + *session_id = uuid; +end: return ret; } /* - * lttng_ust_list_apps + * lttng_list_sessions * - * Ask the session daemon for all UST traceable - * applications. + * Ask the session daemon for all available sessions. * - * Return the size of pids. + * Return number of session. + * On error, return negative value. */ -size_t lttng_ust_list_apps(pid_t **pids) +int lttng_list_sessions(struct lttng_session **sessions) { int ret; - lsm.cmd_type = UST_LIST_APPS; - - ret = ask_sessiond(); + ret = ask_sessiond(LTTNG_LIST_SESSIONS, (void**) sessions); if (ret < 0) { - goto error; + return ret; } - *pids = llm.u.list_apps.pids; - - return llm.u.list_apps.size; - -error: - return ret; + return ret / sizeof(struct lttng_session); } /* @@ -236,17 +303,6 @@ int lttng_check_session_daemon(void) 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 *