X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=ltt-sessiond%2Fmain.c;h=76e927e43a3fa68b938e79a1d3b28549886d0c20;hb=894be886aae0f1a1f49e63723511fcb15e816e7e;hp=418875a2aa453313406f8d0f4b92594c80049bd9;hpb=5b74c7b1ca96399ba5c8bd0ce6974aea671198eb;p=lttng-tools.git diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 418875a2a..76e927e43 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -5,12 +5,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -35,12 +35,21 @@ #include /* URCU list library (-lurcu) */ #include /* UST control lib (-lust) */ -#include +#include #include "liblttsessiondcomm.h" #include "ltt-sessiond.h" #include "lttngerr.h" #include "session.h" +#include "trace.h" +#include "traceable-app.h" + +/* + * TODO: + * teardown: signal SIGTERM handler -> write into pipe. Threads waits + * with epoll on pipe and on other pipes/sockets for commands. Main + * simply waits on pthread join. + */ /* Const values */ const char default_home_dir[] = DEFAULT_HOME_DIR; @@ -49,56 +58,77 @@ const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR; const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE; /* Static functions */ -static int set_signal_handler(void); -static int set_socket_perms(void); -static void sighandler(int sig); -static void cleanup(void); -static void copy_common_data(struct lttcomm_lttng_msg *llm, struct lttcomm_session_msg *lsm); static int check_existing_daemon(void); -static int notify_apps(const char* name); -static int connect_app(pid_t pid); -static int find_app_by_pid(pid_t pid); +static int ust_connect_app(pid_t pid); static int init_daemon_socket(void); -static int process_client_msg(int sock, struct lttcomm_session_msg*); +static int notify_apps(const char* name); +static int process_client_msg(struct command_ctx *cmd_ctx); static int send_unix_sock(int sock, void *buf, size_t len); -static int setup_data_buffer(char **buf, size_t size, struct lttcomm_lttng_msg *llm); -static void add_traceable_app(struct ltt_traceable_app *lta); -static void del_traceable_app(struct ltt_traceable_app *lta); - -/* Command function */ -static void get_list_apps(pid_t *pids); +static int set_signal_handler(void); +static int set_permissions(void); +static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size); +static int create_lttng_rundir(void); +static int set_kconsumerd_sockets(void); +static void cleanup(void); +static void sighandler(int sig); +static void clean_command_ctx(struct command_ctx *cmd_ctx); static void *thread_manage_clients(void *data); static void *thread_manage_apps(void *data); +static void *thread_manage_kconsumerd(void *data); /* Variables */ +int opt_verbose; +int opt_quiet; const char *progname; const char *opt_tracing_group; static int opt_sig_parent; static int opt_daemon; -int opt_verbose; -int opt_quiet; static int is_root; /* Set to 1 if the daemon is running as root */ static pid_t ppid; -static char apps_unix_sock_path[PATH_MAX]; /* Global application Unix socket path */ -static char client_unix_sock_path[PATH_MAX]; /* Global client Unix socket path */ +static char apps_unix_sock_path[PATH_MAX]; /* Global application Unix socket path */ +static char client_unix_sock_path[PATH_MAX]; /* Global client Unix socket path */ +static char kconsumerd_err_unix_sock_path[PATH_MAX]; /* kconsumerd error Unix socket path */ +static char kconsumerd_cmd_unix_sock_path[PATH_MAX]; /* kconsumerd command Unix socket path */ + +static int client_sock; +static int apps_sock; +static int kconsumerd_err_sock; + +/* + * thread_manage_kconsumerd + * + * This thread manage the kconsumerd error sent + * back to the session daemon. + */ +static void *thread_manage_kconsumerd(void *data) +{ + int sock, ret; -static int client_socket; -static int apps_socket; + DBG("[thread] Manage kconsumerd started"); -static struct ltt_session *current_session; + ret = lttcomm_listen_unix_sock(kconsumerd_err_sock); + if (ret < 0) { + goto error; + } -/* Number of element for the list below. */ -static unsigned int traceable_app_count; + sock = lttcomm_accept_unix_sock(kconsumerd_err_sock); + if (sock < 0) { + goto error; + } -/* Init ust traceabl application's list */ -static struct ltt_traceable_app_list ltt_traceable_app_list = { - .head = CDS_LIST_HEAD_INIT(ltt_traceable_app_list.head), -}; + while (1) { + //ret = lttcomm_recv_unix_sock(sock, &lsm, sizeof(lsm)); + if (ret <= 0) { + /* TODO: Consumerd died? */ + continue; + } + } -/* List mutex */ -pthread_mutex_t ltt_traceable_app_list_mutex; +error: + return NULL; +} /* * thread_manage_apps @@ -108,26 +138,31 @@ pthread_mutex_t ltt_traceable_app_list_mutex; static void *thread_manage_apps(void *data) { int sock, ret; - struct ltt_traceable_app *lta; /* TODO: Something more elegant is needed but fine for now */ + /* FIXME: change all types to either uint8_t, uint32_t, uint64_t + * for 32-bit vs 64-bit compat processes. */ + /* replicate in ust with version number */ struct { int reg; /* 1:register, 0:unregister */ pid_t pid; uid_t uid; } reg_msg; - /* Notify all applications to register */ - notify_apps(default_global_apps_pipe); + DBG("[thread] Manage apps started"); - ret = lttcomm_listen_unix_sock(apps_socket); + ret = lttcomm_listen_unix_sock(apps_sock); if (ret < 0) { goto error; } + /* Notify all applications to register */ + notify_apps(default_global_apps_pipe); + while (1) { + DBG("Accepting application registration"); /* Blocking call, waiting for transmission */ - sock = lttcomm_accept_unix_sock(apps_socket); + sock = lttcomm_accept_unix_sock(apps_sock); if (sock < 0) { goto error; } @@ -144,19 +179,16 @@ static void *thread_manage_apps(void *data) /* Add application to the global traceable list */ if (reg_msg.reg == 1) { /* Registering */ - lta = malloc(sizeof(struct ltt_traceable_app)); - lta->pid = reg_msg.pid; - lta->uid = reg_msg.uid; - add_traceable_app(lta); + ret = register_traceable_app(reg_msg.pid, reg_msg.uid); + if (ret < 0) { + /* register_traceable_app only return an error with + * ENOMEM. At this point, we better stop everything. + */ + goto error; + } } else { /* Unregistering */ - cds_list_for_each_entry(lta, <t_traceable_app_list.head, list) { - if (lta->pid == reg_msg.pid && lta->uid == reg_msg.uid) { - del_traceable_app(lta); - free(lta); - break; - } - } + unregister_traceable_app(reg_msg.pid); } } @@ -174,9 +206,11 @@ error: static void *thread_manage_clients(void *data) { int sock, ret; - struct lttcomm_session_msg lsm; + struct command_ctx *cmd_ctx; + + DBG("[thread] Manage client started"); - ret = lttcomm_listen_unix_sock(client_socket); + ret = lttcomm_listen_unix_sock(client_sock); if (ret < 0) { goto error; } @@ -190,68 +224,60 @@ static void *thread_manage_clients(void *data) while (1) { /* Blocking call, waiting for transmission */ - sock = lttcomm_accept_unix_sock(client_socket); + DBG("Accepting client command ..."); + sock = lttcomm_accept_unix_sock(client_sock); if (sock < 0) { goto error; } + /* Allocate context command to process the client request */ + cmd_ctx = malloc(sizeof(struct command_ctx)); + + /* Allocate data buffer for reception */ + cmd_ctx->lsm = malloc(sizeof(struct lttcomm_session_msg)); + cmd_ctx->llm = NULL; + cmd_ctx->session = NULL; + /* * Data is received from the lttng client. The struct - * lttcomm_session_msg (lsm) contains the command and data - * request of the client. + * lttcomm_session_msg (lsm) contains the command and data request of + * the client. */ - ret = lttcomm_recv_unix_sock(sock, &lsm, sizeof(lsm)); + DBG("Receiving data from client ..."); + ret = lttcomm_recv_unix_sock(sock, cmd_ctx->lsm, sizeof(struct lttcomm_session_msg)); if (ret <= 0) { continue; } - /* This function dispatch the work to the LTTng or UST libs - * and then sends back the response to the client. This is needed - * because there might be more then one lttcomm_lttng_msg to - * send out so process_client_msg do both jobs. + /* + * This function dispatch the work to the kernel or userspace tracer + * libs and fill the lttcomm_lttng_msg data structure of all the needed + * informations for the client. The command context struct contains + * everything this function may needs. */ - ret = process_client_msg(sock, &lsm); + ret = process_client_msg(cmd_ctx); if (ret < 0) { + /* TODO: Inform client somehow of the fatal error. At this point, + * ret < 0 means that a malloc failed (ENOMEM). */ /* Error detected but still accept command */ + clean_command_ctx(cmd_ctx); continue; } + + DBG("Sending response (size: %d, retcode: %d)", + cmd_ctx->lttng_msg_size, cmd_ctx->llm->ret_code); + ret = send_unix_sock(sock, cmd_ctx->llm, cmd_ctx->lttng_msg_size); + if (ret < 0) { + ERR("Failed to send data back to client"); + } + + clean_command_ctx(cmd_ctx); } error: return NULL; } -/* - * add_traceable_app - * - * Add a traceable application structure to the global - * list protected by a mutex. - */ -static void add_traceable_app(struct ltt_traceable_app *lta) -{ - pthread_mutex_lock(<t_traceable_app_list_mutex); - cds_list_add(<a->list, <t_traceable_app_list.head); - traceable_app_count++; - pthread_mutex_unlock(<t_traceable_app_list_mutex); -} - -/* - * del_traceable_app - * - * Delete a traceable application structure from the - * global list protected by a mutex. - */ -static void del_traceable_app(struct ltt_traceable_app *lta) -{ - pthread_mutex_lock(<t_traceable_app_list_mutex); - cds_list_del(<a->list); - /* Sanity check */ - if (traceable_app_count != 0) { - traceable_app_count--; - } - pthread_mutex_unlock(<t_traceable_app_list_mutex); -} - /* * send_unix_sock * @@ -270,7 +296,27 @@ static int send_unix_sock(int sock, void *buf, size_t len) } /* - * connect_app + * clean_command_ctx + * + * Free memory of a command context structure. + */ +static void clean_command_ctx(struct command_ctx *cmd_ctx) +{ + DBG("Clean command context structure %p", cmd_ctx); + if (cmd_ctx) { + if (cmd_ctx->llm) { + free(cmd_ctx->llm); + } + if (cmd_ctx->lsm) { + free(cmd_ctx->lsm); + } + free(cmd_ctx); + cmd_ctx = NULL; + } +} + +/* + * ust_connect_app * * Return a socket connected to the libust communication socket * of the application identified by the pid. @@ -278,16 +324,21 @@ static int send_unix_sock(int sock, void *buf, size_t len) * If the pid is not found in the traceable list, * return -1 to indicate error. */ -static int connect_app(pid_t pid) +static int ust_connect_app(pid_t pid) { - int sock, ret; + int sock; + struct ltt_traceable_app *lta; - ret = find_app_by_pid(pid); - if (ret == 0) { + DBG("Connect to application pid %d", pid); + + lta = find_app_by_pid(pid); + if (lta == NULL) { + /* App not found */ + DBG("Application pid %d not found", pid); return -1; } - sock = ustctl_connect_pid(pid); + sock = ustctl_connect_pid(lta->pid); if (sock < 0) { ERR("Fail connecting to the PID %d\n", pid); } @@ -309,6 +360,8 @@ static int notify_apps(const char *name) int fd; int ret = -1; + DBG("Notify the global application pipe"); + /* Try opening the global pipe */ fd = open(name, O_WRONLY); if (fd < 0) { @@ -326,140 +379,45 @@ error: } /* - * find_app_by_pid + * setup_lttng_msg * - * Iterate over the traceable apps list. - * On success, return 1, else return 0 - */ -static int find_app_by_pid(pid_t pid) -{ - struct ltt_traceable_app *iter; - - pthread_mutex_lock(<t_traceable_app_list_mutex); - cds_list_for_each_entry(iter, <t_traceable_app_list.head, list) { - if (iter->pid == pid) { - pthread_mutex_unlock(<t_traceable_app_list_mutex); - /* Found */ - return 1; - } - } - pthread_mutex_unlock(<t_traceable_app_list_mutex); - - return 0; -} - -/* - * ust_create_trace + * Setup the outgoing data buffer for the response (llm) by allocating the + * right amount of memory and copying the original information from the lsm + * structure. * - * Create an userspace trace using pid. - * This trace is then appended to the current session - * ust trace list. + * Return total size of the buffer pointed by buf. */ -static int ust_create_trace(pid_t pid) +static int setup_lttng_msg(struct command_ctx *cmd_ctx, size_t size) { - int sock, ret; - struct ltt_ust_trace *trace; + int ret, buf_size, trace_name_size; - trace = malloc(sizeof(struct ltt_ust_trace)); - if (trace == NULL) { - perror("malloc"); - ret = -1; - goto error; - } - - /* Init */ - trace->pid = pid; - trace->shmid = 0; - - /* Connect to app using ustctl API */ - sock = connect_app(pid); - if (sock < 0) { - ret = LTTCOMM_NO_TRACEABLE; - goto error; - } + /* + * Check for the trace_name. If defined, it's part of the payload data of + * the llm structure. + */ + trace_name_size = strlen(cmd_ctx->lsm->trace_name); + buf_size = trace_name_size + size; - ret = ustctl_create_trace(sock, "auto"); - if (ret < 0) { - ret = LTTCOMM_CREATE_FAIL; + cmd_ctx->llm = malloc(sizeof(struct lttcomm_lttng_msg) + buf_size); + if (cmd_ctx->llm == NULL) { + perror("malloc"); + ret = -ENOMEM; goto error; } - /* Check if current session is valid */ - if (current_session) { - cds_list_add(&trace->list, ¤t_session->ust_traces); - } - -error: - return ret; -} - -/* - * get_list_apps - * - * List traceable user-space application and fill an - * array of pids. - */ -static void get_list_apps(pid_t *pids) -{ - int i = 0; - struct ltt_traceable_app *iter; - - /* Protected by a mutex here because the threads manage_client - * and manage_apps can access this list. - */ - pthread_mutex_lock(<t_traceable_app_list_mutex); - cds_list_for_each_entry(iter, <t_traceable_app_list.head, list) { - pids[i] = iter->pid; - i++; - } - pthread_mutex_unlock(<t_traceable_app_list_mutex); -} - -/* - * copy_common_data - * - * Copy common data between lttcomm_lttng_msg and lttcomm_session_msg - */ -static void copy_common_data(struct lttcomm_lttng_msg *llm, struct lttcomm_session_msg *lsm) -{ - llm->cmd_type = lsm->cmd_type; - llm->pid = lsm->pid; - - /* Manage uuid */ - if (!uuid_is_null(lsm->session_id)) { - uuid_copy(llm->session_id, lsm->session_id); + /* Copy common data */ + cmd_ctx->llm->cmd_type = cmd_ctx->lsm->cmd_type; + cmd_ctx->llm->pid = cmd_ctx->lsm->pid; + if (!uuid_is_null(cmd_ctx->lsm->session_uuid)) { + uuid_copy(cmd_ctx->llm->session_uuid, cmd_ctx->lsm->session_uuid); } - strncpy(llm->trace_name, lsm->trace_name, strlen(llm->trace_name)); - llm->trace_name[strlen(llm->trace_name) - 1] = '\0'; -} + cmd_ctx->llm->trace_name_offset = trace_name_size; + cmd_ctx->llm->data_size = size; + cmd_ctx->lttng_msg_size = sizeof(struct lttcomm_lttng_msg) + buf_size; -/* - * setup_data_buffer - * - * Setup the outgoing data buffer for the response - * data allocating the right amount of memory. - * - * Return total size of the buffer pointed by buf. - */ -static int setup_data_buffer(char **buf, size_t s_data, struct lttcomm_lttng_msg *llm) -{ - int ret = 0; - size_t buf_size; - - buf_size = sizeof(struct lttcomm_lttng_msg) + s_data; - *buf = malloc(buf_size); - if (*buf == NULL) { - perror("malloc"); - ret = -1; - goto error; - } - - /* Setup lttcomm_lttng_msg data and copy - * it to the newly allocated buffer. - */ - llm->size_payload = s_data; - memcpy(*buf, llm, sizeof(struct lttcomm_lttng_msg)); + /* Copy trace name to the llm structure. Begining of the payload. */ + memcpy(cmd_ctx->llm->payload, cmd_ctx->lsm->trace_name, trace_name_size); return buf_size; @@ -470,152 +428,227 @@ error: /* * process_client_msg * - * This takes the lttcomm_session_msg struct and process the command requested - * by the client. It then creates response(s) and send it back to the - * given socket (sock). + * Process the command requested by the lttng client within the command + * context structure. This function make sure that the return structure (llm) + * is set and ready for transmission before returning. * * Return any error encountered or 0 for success. */ -static int process_client_msg(int sock, struct lttcomm_session_msg *lsm) +static int process_client_msg(struct command_ctx *cmd_ctx) { int ret; - int buf_size; - size_t header_size; - char *send_buf = NULL; - struct lttcomm_lttng_msg llm; - /* Copy common data to identify the response - * on the lttng client side. - */ - copy_common_data(&llm, lsm); + DBG("Processing client command %d", cmd_ctx->lsm->cmd_type); /* Check command that needs a session */ - if (lsm->cmd_type != LTTNG_CREATE_SESSION && - lsm->cmd_type != LTTNG_LIST_SESSIONS && - lsm->cmd_type != UST_LIST_APPS) - { - current_session = find_session_by_uuid(lsm->session_id); - if (current_session == NULL) { + switch (cmd_ctx->lsm->cmd_type) { + case LTTNG_CREATE_SESSION: + case LTTNG_LIST_SESSIONS: + case UST_LIST_APPS: + break; + default: + cmd_ctx->session = find_session_by_uuid(cmd_ctx->lsm->session_uuid); + if (cmd_ctx->session == NULL) { ret = LTTCOMM_SELECT_SESS; - goto end; + goto error; } + break; } - /* Default return code. - * In our world, everything is OK... right? ;) - */ - llm.ret_code = LTTCOMM_OK; - - header_size = sizeof(struct lttcomm_lttng_msg); + /* Connect to ust apps if available pid */ + if (cmd_ctx->lsm->pid > 0) { + /* Connect to app using ustctl API */ + cmd_ctx->ust_sock = ust_connect_app(cmd_ctx->lsm->pid); + if (cmd_ctx->ust_sock < 0) { + ret = LTTCOMM_NO_TRACEABLE; + goto error; + } + } /* Process by command type */ - switch (lsm->cmd_type) { - case LTTNG_CREATE_SESSION: - { - ret = create_session(lsm->session_name, &llm.session_id); - if (ret < 0) { - if (ret == -1) { - ret = LTTCOMM_EXIST_SESS; - } else { - ret = LTTCOMM_FATAL; - } - goto end; - } + switch (cmd_ctx->lsm->cmd_type) { + case KERNEL_ENABLE_EVENT: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } - buf_size = setup_data_buffer(&send_buf, 0, &llm); - if (buf_size < 0) { - ret = LTTCOMM_FATAL; - goto end; - } + DBG("Enabling kernel event %s", cmd_ctx->lsm->u.event.event_name); - break; + ret = LTTCOMM_OK; + break; + } + case LTTNG_CREATE_SESSION: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; } - case LTTNG_DESTROY_SESSION: - { - ret = destroy_session(&lsm->session_id); - if (ret < 0) { - ret = LTTCOMM_NO_SESS; + + ret = create_session(cmd_ctx->lsm->session_name, &cmd_ctx->llm->session_uuid); + if (ret < 0) { + if (ret == -1) { + ret = LTTCOMM_EXIST_SESS; } else { - ret = LTTCOMM_OK; + ret = LTTCOMM_FATAL; } + goto error; + } - /* No auxiliary data so only send the llm struct. */ - goto end; + ret = LTTCOMM_OK; + break; + } + case LTTNG_DESTROY_SESSION: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; } - case UST_CREATE_TRACE: - { - ret = ust_create_trace(lsm->pid); - if (ret < 0) { - ret = LTTCOMM_CREATE_FAIL; - goto end; - } - /* No auxiliary data so only send the llm struct. */ - goto end; + ret = destroy_session(&cmd_ctx->lsm->session_uuid); + if (ret < 0) { + ret = LTTCOMM_NO_SESS; + goto error; } - case UST_LIST_APPS: - { - /* Stop right now if no apps */ - if (traceable_app_count == 0) { - ret = LTTCOMM_NO_APPS; - goto end; - } - /* Setup data buffer and details for transmission */ - buf_size = setup_data_buffer(&send_buf, - sizeof(pid_t) * traceable_app_count, &llm); - if (buf_size < 0) { - ret = LTTCOMM_FATAL; - goto end; - } + ret = LTTCOMM_OK; + break; + } + case LTTNG_LIST_TRACES: + { + unsigned int trace_count; - get_list_apps((pid_t *)(send_buf + header_size)); + trace_count = get_trace_count_per_session(cmd_ctx->session); + if (trace_count == 0) { + ret = LTTCOMM_NO_TRACE; + goto error; + } - break; + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_trace) * trace_count); + if (ret < 0) { + goto setup_error; } - case LTTNG_LIST_SESSIONS: - { - unsigned int session_count = get_session_count(); - /* Stop right now if no session */ - if (session_count == 0) { - ret = LTTCOMM_NO_SESS; - goto end; - } - /* Setup data buffer and details for transmission */ - buf_size = setup_data_buffer(&send_buf, - (sizeof(struct lttng_session) * session_count), &llm); - if (buf_size < 0) { - ret = LTTCOMM_FATAL; - goto end; - } + get_traces_per_session(cmd_ctx->session, + (struct lttng_trace *)(cmd_ctx->llm->payload)); - get_lttng_session((struct lttng_session *)(send_buf + header_size)); + ret = LTTCOMM_OK; + break; + } + case UST_CREATE_TRACE: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } - break; + ret = ust_create_trace(cmd_ctx); + if (ret < 0) { + goto setup_error; } - default: - { - /* Undefined command */ - ret = LTTCOMM_UND; - goto end; + break; + } + case UST_LIST_APPS: + { + unsigned int app_count; + + app_count = get_app_count(); + DBG("Traceable application count : %d", app_count); + if (app_count == 0) { + ret = LTTCOMM_NO_APPS; + goto error; + } + + ret = setup_lttng_msg(cmd_ctx, sizeof(pid_t) * app_count); + if (ret < 0) { + goto setup_error; } + + get_app_list_pids((pid_t *)(cmd_ctx->llm->payload)); + + ret = LTTCOMM_OK; + break; } + case UST_START_TRACE: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } - ret = send_unix_sock(sock, send_buf, buf_size); + ret = ust_start_trace(cmd_ctx); + if (ret < 0) { + goto setup_error; + } + break; + } + case UST_STOP_TRACE: + { + /* Setup lttng message with no payload */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } - if (send_buf != NULL) { - free(send_buf); + ret = ust_stop_trace(cmd_ctx); + if (ret < 0) { + goto setup_error; + } + break; } + case LTTNG_LIST_SESSIONS: + { + unsigned int session_count; + + session_count = get_session_count(); + if (session_count == 0) { + ret = LTTCOMM_NO_SESS; + goto error; + } + + ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * session_count); + if (ret < 0) { + goto setup_error; + } + + get_lttng_session((struct lttng_session *)(cmd_ctx->llm->payload)); + + ret = LTTCOMM_OK; + break; + } + default: + /* Undefined command */ + ret = setup_lttng_msg(cmd_ctx, 0); + if (ret < 0) { + goto setup_error; + } + + ret = LTTCOMM_UND; + break; + } + + /* Set return code */ + cmd_ctx->llm->ret_code = ret; return ret; -end: +error: + if (cmd_ctx->llm == NULL) { + DBG("Missing llm structure. Allocating one."); + if (setup_lttng_msg(cmd_ctx, 0) < 0) { + goto setup_error; + } + } /* Notify client of error */ - llm.ret_code = ret; - llm.size_payload = 0; - send_unix_sock(sock, (void*) &llm, sizeof(llm)); + cmd_ctx->llm->ret_code = ret; +setup_error: return ret; } @@ -625,14 +658,17 @@ end: static void usage(void) { fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname); - fprintf(stderr, " -h, --help Display this usage.\n"); - fprintf(stderr, " -c, --client-sock PATH Specify path for the client unix socket\n"); - fprintf(stderr, " -a, --apps-sock PATH Specify path for apps unix socket.\n"); - fprintf(stderr, " -d, --daemonize Start as a daemon.\n"); - fprintf(stderr, " -g, --group NAME Specify the tracing group name. (default: tracing)\n"); - fprintf(stderr, " -V, --version Show version number.\n"); - fprintf(stderr, " -S, --sig-parent Send SIGCHLD to parent pid to notify readiness.\n"); - fprintf(stderr, " -q, --quiet No output at all.\n"); + fprintf(stderr, " -h, --help Display this usage.\n"); + fprintf(stderr, " -c, --client-sock PATH Specify path for the client unix socket\n"); + fprintf(stderr, " -a, --apps-sock PATH Specify path for apps unix socket\n"); + fprintf(stderr, " --kconsumerd-err-sock PATH Specify path for the kernel consumer error socket\n"); + fprintf(stderr, " --kconsumerd-cmd-sock PATH Specify path for the kernel consumer command socket\n"); + fprintf(stderr, " -d, --daemonize Start as a daemon.\n"); + fprintf(stderr, " -g, --group NAME Specify the tracing group name. (default: tracing)\n"); + fprintf(stderr, " -V, --version Show version number.\n"); + fprintf(stderr, " -S, --sig-parent Send SIGCHLD to parent pid to notify readiness.\n"); + fprintf(stderr, " -q, --quiet No output at all.\n"); + fprintf(stderr, " -v, --verbose Verbose mode. Activate DBG() macro.\n"); } /* @@ -645,18 +681,21 @@ static int parse_args(int argc, char **argv) static struct option long_options[] = { { "client-sock", 1, 0, 'c' }, { "apps-sock", 1, 0, 'a' }, + { "kconsumerd-cmd-sock", 1, 0, 0 }, + { "kconsumerd-err-sock", 1, 0, 0 }, { "daemonize", 0, 0, 'd' }, { "sig-parent", 0, 0, 'S' }, { "help", 0, 0, 'h' }, { "group", 1, 0, 'g' }, { "version", 0, 0, 'V' }, { "quiet", 0, 0, 'q' }, + { "verbose", 0, 0, 'v' }, { NULL, 0, 0, 0 } }; while (1) { int option_index = 0; - c = getopt_long(argc, argv, "dhqVS" "a:c:g:s:", long_options, &option_index); + c = getopt_long(argc, argv, "dhqvVS" "a:c:g:s:E:C:", long_options, &option_index); if (c == -1) { break; } @@ -689,9 +728,18 @@ static int parse_args(int argc, char **argv) case 'S': opt_sig_parent = 1; break; + case 'E': + snprintf(kconsumerd_err_unix_sock_path, PATH_MAX, "%s", optarg); + break; + case 'C': + snprintf(kconsumerd_cmd_unix_sock_path, PATH_MAX, "%s", optarg); + break; case 'q': opt_quiet = 1; break; + case 'v': + opt_verbose = 1; + break; default: /* Unknown option or other error. * Error is printed by getopt, just return */ @@ -706,8 +754,8 @@ static int parse_args(int argc, char **argv) * init_daemon_socket * * Creates the two needed socket by the daemon. - * apps_socket - The communication socket for all UST apps. - * client_socket - The communication of the cli tool (lttng). + * apps_sock - The communication socket for all UST apps. + * client_sock - The communication of the cli tool (lttng). */ static int init_daemon_socket() { @@ -717,8 +765,9 @@ static int init_daemon_socket() old_umask = umask(0); /* Create client tool unix socket */ - client_socket = lttcomm_create_unix_sock(client_unix_sock_path); - if (client_socket < 0) { + client_sock = lttcomm_create_unix_sock(client_unix_sock_path); + if (client_sock < 0) { + ERR("Create unix sock failed: %s", client_unix_sock_path); ret = -1; goto end; } @@ -726,20 +775,23 @@ static int init_daemon_socket() /* File permission MUST be 660 */ ret = chmod(client_unix_sock_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); if (ret < 0) { + ERR("Set file permissions failed: %s", client_unix_sock_path); perror("chmod"); goto end; } /* Create the application unix socket */ - apps_socket = lttcomm_create_unix_sock(apps_unix_sock_path); - if (apps_socket < 0) { + apps_sock = lttcomm_create_unix_sock(apps_unix_sock_path); + if (apps_sock < 0) { + ERR("Create unix sock failed: %s", apps_unix_sock_path); ret = -1; goto end; } - /* File permission MUST be 660 */ + /* File permission MUST be 666 */ ret = chmod(apps_unix_sock_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); if (ret < 0) { + ERR("Set file permissions failed: %s", apps_unix_sock_path); perror("chmod"); goto end; } @@ -753,7 +805,7 @@ end: * check_existing_daemon * * Check if the global socket is available. - * If yes, error is returned. + * If yes, error is returned. */ static int check_existing_daemon() { @@ -768,12 +820,12 @@ static int check_existing_daemon() } /* - * get_home_dir + * get_home_dir * - * Return pointer to home directory path using - * the env variable HOME. + * Return pointer to home directory path using + * the env variable HOME. * - * Default : /tmp + * Default : /tmp */ static const char *get_home_dir(void) { @@ -787,11 +839,14 @@ static const char *get_home_dir(void) } /* - * set_socket_perms + * set_permissions + * + * Set the tracing group gid onto the client socket. * - * Set the tracing group gid onto the client socket. + * Race window between mkdir and chown is OK because we are going from + * less permissive (root.root) to more permissive (root.tracing). */ -static int set_socket_perms(void) +static int set_permissions(void) { int ret; struct group *grp; @@ -807,19 +862,101 @@ static int set_socket_perms(void) goto end; } + /* Set lttng run dir */ + ret = chown(LTTNG_RUNDIR, 0, grp->gr_gid); + if (ret < 0) { + ERR("Unable to set group on " LTTNG_RUNDIR); + perror("chown"); + } + + /* lttng client socket path */ ret = chown(client_unix_sock_path, 0, grp->gr_gid); if (ret < 0) { + ERR("Unable to set group on %s", client_unix_sock_path); + perror("chown"); + } + + /* kconsumerd error socket path */ + ret = chown(kconsumerd_err_unix_sock_path, 0, grp->gr_gid); + if (ret < 0) { + ERR("Unable to set group on %s", kconsumerd_err_unix_sock_path); perror("chown"); } + DBG("All permissions are set"); + end: return ret; } /* - * set_signal_handler + * create_lttng_rundir + * + * Create the lttng run directory needed for all + * global sockets and pipe. + */ +static int create_lttng_rundir(void) +{ + int ret; + + ret = mkdir(LTTNG_RUNDIR, S_IRWXU | S_IRWXG ); + if (ret < 0) { + ERR("Unable to create " LTTNG_RUNDIR); + goto error; + } + +error: + return ret; +} + +/* + * set_kconsumerd_sockets + * + * Setup sockets and directory needed by the kconsumerd + * communication with the session daemon. + */ +static int set_kconsumerd_sockets(void) +{ + int ret; + + if (strlen(kconsumerd_err_unix_sock_path) == 0) { + snprintf(kconsumerd_err_unix_sock_path, PATH_MAX, KCONSUMERD_ERR_SOCK_PATH); + } + + if (strlen(kconsumerd_cmd_unix_sock_path) == 0) { + snprintf(kconsumerd_cmd_unix_sock_path, PATH_MAX, KCONSUMERD_CMD_SOCK_PATH); + } + + ret = mkdir(KCONSUMERD_PATH, S_IRWXU | S_IRWXG); + if (ret < 0) { + ERR("Failed to create " KCONSUMERD_PATH); + goto error; + } + + /* Create the kconsumerd error unix socket */ + kconsumerd_err_sock = lttcomm_create_unix_sock(kconsumerd_err_unix_sock_path); + if (kconsumerd_err_sock < 0) { + ERR("Create unix sock failed: %s", kconsumerd_err_unix_sock_path); + ret = -1; + goto error; + } + + /* File permission MUST be 660 */ + ret = chmod(kconsumerd_err_unix_sock_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + if (ret < 0) { + ERR("Set file permissions failed: %s", kconsumerd_err_unix_sock_path); + perror("chmod"); + goto error; + } + +error: + return ret; +} + +/* + * set_signal_handler * - * Setup signal handler for : + * Setup signal handler for : * SIGINT, SIGTERM, SIGPIPE */ static int set_signal_handler(void) @@ -851,21 +988,28 @@ static int set_signal_handler(void) return ret; } + DBG("Signal handler set for SIGTERM, SIGPIPE and SIGINT"); + return ret; } /** - * sighandler + * sighandler * - * Signal handler for the daemon + * Signal handler for the daemon */ static void sighandler(int sig) { switch (sig) { case SIGPIPE: + DBG("SIGPIPE catched"); return; case SIGINT: + DBG("SIGINT catched"); + cleanup(); + break; case SIGTERM: + DBG("SIGTERM catched"); cleanup(); break; default: @@ -876,12 +1020,17 @@ static void sighandler(int sig) } /* - * cleanup + * cleanup * - * Cleanup the daemon on exit + * Cleanup the daemon on exit */ static void cleanup() { + int ret; + char *cmd; + + DBG("Cleaning up"); + /* */ MSG("\n%c[%d;%dm*** assert failed *** ==> %c[%dm", 27,1,31,27,0); MSG("%c[%d;%dmMatthew, BEET driven development works!%c[%dm",27,1,33,27,0); @@ -889,6 +1038,18 @@ static void cleanup() unlink(client_unix_sock_path); unlink(apps_unix_sock_path); + unlink(kconsumerd_err_unix_sock_path); + + ret = asprintf(&cmd, "rm -rf " LTTNG_RUNDIR); + if (ret < 0) { + ERR("asprintf failed. Something is really wrong!"); + } + + /* Remove lttng run directory */ + ret = system(cmd); + if (ret < 0) { + ERR("Unable to clean " LTTNG_RUNDIR); + } } /* @@ -921,50 +1082,63 @@ int main(int argc, char **argv) /* Set all sockets path */ if (is_root) { + ret = create_lttng_rundir(); + if (ret < 0) { + goto error; + } + if (strlen(apps_unix_sock_path) == 0) { - (snprintf(apps_unix_sock_path, PATH_MAX, - DEFAULT_GLOBAL_APPS_UNIX_SOCK)); + snprintf(apps_unix_sock_path, PATH_MAX, + DEFAULT_GLOBAL_APPS_UNIX_SOCK); } if (strlen(client_unix_sock_path) == 0) { - (snprintf(client_unix_sock_path, PATH_MAX, - DEFAULT_GLOBAL_CLIENT_UNIX_SOCK)); + snprintf(client_unix_sock_path, PATH_MAX, + DEFAULT_GLOBAL_CLIENT_UNIX_SOCK); + } + + ret = set_kconsumerd_sockets(); + if (ret < 0) { + goto error; } } else { if (strlen(apps_unix_sock_path) == 0) { - (snprintf(apps_unix_sock_path, PATH_MAX, - DEFAULT_HOME_APPS_UNIX_SOCK, get_home_dir())); + snprintf(apps_unix_sock_path, PATH_MAX, + DEFAULT_HOME_APPS_UNIX_SOCK, get_home_dir()); } /* Set the cli tool unix socket path */ if (strlen(client_unix_sock_path) == 0) { - (snprintf(client_unix_sock_path, PATH_MAX, - DEFAULT_HOME_CLIENT_UNIX_SOCK, get_home_dir())); + snprintf(client_unix_sock_path, PATH_MAX, + DEFAULT_HOME_CLIENT_UNIX_SOCK, get_home_dir()); } } + DBG("Client socket path %s", client_unix_sock_path); + DBG("Application socket path %s", apps_unix_sock_path); + /* See if daemon already exist. If any of the two * socket needed by the daemon are present, this test fails */ if ((ret = check_existing_daemon()) == 0) { ERR("Already running daemon.\n"); /* We do not goto error because we must not - * cleanup() because a daemon is already working. + * cleanup() because a daemon is already running. */ - return EXIT_FAILURE; + exit(EXIT_FAILURE); } if (set_signal_handler() < 0) { goto error; } - /* Setup the two needed unix socket */ + /* Setup the needed unix socket */ if (init_daemon_socket() < 0) { goto error; } /* Set credentials to socket */ - if (is_root && (set_socket_perms() < 0)) { + if (is_root && (set_permissions() < 0)) { goto error; } @@ -998,10 +1172,9 @@ int main(int argc, char **argv) } cleanup(); - return 0; + exit(EXIT_SUCCESS); error: cleanup(); - - return EXIT_FAILURE; + exit(EXIT_FAILURE); }