*/
#define _LGPL_SOURCE
-#include <string.h>
-#include <limits.h>
+#include "lttng-ctl-helper.hpp"
-#include <lttng/lttng-error.h>
-#include <lttng/load.h>
-#include <lttng/load-internal.hpp>
-#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/compat/string.hpp>
#include <common/config/session-config.hpp>
-#include <common/uri.hpp>
#include <common/macros.hpp>
-#include <common/compat/string.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/uri.hpp>
-#include "lttng-ctl-helper.hpp"
+#include <lttng/load-internal.hpp>
+#include <lttng/load.h>
+#include <lttng/lttng-error.h>
+
+#include <limits.h>
+#include <string.h>
struct lttng_load_session_attr *lttng_load_session_attr_create(void)
{
- return (lttng_load_session_attr *) zmalloc(sizeof(struct lttng_load_session_attr));
+ return zmalloc<lttng_load_session_attr>();
}
-static
-void reset_load_session_attr_urls(struct lttng_load_session_attr *attr)
+static void reset_load_session_attr_urls(struct lttng_load_session_attr *attr)
{
free(attr->raw_override_url);
free(attr->raw_override_path_url);
* 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') {
+ if (attr->override_attr->session_name && attr->session_name[0] == '\0') {
ret = -LTTNG_ERR_INVALID;
goto end;
}
return ret;
}
-const char *lttng_load_session_attr_get_session_name(
- struct lttng_load_session_attr *attr)
+const char *lttng_load_session_attr_get_session_name(struct lttng_load_session_attr *attr)
{
- const char *ret = NULL;
+ const char *ret = nullptr;
if (attr && attr->session_name[0]) {
ret = attr->session_name;
return ret;
}
-const char *lttng_load_session_attr_get_input_url(
- struct lttng_load_session_attr *attr)
+const char *lttng_load_session_attr_get_input_url(struct lttng_load_session_attr *attr)
{
- const char *ret = NULL;
+ const char *ret = nullptr;
if (attr && attr->input_url[0]) {
ret = attr->input_url;
return ret;
}
-int lttng_load_session_attr_get_overwrite(
- struct lttng_load_session_attr *attr)
+int lttng_load_session_attr_get_overwrite(struct lttng_load_session_attr *attr)
{
return attr ? attr->overwrite : -LTTNG_ERR_INVALID;
}
-const char *lttng_load_session_attr_get_override_ctrl_url(
- struct lttng_load_session_attr *attr)
+const char *lttng_load_session_attr_get_override_ctrl_url(struct lttng_load_session_attr *attr)
{
- const char *ret = NULL;
+ const char *ret = nullptr;
if (!attr || !attr->override_attr) {
goto 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_data_url(struct lttng_load_session_attr *attr)
{
- const char *ret = NULL;
+ const char *ret = nullptr;
if (!attr || !attr->override_attr) {
goto end;
return ret;
}
-const char *lttng_load_session_attr_get_override_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;
+ const char *ret = nullptr;
if (!attr || !attr->override_attr) {
goto end;
}
if ((attr->override_attr->path_url ||
- (attr->override_attr->ctrl_url &&
- attr->override_attr->data_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_session_name(
- struct lttng_load_session_attr *attr)
+const char *lttng_load_session_attr_get_override_session_name(struct lttng_load_session_attr *attr)
{
- const char *ret = NULL;
+ const char *ret = nullptr;
if (!attr || !attr->override_attr) {
goto end;
return ret;
}
-int lttng_load_session_attr_set_session_name(
- struct lttng_load_session_attr *attr, const char *session_name)
+int lttng_load_session_attr_set_session_name(struct lttng_load_session_attr *attr,
+ const char *session_name)
{
int ret = 0;
goto error;
}
- ret = lttng_strncpy(attr->session_name, session_name,
- sizeof(attr->session_name));
+ ret = lttng_strncpy(attr->session_name, session_name, sizeof(attr->session_name));
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto error;
return ret;
}
-int lttng_load_session_attr_set_input_url(
- struct lttng_load_session_attr *attr, const char *url)
+int lttng_load_session_attr_set_input_url(struct lttng_load_session_attr *attr, const char *url)
{
int ret = 0;
size_t len;
ssize_t size;
- struct lttng_uri *uris = NULL;
+ struct lttng_uri *uris = nullptr;
if (!attr) {
ret = -LTTNG_ERR_INVALID;
goto error;
}
- size = uri_parse_str_urls(url, NULL, &uris);
+ size = uri_parse_str_urls(url, nullptr, &uris);
if (size <= 0 || uris[0].dtype != LTTNG_DST_PATH) {
ret = -LTTNG_ERR_INVALID;
goto error;
}
/* Copy string plus the NULL terminated byte. */
- ret = lttng_strncpy(attr->input_url, uris[0].dst.path,
- sizeof(attr->input_url));
+ ret = lttng_strncpy(attr->input_url, uris[0].dst.path, sizeof(attr->input_url));
if (ret) {
ret = -LTTNG_ERR_INVALID;
goto error;
return ret;
}
-int lttng_load_session_attr_set_overwrite(
- struct lttng_load_session_attr *attr, int overwrite)
+int lttng_load_session_attr_set_overwrite(struct lttng_load_session_attr *attr, int overwrite)
{
int ret = 0;
return ret;
}
-int lttng_load_session_attr_set_override_ctrl_url(
- struct lttng_load_session_attr *attr, const char *url)
+int lttng_load_session_attr_set_override_ctrl_url(struct lttng_load_session_attr *attr,
+ const char *url)
{
int ret = 0;
ssize_t ret_size;
- struct lttng_uri *uri = NULL;
- char *url_str = NULL;
- char *raw_str = NULL;
+ struct lttng_uri *uri = nullptr;
+ char *url_str = nullptr;
+ char *raw_str = nullptr;
if (!attr) {
ret = -LTTNG_ERR_INVALID;
}
if (!attr->override_attr) {
- attr->override_attr = (config_load_session_override_attr *) zmalloc(
- sizeof(struct config_load_session_override_attr));
+ attr->override_attr = zmalloc<config_load_session_override_attr>();
if (!attr->override_attr) {
ret = -LTTNG_ERR_NOMEM;
goto end;
uri[0].port = DEFAULT_NETWORK_CONTROL_PORT;
}
- url_str = (char *) zmalloc(PATH_MAX);
+ url_str = calloc<char>(PATH_MAX);
if (!url_str) {
/* FIXME: return valid error */
ret = -LTTNG_ERR_NOMEM;
attr->raw_override_ctrl_url = raw_str;
/* Ownership passed to attr. */
- url_str = NULL;
- raw_str = NULL;
+ url_str = nullptr;
+ raw_str = nullptr;
end:
free(raw_str);
return ret;
}
-int lttng_load_session_attr_set_override_data_url(
- struct lttng_load_session_attr *attr, const char *url)
+int lttng_load_session_attr_set_override_data_url(struct lttng_load_session_attr *attr,
+ const char *url)
{
int ret = 0;
ssize_t ret_size;
- struct lttng_uri *uri = NULL;
- char *url_str = NULL;
- char *raw_str = NULL;
+ struct lttng_uri *uri = nullptr;
+ char *url_str = nullptr;
+ char *raw_str = nullptr;
if (!attr) {
ret = -LTTNG_ERR_INVALID;
}
if (!attr->override_attr) {
- attr->override_attr = (config_load_session_override_attr *) zmalloc(
- sizeof(struct config_load_session_override_attr));
+ attr->override_attr = zmalloc<config_load_session_override_attr>();
if (!attr->override_attr) {
ret = -LTTNG_ERR_NOMEM;
goto end;
uri[0].port = DEFAULT_NETWORK_DATA_PORT;
}
- url_str = (char *) zmalloc(PATH_MAX);
+ url_str = calloc<char>(PATH_MAX);
if (!url_str) {
ret = -LTTNG_ERR_NOMEM;
goto end;
attr->raw_override_data_url = raw_str;
/* Ownership passed to attr. */
- url_str = NULL;
- raw_str = NULL;
+ url_str = nullptr;
+ raw_str = nullptr;
end:
free(raw_str);
free(url_str);
return ret;
}
-int lttng_load_session_attr_set_override_url(
- struct lttng_load_session_attr *attr, const char *url)
+int lttng_load_session_attr_set_override_url(struct lttng_load_session_attr *attr, const char *url)
{
int ret = 0;
ssize_t ret_size;
- struct lttng_uri *uri = NULL;
- char *raw_url_str = NULL;
- char *raw_path_str = NULL;
- char *path_str = NULL;
- char *raw_ctrl_str = NULL;
- char *ctrl_str = NULL;
- char *raw_data_str = NULL;
- char *data_str = NULL;
+ struct lttng_uri *uri = nullptr;
+ char *raw_url_str = nullptr;
+ char *raw_path_str = nullptr;
+ char *path_str = nullptr;
+ char *raw_ctrl_str = nullptr;
+ char *ctrl_str = nullptr;
+ char *raw_data_str = nullptr;
+ char *data_str = nullptr;
char buffer[PATH_MAX];
if (!attr || !url || strlen(url) >= PATH_MAX) {
}
if (!attr->override_attr) {
- attr->override_attr = (config_load_session_override_attr *) zmalloc(
- sizeof(struct config_load_session_override_attr));
+ attr->override_attr = zmalloc<config_load_session_override_attr>();
if (!attr->override_attr) {
ret = -LTTNG_ERR_NOMEM;
goto end;
* type to validate "url". For now only check the parsing goes through;
* it will fail later on.
*/
- ret_size = uri_parse_str_urls(url, NULL, &uri);
+ ret_size = uri_parse_str_urls(url, nullptr, &uri);
if (ret_size < 0 || ret_size > 2) {
/* Unexpected URL format. */
ret = -LTTNG_ERR_INVALID;
goto end;
}
- path_str = lttng_strndup(raw_path_str, PATH_MAX);
+ path_str = lttng_strndup(uri[0].dst.path, PATH_MAX);
if (!path_str) {
ret = -LTTNG_ERR_NOMEM;
goto end;
attr->raw_override_data_url = raw_data_str;
/* Pass data ownership to attr. */
- raw_url_str = NULL;
- raw_path_str = NULL;
- path_str = NULL;
- raw_ctrl_str = NULL;
- ctrl_str = NULL;
- raw_data_str = NULL;
- data_str = NULL;
+ raw_url_str = nullptr;
+ raw_path_str = nullptr;
+ path_str = nullptr;
+ raw_ctrl_str = nullptr;
+ ctrl_str = nullptr;
+ raw_data_str = nullptr;
+ data_str = nullptr;
end:
free(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 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) {
+ if (!attr || !session_name) {
ret = -LTTNG_ERR_INVALID;
goto end;
}
if (!attr->override_attr) {
- attr->override_attr = (config_load_session_override_attr *) zmalloc(
- sizeof(struct config_load_session_override_attr));
+ attr->override_attr = zmalloc<config_load_session_override_attr>();
if (!attr->override_attr) {
ret = -LTTNG_ERR_NOMEM;
goto end;
goto end;
}
- attr->override_attr->session_name = lttng_strndup(session_name,
- len);
+ attr->override_attr->session_name = lttng_strndup(session_name, len);
if (!attr->override_attr->session_name) {
ret = -LTTNG_ERR_NOMEM;
goto end;
goto end;
}
- url = attr->input_url[0] != '\0' ? attr->input_url : NULL;
- session_name = attr->session_name[0] != '\0' ?
- attr->session_name : NULL;
+ url = attr->input_url[0] != '\0' ? attr->input_url : nullptr;
+ session_name = attr->session_name[0] != '\0' ? attr->session_name : nullptr;
- ret = config_load_session(url, session_name, attr->overwrite, 0,
- attr->override_attr);
+ ret = config_load_session(url, session_name, attr->overwrite, 0, attr->override_attr);
end:
return ret;
projects / lttng-tools.git / blobdiff