X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=1b9f3a8ab99a95d54e6ffcd6b8465092dfe4da17;hp=775d1c324f4ee098a016cd40e556565fd186ce6a;hb=8991668e5aee318628b29aa36904855461dad07a;hpb=c617c0c651432f9d5ae7adf4c5c1a5fd92ad828e diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c index 775d1c324..1b9f3a8ab 100644 --- a/src/lib/lttng-ctl/lttng-ctl.c +++ b/src/lib/lttng-ctl/lttng-ctl.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include "filter/filter-ast.h" @@ -73,6 +74,33 @@ static int connected; int lttng_opt_quiet; int lttng_opt_verbose; +/* + * Compare two URL destination. + * + * Return 0 is equal else is not equal. + */ +static int compare_destination(struct lttng_uri *ctrl, struct lttng_uri *data) +{ + int ret; + + assert(ctrl); + assert(data); + + switch (ctrl->dtype) { + case LTTNG_DST_IPV4: + ret = strncmp(ctrl->dst.ipv4, data->dst.ipv4, sizeof(ctrl->dst.ipv4)); + break; + case LTTNG_DST_IPV6: + ret = strncmp(ctrl->dst.ipv6, data->dst.ipv6, sizeof(ctrl->dst.ipv6)); + break; + default: + ret = -1; + break; + } + + return ret; +} + static void set_default_url_attr(struct lttng_uri *uri, enum lttng_stream_type stype) { @@ -158,6 +186,8 @@ static ssize_t parse_str_urls_to_uri(const char *ctrl_url, const char *data_url, } if (data_url) { + int ret; + /* We have to parse the data URL in this case */ size_data = uri_parse(data_url, &data_uris); if (size_data < 1) { @@ -169,6 +199,12 @@ static ssize_t parse_str_urls_to_uri(const char *ctrl_url, const char *data_url, } set_default_url_attr(&data_uris[0], LTTNG_STREAM_DATA); + + ret = compare_destination(&ctrl_uris[0], &data_uris[0]); + if (ret != 0) { + ERR("Control and data destination mismatch"); + goto error; + } } /* Compute total size */ @@ -184,10 +220,12 @@ static ssize_t parse_str_urls_to_uri(const char *ctrl_url, const char *data_url, /* It's possible the control URIs array contains more than one URI */ memcpy(tmp_uris, ctrl_uris, sizeof(struct lttng_uri) * size_ctrl); ++idx; + free(ctrl_uris); } if (data_uris) { memcpy(&tmp_uris[idx], data_uris, sizeof(struct lttng_uri)); + free(data_uris); } *uris = tmp_uris; @@ -448,7 +486,7 @@ static int set_session_daemon_path(void) * With GNU C >= 2.1, snprintf returns the required size (excluding closing null) */ ret = snprintf(sessiond_sock_path, sizeof(sessiond_sock_path), - DEFAULT_HOME_CLIENT_UNIX_SOCK, getenv("HOME")); + DEFAULT_HOME_CLIENT_UNIX_SOCK, utils_get_home_dir()); if ((ret < 0) || (ret >= sizeof(sessiond_sock_path))) { goto error; } @@ -634,9 +672,7 @@ end: */ void lttng_destroy_handle(struct lttng_handle *handle) { - if (handle) { - free(handle); - } + free(handle); } /* @@ -1139,6 +1175,7 @@ const char *lttng_strerror(int code) */ int lttng_create_session(const char *name, const char *url) { + int ret; ssize_t size; struct lttcomm_session_msg lsm; struct lttng_uri *uris = NULL; @@ -1160,8 +1197,11 @@ int lttng_create_session(const char *name, const char *url) lsm.u.uri.size = size; - return ask_sessiond_varlen(&lsm, uris, sizeof(struct lttng_uri) * size, + ret = ask_sessiond_varlen(&lsm, uris, sizeof(struct lttng_uri) * size, NULL); + + free(uris); + return ret; } /* @@ -1347,30 +1387,37 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain, memset(attr, 0, sizeof(struct lttng_channel_attr)); + /* Same for all domains. */ + attr->overwrite = DEFAULT_CHANNEL_OVERWRITE; + attr->tracefile_size = DEFAULT_CHANNEL_TRACEFILE_SIZE; + attr->tracefile_count = DEFAULT_CHANNEL_TRACEFILE_COUNT; + switch (domain->type) { case LTTNG_DOMAIN_KERNEL: - attr->overwrite = DEFAULT_CHANNEL_OVERWRITE; - attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER; - attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER; - + attr->switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER; + attr->read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER; attr->subbuf_size = default_get_kernel_channel_subbuf_size(); attr->num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM; attr->output = DEFAULT_KERNEL_CHANNEL_OUTPUT; break; case LTTNG_DOMAIN_UST: -#if 0 - case LTTNG_DOMAIN_UST_EXEC_NAME: - case LTTNG_DOMAIN_UST_PID: - case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN: -#endif - attr->overwrite = DEFAULT_CHANNEL_OVERWRITE; - attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER; - attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER; - - attr->subbuf_size = default_get_ust_channel_subbuf_size(); - attr->num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM; - attr->output = DEFAULT_UST_CHANNEL_OUTPUT; - break; + switch (domain->buf_type) { + case LTTNG_BUFFER_PER_UID: + attr->subbuf_size = default_get_ust_uid_channel_subbuf_size(); + attr->num_subbuf = DEFAULT_UST_UID_CHANNEL_SUBBUF_NUM; + attr->output = DEFAULT_UST_UID_CHANNEL_OUTPUT; + attr->switch_timer_interval = DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER; + attr->read_timer_interval = DEFAULT_UST_UID_CHANNEL_READ_TIMER; + break; + case LTTNG_BUFFER_PER_PID: + default: + attr->subbuf_size = default_get_ust_pid_channel_subbuf_size(); + attr->num_subbuf = DEFAULT_UST_PID_CHANNEL_SUBBUF_NUM; + attr->output = DEFAULT_UST_PID_CHANNEL_OUTPUT; + attr->switch_timer_interval = DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER; + attr->read_timer_interval = DEFAULT_UST_PID_CHANNEL_READ_TIMER; + break; + } default: /* Default behavior: leave set to 0. */ break; @@ -1393,7 +1440,7 @@ int lttng_session_daemon_alive(void) return ret; } - if (strlen(sessiond_sock_path) == 0) { + if (*sessiond_sock_path == '\0') { /* * No socket path set. Weird error which means the constructor was not * called. @@ -1419,6 +1466,7 @@ int lttng_session_daemon_alive(void) int lttng_set_consumer_url(struct lttng_handle *handle, const char *control_url, const char *data_url) { + int ret; ssize_t size; struct lttcomm_session_msg lsm; struct lttng_uri *uris = NULL; @@ -1442,52 +1490,27 @@ int lttng_set_consumer_url(struct lttng_handle *handle, lsm.u.uri.size = size; - return ask_sessiond_varlen(&lsm, uris, sizeof(struct lttng_uri) * size, + ret = ask_sessiond_varlen(&lsm, uris, sizeof(struct lttng_uri) * size, NULL); + + free(uris); + return ret; } /* - * Enable consumer for a session and domain. - * - * Return 0 on success, else a negative value. + * [OBSOLETE] */ int lttng_enable_consumer(struct lttng_handle *handle) { - struct lttcomm_session_msg lsm; - - if (handle == NULL) { - return -LTTNG_ERR_INVALID; - } - - lsm.cmd_type = LTTNG_ENABLE_CONSUMER; - - copy_string(lsm.session.name, handle->session_name, - sizeof(lsm.session.name)); - copy_lttng_domain(&lsm.domain, &handle->domain); - - return ask_sessiond(&lsm, NULL); + return -ENOSYS; } /* - * Disable consumer for a session and domain. - * - * Return 0 on success, else a negative value. + * [OBSOLETE] */ int lttng_disable_consumer(struct lttng_handle *handle) { - struct lttcomm_session_msg lsm; - - if (handle == NULL) { - return -LTTNG_ERR_INVALID; - } - - lsm.cmd_type = LTTNG_DISABLE_CONSUMER; - - copy_string(lsm.session.name, handle->session_name, - sizeof(lsm.session.name)); - copy_lttng_domain(&lsm.domain, &handle->domain); - - return ask_sessiond(&lsm, NULL); + return -ENOSYS; } /* @@ -1521,7 +1544,7 @@ static int set_health_socket_path(void) * 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 = getenv("HOME"); + home = utils_get_home_dir(); if (home == NULL) { /* Fallback in /tmp .. */ home = "/tmp"; @@ -1577,7 +1600,12 @@ int lttng_health_check(enum lttng_health_component c) ret = reply.ret_code; close_error: - close(sock); + { + int closeret; + + closeret = close(sock); + assert(!closeret); + } error: return ret; @@ -1604,11 +1632,12 @@ error: int _lttng_create_session_ext(const char *name, const char *url, const char *datetime) { + int ret; ssize_t size; struct lttcomm_session_msg lsm; struct lttng_uri *uris = NULL; - if (name == NULL || datetime == NULL) { + if (name == NULL || datetime == NULL || url == NULL) { return -LTTNG_ERR_INVALID; } @@ -1620,24 +1649,34 @@ int _lttng_create_session_ext(const char *name, const char *url, /* There should never be a data URL */ size = parse_str_urls_to_uri(url, NULL, &uris); if (size < 0) { - return -LTTNG_ERR_INVALID; + ret = -LTTNG_ERR_INVALID; + goto error; } lsm.u.uri.size = size; if (size > 0 && uris[0].dtype != LTTNG_DST_PATH && strlen(uris[0].subdir) == 0) { - int ret; - - ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s-%s", name, - datetime); + /* Don't append datetime if the name was automatically created. */ + if (strncmp(name, DEFAULT_SESSION_NAME "-", + strlen(DEFAULT_SESSION_NAME) + 1)) { + ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s-%s", + name, datetime); + } else { + ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s", name); + } if (ret < 0) { PERROR("snprintf uri subdir"); - return -LTTNG_ERR_FATAL; + ret = -LTTNG_ERR_FATAL; + goto error; } } - return ask_sessiond_varlen(&lsm, uris, sizeof(struct lttng_uri) * size, + ret = ask_sessiond_varlen(&lsm, uris, sizeof(struct lttng_uri) * size, NULL); + +error: + free(uris); + return ret; } /*