/*
- * Copyright (C) 2014 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2014 David Goulet <dgoulet@efficios.com>
*
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
*
- * This library 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 Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define _LGPL_SOURCE
free(attr->raw_override_path_url);
free(attr->raw_override_ctrl_url);
free(attr->raw_override_data_url);
- free(attr->override_attr.path_url);
- free(attr->override_attr.ctrl_url);
- free(attr->override_attr.data_url);
+ if (attr->override_attr) {
+ free(attr->override_attr->path_url);
+ free(attr->override_attr->ctrl_url);
+ free(attr->override_attr->data_url);
+ free(attr->override_attr->session_name);
+ }
}
void lttng_load_session_attr_destroy(struct lttng_load_session_attr *attr)
{
if (attr) {
reset_load_session_attr_urls(attr);
+ free(attr->override_attr);
free(attr);
}
}
+static int validate_attr(const struct lttng_load_session_attr *attr)
+{
+ int ret = 0;
+
+ if (!attr) {
+ ret = -LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+ if (!attr->override_attr) {
+ goto end;
+ }
+
+ /*
+ * Refuse override name if the objective is to load multiple session
+ * since this operation is ambiguous while loading multiple session.
+ */
+ if (attr->override_attr->session_name
+ && attr->session_name[0] == '\0') {
+ ret = -LTTNG_ERR_INVALID;
+ goto end;
+ }
+end:
+ return ret;
+}
+
const char *lttng_load_session_attr_get_session_name(
struct lttng_load_session_attr *attr)
{
return attr ? attr->overwrite : -LTTNG_ERR_INVALID;
}
-const char *lttng_load_session_attr_get_override_path_url(
+const char *lttng_load_session_attr_get_override_ctrl_url(
struct lttng_load_session_attr *attr)
{
const char *ret = NULL;
- if (attr && attr->override_attr.path_url) {
- ret = attr->raw_override_path_url;
+ if (!attr || !attr->override_attr) {
+ goto end;
}
+ ret = attr->raw_override_ctrl_url;
+end:
return ret;
}
-const char *lttng_load_session_attr_get_override_ctrl_url(
+const char *lttng_load_session_attr_get_override_data_url(
struct lttng_load_session_attr *attr)
{
const char *ret = NULL;
- if (attr && attr->override_attr.ctrl_url) {
- ret = attr->raw_override_ctrl_url;
+ if (!attr || !attr->override_attr) {
+ goto end;
}
+ ret = attr->raw_override_data_url;
+end:
return ret;
}
-const char *lttng_load_session_attr_get_override_data_url(
- struct lttng_load_session_attr *attr)
+const char *lttng_load_session_attr_get_override_url(
+ struct lttng_load_session_attr *attr)
{
const char *ret = NULL;
- if (attr && attr->override_attr.data_url) {
- ret = attr->raw_override_data_url;
+ if (!attr || !attr->override_attr) {
+ goto end;
}
+ if ((attr->override_attr->path_url ||
+ (attr->override_attr->ctrl_url &&
+ attr->override_attr->data_url))) {
+ ret = attr->raw_override_url;
+ }
+end:
return ret;
}
-const char *lttng_load_session_attr_get_override_url(
+const char *lttng_load_session_attr_get_override_session_name(
struct lttng_load_session_attr *attr)
{
const char *ret = NULL;
- if (attr && (attr->override_attr.path_url ||
- (attr->override_attr.ctrl_url &&
- attr->override_attr.data_url))) {
- ret = attr->raw_override_url;
+ if (!attr || !attr->override_attr) {
+ goto end;
}
+ ret = attr->override_attr->session_name;
+end:
return ret;
}
goto error;
}
- strncpy(attr->session_name, session_name, len);
+ ret = lttng_strncpy(attr->session_name, session_name,
+ sizeof(attr->session_name));
+ if (ret) {
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
+ }
} else {
attr->session_name[0] = '\0';
}
goto end;
}
- if (attr->override_attr.path_url) {
+ if (!attr->override_attr) {
+ attr->override_attr = zmalloc(
+ sizeof(struct config_load_session_override_attr));
+ if (!attr->override_attr) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+ }
+
+ if (attr->override_attr->path_url) {
/*
- * FIXME: return a more meaningful error.
- * Setting a ctrl override after a path override make no
- * sense.
- * */
+ * Setting a ctrl override after a path override makes no sense.
+ */
ret = -LTTNG_ERR_INVALID;
goto end;
}
}
/* Squash old value if any */
- free(attr->override_attr.ctrl_url);
+ free(attr->override_attr->ctrl_url);
free(attr->raw_override_ctrl_url);
/* Populate the object */
- attr->override_attr.ctrl_url = url_str;
+ attr->override_attr->ctrl_url = url_str;
attr->raw_override_ctrl_url = raw_str;
/* Ownership passed to attr. */
goto end;
}
- if (attr->override_attr.path_url) {
+ if (!attr->override_attr) {
+ attr->override_attr = zmalloc(
+ sizeof(struct config_load_session_override_attr));
+ if (!attr->override_attr) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+ }
+
+ if (attr->override_attr->path_url) {
+ /*
+ * Setting a data override after a path override makes no sense.
+ */
ret = -LTTNG_ERR_INVALID;
goto end;
}
}
/* Squash old value if any */
- free(attr->override_attr.data_url);
+ free(attr->override_attr->data_url);
free(attr->raw_override_data_url);
/* Populate the object */
- attr->override_attr.data_url = url_str;
+ attr->override_attr->data_url = url_str;
attr->raw_override_data_url = raw_str;
/* Ownership passed to attr. */
goto end;
}
+ if (!attr->override_attr) {
+ attr->override_attr = zmalloc(
+ sizeof(struct config_load_session_override_attr));
+ if (!attr->override_attr) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+ }
+
/*
* FIXME: uri_parse should be able to take as parameter the protocol
* type to validate "url". For now only check the parsing goes through;
reset_load_session_attr_urls(attr);
- attr->override_attr.path_url = path_str;
- attr->override_attr.ctrl_url = ctrl_str;
- attr->override_attr.data_url = data_str;
+ attr->override_attr->path_url = path_str;
+ attr->override_attr->ctrl_url = ctrl_str;
+ attr->override_attr->data_url = data_str;
attr->raw_override_url = raw_url_str;
attr->raw_override_path_url = raw_path_str;
return ret;
}
+int lttng_load_session_attr_set_override_session_name(
+ struct lttng_load_session_attr *attr, const char *session_name)
+{
+ int ret = 0;
+ size_t len;
+
+ if (!attr ||!session_name) {
+ ret = -LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+ if (!attr->override_attr) {
+ attr->override_attr = zmalloc(
+ sizeof(struct config_load_session_override_attr));
+ if (!attr->override_attr) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+ }
+
+ len = strlen(session_name);
+ if (len >= LTTNG_NAME_MAX) {
+ ret = -LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+ attr->override_attr->session_name = lttng_strndup(session_name,
+ len);
+ if (!attr->override_attr->session_name) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+end:
+ return ret;
+}
+
int lttng_load_session(struct lttng_load_session_attr *attr)
{
int ret;
goto end;
}
+ ret = validate_attr(attr);
+ if (ret) {
+ goto end;
+ }
+
url = attr->input_url[0] != '\0' ? attr->input_url : NULL;
session_name = attr->session_name[0] != '\0' ?
attr->session_name : NULL;
- ret = config_load_session(url, session_name, attr->overwrite, 0);
+ ret = config_load_session(url, session_name, attr->overwrite, 0,
+ attr->override_attr);
end:
return ret;
projects / lttng-tools.git / blobdiff