X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=0efc1591510fbff0b1eebf8f4e0bd313166204a6;hb=d74df4226a1b4461c896d51a221afe38e07809a7;hp=c9693f711f5140f26f63c2b34fa99bb578ca321c;hpb=da3c9ec137aaec74635ca1f5584040c20b1d3d7b;p=lttng-tools.git diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c index c9693f711..0efc15915 100644 --- a/src/lib/lttng-ctl/lttng-ctl.c +++ b/src/lib/lttng-ctl/lttng-ctl.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "filter/filter-ast.h" #include "filter/filter-parser.h" @@ -574,6 +575,7 @@ static int _lttng_stop_tracing(const char *session_name, int wait) } _MSG("Waiting for data availability"); + fflush(stdout); /* Check for data availability */ do { @@ -591,6 +593,7 @@ static int _lttng_stop_tracing(const char *session_name, int wait) if (data_ret) { usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME); _MSG("."); + fflush(stdout); } } while (data_ret != 0); @@ -640,9 +643,14 @@ int lttng_add_context(struct lttng_handle *handle, lsm.cmd_type = LTTNG_ADD_CONTEXT; - /* Copy channel name */ - lttng_ctl_copy_string(lsm.u.context.channel_name, channel_name, - sizeof(lsm.u.context.channel_name)); + /* If no channel name, send empty string. */ + if (channel_name == NULL) { + lttng_ctl_copy_string(lsm.u.context.channel_name, "", + sizeof(lsm.u.context.channel_name)); + } else { + lttng_ctl_copy_string(lsm.u.context.channel_name, channel_name, + sizeof(lsm.u.context.channel_name)); + } lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain); @@ -671,9 +679,9 @@ int lttng_enable_event(struct lttng_handle *handle, memset(&lsm, 0, sizeof(lsm)); - /* If no channel name, we put the default name */ + /* If no channel name, send empty string. */ if (channel_name == NULL) { - lttng_ctl_copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME, + lttng_ctl_copy_string(lsm.u.enable.channel_name, "", sizeof(lsm.u.enable.channel_name)); } else { lttng_ctl_copy_string(lsm.u.enable.channel_name, channel_name, @@ -800,9 +808,15 @@ int lttng_enable_event_with_filter(struct lttng_handle *handle, lsm.cmd_type = LTTNG_ENABLE_EVENT_WITH_FILTER; - /* Copy channel name */ - lttng_ctl_copy_string(lsm.u.enable.channel_name, channel_name, - sizeof(lsm.u.enable.channel_name)); + /* If no channel name, send empty string. */ + if (channel_name == NULL) { + lttng_ctl_copy_string(lsm.u.enable.channel_name, "", + sizeof(lsm.u.enable.channel_name)); + } else { + lttng_ctl_copy_string(lsm.u.enable.channel_name, channel_name, + sizeof(lsm.u.enable.channel_name)); + } + /* Copy event name */ if (event) { memcpy(&lsm.u.enable.event, event, sizeof(lsm.u.enable.event)); @@ -855,11 +869,12 @@ int lttng_disable_event(struct lttng_handle *handle, const char *name, memset(&lsm, 0, sizeof(lsm)); - if (channel_name) { - lttng_ctl_copy_string(lsm.u.disable.channel_name, channel_name, + /* If no channel name, send empty string. */ + if (channel_name == NULL) { + lttng_ctl_copy_string(lsm.u.disable.channel_name, "", sizeof(lsm.u.disable.channel_name)); } else { - lttng_ctl_copy_string(lsm.u.disable.channel_name, DEFAULT_CHANNEL_NAME, + lttng_ctl_copy_string(lsm.u.disable.channel_name, channel_name, sizeof(lsm.u.disable.channel_name)); } @@ -1351,45 +1366,37 @@ int lttng_disable_consumer(struct lttng_handle *handle) * Set health socket path by putting it in the global health_sock_path * variable. * - * Returns 0 on success or assert(0) on ENOMEM. + * Returns 0 on success or -ENOMEM. */ static int set_health_socket_path(void) { - int in_tgroup = 0; /* In tracing group */ uid_t uid; const char *home; + int ret; uid = getuid(); - if (uid != 0) { - /* Are we in the tracing group ? */ - in_tgroup = check_tracing_group(tracing_group); - } - - if ((uid == 0) || in_tgroup) { + if (uid == 0 || check_tracing_group(tracing_group)) { lttng_ctl_copy_string(health_sock_path, DEFAULT_GLOBAL_HEALTH_UNIX_SOCK, sizeof(health_sock_path)); + return 0; } - if (uid != 0) { - int ret; - - /* - * With GNU C < 2.1, snprintf returns -1 if the target buffer is too small; - * With GNU C >= 2.1, snprintf returns the required size (excluding closing null) - */ - home = utils_get_home_dir(); - if (home == NULL) { - /* Fallback in /tmp .. */ - home = "/tmp"; - } + /* + * With GNU C < 2.1, snprintf returns -1 if the target buffer + * is too small; With GNU C >= 2.1, snprintf returns the + * required size (excluding closing null). + */ + home = utils_get_home_dir(); + if (home == NULL) { + /* Fallback in /tmp */ + home = "/tmp"; + } - ret = snprintf(health_sock_path, sizeof(health_sock_path), - DEFAULT_HOME_HEALTH_UNIX_SOCK, home); - if ((ret < 0) || (ret >= sizeof(health_sock_path))) { - /* ENOMEM at this point... just kill the control lib. */ - assert(0); - } + ret = snprintf(health_sock_path, sizeof(health_sock_path), + DEFAULT_HOME_HEALTH_UNIX_SOCK, home); + if ((ret < 0) || (ret >= sizeof(health_sock_path))) { + return -ENOMEM; } return 0; @@ -1406,8 +1413,8 @@ static int set_health_socket_path(void) int lttng_health_check(enum lttng_health_component c) { int sock, ret; - struct lttcomm_health_msg msg; - struct lttcomm_health_data reply; + struct health_comm_msg msg; + struct health_comm_reply reply; /* Connect to the sesssion daemon */ sock = lttcomm_connect_unix_sock(health_sock_path); @@ -1416,7 +1423,7 @@ int lttng_health_check(enum lttng_health_component c) goto error; } - msg.cmd = LTTNG_HEALTH_CHECK; + msg.cmd = HEALTH_CMD_CHECK; msg.component = c; ret = lttcomm_send_unix_sock(sock, (void *)&msg, sizeof(msg)); @@ -1471,7 +1478,7 @@ int _lttng_create_session_ext(const char *name, const char *url, struct lttcomm_session_msg lsm; struct lttng_uri *uris = NULL; - if (name == NULL || datetime == NULL || url == NULL) { + if (name == NULL || datetime == NULL) { return -LTTNG_ERR_INVALID; } @@ -1547,6 +1554,86 @@ int lttng_data_pending(const char *session_name) return ret; } +/* + * Create a session exclusively used for snapshot. + * + * Returns LTTNG_OK on success or a negative error code. + */ +int lttng_create_session_snapshot(const char *name, const char *snapshot_url) +{ + int ret; + ssize_t size; + struct lttcomm_session_msg lsm; + struct lttng_uri *uris = NULL; + + if (name == NULL) { + return -LTTNG_ERR_INVALID; + } + + memset(&lsm, 0, sizeof(lsm)); + + lsm.cmd_type = LTTNG_CREATE_SESSION_SNAPSHOT; + lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name)); + + size = uri_parse_str_urls(snapshot_url, NULL, &uris); + if (size < 0) { + return -LTTNG_ERR_INVALID; + } + + lsm.u.uri.size = size; + + ret = lttng_ctl_ask_sessiond_varlen(&lsm, uris, + sizeof(struct lttng_uri) * size, NULL); + + free(uris); + return ret; +} + +/* + * Create a session exclusively used for live. + * + * Returns LTTNG_OK on success or a negative error code. + */ +int lttng_create_session_live(const char *name, const char *url, + unsigned int timer_interval) +{ + int ret; + ssize_t size; + struct lttcomm_session_msg lsm; + struct lttng_uri *uris = NULL; + + if (name == NULL) { + return -LTTNG_ERR_INVALID; + } + + memset(&lsm, 0, sizeof(lsm)); + + lsm.cmd_type = LTTNG_CREATE_SESSION_LIVE; + lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name)); + + size = uri_parse_str_urls(url, NULL, &uris); + if (size < 0) { + ret = -LTTNG_ERR_INVALID; + goto end; + } + + /* file:// is not accepted for live session. */ + if (uris[0].dtype == LTTNG_DST_PATH) { + ret = -LTTNG_ERR_INVALID; + goto end; + } + + lsm.u.session_live.nb_uri = size; + lsm.u.session_live.timer_interval = timer_interval; + + ret = lttng_ctl_ask_sessiond_varlen(&lsm, uris, + sizeof(struct lttng_uri) * size, NULL); + +end: + free(uris); + return ret; +} + /* * lib constructor */ @@ -1555,7 +1642,9 @@ static void __attribute__((constructor)) init() /* Set default session group */ lttng_set_tracing_group(DEFAULT_TRACING_GROUP); /* Set socket for health check */ - (void) set_health_socket_path(); + if (set_health_socket_path()) { + abort(); + } } /*