#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <stdbool.h>
#include <common/defaults.h>
#include <common/error.h>
const char * const config_domain_type_kernel = "KERNEL";
const char * const config_domain_type_ust = "UST";
const char * const config_domain_type_jul = "JUL";
+const char * const config_domain_type_log4j = "LOG4J";
const char * const config_buffer_type_per_pid = "PER_PID";
const char * const config_buffer_type_per_uid = "PER_UID";
const char * const config_event_context_ip = "IP";
const char * const config_event_context_perf_thread_counter = "PERF_THREAD_COUNTER";
+enum process_event_node_phase {
+ CREATION = 0,
+ ENABLE = 1,
+};
+
struct consumer_output {
int enabled;
char *path;
in_len = strlen(in_str);
/*
- * Add 1 byte for the NULL terminted character. The factor 2 here is
- * because UTF-8 can be on two bytes so this fits the worst case for each
- * bytes.
+ * Add 1 byte for the NULL terminted character. The factor 4 here is
+ * used because UTF-8 characters can take up to 4 bytes.
*/
- out_len = (in_len * 2) + 1;
+ out_len = (in_len * 4) + 1;
out_str = xmlMalloc(out_len);
if (!out_str) {
goto end;
}
LTTNG_HIDDEN
-struct config_writer *config_writer_create(int fd_output)
+struct config_writer *config_writer_create(int fd_output, int indent)
{
int ret;
struct config_writer *writer;
ret = xmlTextWriterSetIndentString(writer->writer,
BAD_CAST config_xml_indent_string);
- if (ret) {
+ if (ret) {
goto error_destroy;
}
- ret = xmlTextWriterSetIndent(writer->writer, 1);
- if (ret) {
+ ret = xmlTextWriterSetIndent(writer->writer, indent);
+ if (ret) {
goto error_destroy;
}
ret = LTTNG_DOMAIN_UST;
} else if (!strcmp((char *) domain, config_domain_type_jul)) {
ret = LTTNG_DOMAIN_JUL;
+ } else if (!strcmp((char *) domain, config_domain_type_log4j)) {
+ ret = LTTNG_DOMAIN_LOG4J;
} else {
goto error;
}
struct lttng_domain *kernel_domain,
struct lttng_domain *ust_domain,
struct lttng_domain *jul_domain,
+ struct lttng_domain *log4j_domain,
xmlNodePtr output_node,
uint64_t live_timer_interval)
{
int i;
struct lttng_domain *domain;
struct lttng_domain *domains[] =
- { kernel_domain, ust_domain, jul_domain };
+ { kernel_domain, ust_domain, jul_domain, log4j_domain};
/* network destination */
if (live_timer_interval && live_timer_interval != UINT64_MAX) {
static
int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
- const char *channel_name)
+ const char *channel_name, const enum process_event_node_phase phase)
{
- int ret, i;
+ int ret = 0, i;
xmlNodePtr node;
struct lttng_event event;
char **exclusions = NULL;
memset(&event, 0, sizeof(event));
+ /* Initialize default log level which varies by domain */
+ switch (handle->domain.type)
+ {
+ case LTTNG_DOMAIN_JUL:
+ event.loglevel = LTTNG_LOGLEVEL_JUL_ALL;
+ break;
+ case LTTNG_DOMAIN_LOG4J:
+ event.loglevel = LTTNG_LOGLEVEL_LOG4J_ALL;
+ break;
+ case LTTNG_DOMAIN_UST:
+ case LTTNG_DOMAIN_KERNEL:
+ event.loglevel = LTTNG_LOGLEVEL_DEBUG;
+ break;
+ default:
+ assert(0);
+ }
+
for (node = xmlFirstElementChild(event_node); node;
node = xmlNextElementSibling(node)) {
if (!strcmp((const char *) node->name, config_element_name)) {
goto end;
}
+ free(filter_expression);
filter_expression = strdup((char *) content);
free(content);
if (!filter_expression) {
}
}
- ret = lttng_enable_event_with_exclusions(handle, &event, channel_name,
- filter_expression, exclusion_count, exclusions);
+ if ((event.enabled && phase == ENABLE) || phase == CREATION) {
+ ret = lttng_enable_event_with_exclusions(handle, &event, channel_name,
+ filter_expression, exclusion_count, exclusions);
+ if (ret < 0) {
+ WARN("Enabling event (name:%s) on load failed.", event.name);
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+ }
end:
for (i = 0; i < exclusion_count; i++) {
free(exclusions[i]);
const char *channel_name)
{
int ret = 0;
+ struct lttng_event event;
xmlNodePtr node;
assert(events_node);
for (node = xmlFirstElementChild(events_node); node;
node = xmlNextElementSibling(node)) {
- ret = process_event_node(node, handle, channel_name);
+ ret = process_event_node(node, handle, channel_name, CREATION);
+ if (ret) {
+ goto end;
+ }
+ }
+
+ /*
+ * Disable all events to enable only the necessary events.
+ * Limitations regarding lttng_disable_events and tuple descriptor
+ * force this approach.
+ */
+ memset(&event, 0, sizeof(event));
+ event.loglevel = -1;
+ event.type = LTTNG_EVENT_ALL;
+ ret = lttng_disable_event_ext(handle, &event, channel_name, NULL);
+ if (ret) {
+ goto end;
+ }
+
+ for (node = xmlFirstElementChild(events_node); node;
+ node = xmlNextElementSibling(node)) {
+ ret = process_event_node(node, handle, channel_name, ENABLE);
if (ret) {
goto end;
}
}
+
end:
return ret;
}
xmlNodePtr perf_attr_node;
/* perf */
- context.ctx = LTTNG_EVENT_CONTEXT_PERF_COUNTER;
+ context.ctx = handle->domain.type == LTTNG_DOMAIN_KERNEL ?
+ LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER :
+ LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER;
for (perf_attr_node = xmlFirstElementChild(context_child_node);
perf_attr_node; perf_attr_node =
xmlNextElementSibling(perf_attr_node)) {
{
int ret, started = -1, snapshot_mode = -1;
uint64_t live_timer_interval = UINT64_MAX;
- char *name = NULL;
+ xmlChar *name = NULL;
xmlNodePtr domains_node = NULL;
xmlNodePtr output_node = NULL;
xmlNodePtr node;
struct lttng_domain *kernel_domain = NULL;
struct lttng_domain *ust_domain = NULL;
struct lttng_domain *jul_domain = NULL;
+ struct lttng_domain *log4j_domain = NULL;
for (node = xmlFirstElementChild(session_node); node;
node = xmlNextElementSibling(node)) {
goto error;
}
- name = (char *) node_content;
+ name = node_content;
} else if (!domains_node && !strcmp((const char *) node->name,
config_element_domains)) {
/* domains */
goto error;
}
- if (session_name && strcmp(name, session_name)) {
+ if (session_name && strcmp((char *) name, session_name)) {
/* This is not the session we are looking for */
ret = -LTTNG_ERR_NO_SESSION;
goto error;
}
jul_domain = domain;
break;
+ case LTTNG_DOMAIN_LOG4J:
+ if (log4j_domain) {
+ /* Same domain seen twice, invalid! */
+ goto domain_init_error;
+ }
+ log4j_domain = domain;
+ break;
default:
WARN("Invalid domain type");
goto domain_init_error;
if (override) {
/* Destroy session if it exists */
- ret = lttng_destroy_session(name);
+ ret = lttng_destroy_session((const char *) name);
if (ret && ret != -LTTNG_ERR_SESS_NOT_FOUND) {
ERR("Failed to destroy existing session.");
goto error;
/* Create session type depending on output type */
if (snapshot_mode && snapshot_mode != -1) {
- ret = create_snapshot_session(name, output_node);
+ ret = create_snapshot_session((const char *) name, output_node);
} else if (live_timer_interval &&
live_timer_interval != UINT64_MAX) {
- ret = create_session(name, kernel_domain, ust_domain, jul_domain,
+ ret = create_session((const char *) name, kernel_domain,
+ ust_domain, jul_domain, log4j_domain,
output_node, live_timer_interval);
} else {
/* regular session */
- ret = create_session(name, kernel_domain, ust_domain, jul_domain,
+ ret = create_session((const char *) name, kernel_domain,
+ ust_domain, jul_domain, log4j_domain,
output_node, UINT64_MAX);
}
if (ret) {
for (node = xmlFirstElementChild(domains_node); node;
node = xmlNextElementSibling(node)) {
- ret = process_domain_node(node, name);
+ ret = process_domain_node(node, (const char *) name);
if (ret) {
goto end;
}
}
if (started) {
- ret = lttng_start_tracing(name);
+ ret = lttng_start_tracing((const char *) name);
if (ret) {
goto end;
}
end:
if (ret < 0) {
- ERR("Failed to load session %s: %s", name, lttng_strerror(ret));
- lttng_destroy_session(name);
+ ERR("Failed to load session %s: %s", (const char *) name,
+ lttng_strerror(ret));
+ lttng_destroy_session((const char *) name);
}
error:
free(kernel_domain);
free(ust_domain);
free(jul_domain);
- free(name);
+ free(log4j_domain);
+ xmlFree(name);
return ret;
}
+/*
+ * Return 1 if the given path is readable by the current UID or 0 if not.
+ * Return -1 if the path is EPERM.
+ */
+static int validate_file_read_creds(const char *path)
+{
+ int ret;
+
+ assert(path);
+
+ /* Can we read the file. */
+ ret = access(path, R_OK);
+ if (!ret) {
+ goto valid;
+ }
+ if (errno == EACCES) {
+ return -1;
+ } else {
+ /* Invalid. */
+ return 0;
+ }
+valid:
+ return 1;
+}
+
static
int load_session_from_file(const char *path, const char *session_name,
struct session_config_validation_ctx *validation_ctx, int override)
xmlDocPtr doc = NULL;
xmlNodePtr sessions_node;
xmlNodePtr session_node;
- struct stat sb;
assert(path);
assert(validation_ctx);
- ret = stat(path, &sb);
- if (ret) {
- ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
+ ret = validate_file_read_creds(path);
+ if (ret != 1) {
+ if (ret == -1) {
+ ret = -LTTNG_ERR_EPERM;
+ } else {
+ ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
+ }
goto end;
}
return ret;
}
+/* Allocate dirent as recommended by READDIR(3), NOTES on readdir_r */
+static
+struct dirent *alloc_dirent(const char *path)
+{
+ size_t len;
+ long name_max;
+ struct dirent *entry;
+
+ name_max = pathconf(path, _PC_NAME_MAX);
+ if (name_max == -1) {
+ name_max = PATH_MAX;
+ }
+ len = offsetof(struct dirent, d_name) + name_max + 1;
+ entry = zmalloc(len);
+ return entry;
+}
+
static
int load_session_from_path(const char *path, const char *session_name,
struct session_config_validation_ctx *validation_ctx, int override)
goto end;
}
- entry = zmalloc(sizeof(*entry));
+ entry = alloc_dirent(path);
if (!entry) {
ret = -LTTNG_ERR_NOMEM;
goto end;
}
}
- if (!session_found) {
- ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
+ if (session_found) {
+ ret = 0;
}
return ret;
/*
* Validate that the given path's credentials and the current process have the
- * same UID. If so, return 0 else return 1 if it does NOT match.
+ * same UID. If so, return 1 else return 0 if it does NOT match.
*/
static int validate_path_creds(const char *path)
{
assert(path);
- if (uid != 0) {
+ if (uid == 0) {
goto valid;
}
}
valid:
- return 0;
-invalid:
return 1;
+invalid:
+ return 0;
}
LTTNG_HIDDEN
int override, unsigned int autoload)
{
int ret;
+ bool session_loaded = false;
+ const char *path_ptr = NULL;
struct session_config_validation_ctx validation_ctx = { 0 };
ret = init_session_config_validation_ctx(&validation_ctx);
char *home_path;
const char *sys_path;
- /*
- * Try system session configuration path. Ignore error here so we can
- * continue loading the home sessions. The above call should print an
- * error to inform the user.
- */
- if (autoload) {
- sys_path = DEFAULT_SESSION_SYSTEM_CONFIGPATH "/"
- DEFAULT_SESSION_CONFIG_AUTOLOAD;
- } else {
- sys_path = DEFAULT_SESSION_HOME_CONFIGPATH;
- }
-
- ret = validate_path_creds(sys_path);
- if (!ret && autoload) {
- (void) load_session_from_path(sys_path, session_name,
- &validation_ctx, override);
- }
-
/* Try home path */
home_path = utils_get_home_dir();
if (home_path) {
char path[PATH_MAX];
+ /*
+ * Try user session configuration path. Ignore error here so we can
+ * continue loading the system wide sessions.
+ */
if (autoload) {
ret = snprintf(path, sizeof(path),
DEFAULT_SESSION_HOME_CONFIGPATH "/"
DEFAULT_SESSION_CONFIG_AUTOLOAD, home_path);
+ if (ret < 0) {
+ PERROR("snprintf session autoload home config path");
+ goto end;
+ }
+
+ /*
+ * Credentials are only validated for the autoload in order to
+ * avoid any user session daemon to try to load kernel sessions
+ * automatically and failing all the times.
+ */
+ ret = validate_path_creds(path);
+ if (ret) {
+ path_ptr = path;
+ }
} else {
ret = snprintf(path, sizeof(path),
DEFAULT_SESSION_HOME_CONFIGPATH, home_path);
+ if (ret < 0) {
+ PERROR("snprintf session home config path");
+ goto end;
+ }
+ path_ptr = path;
}
- if (ret < 0) {
- goto end;
+ if (path_ptr) {
+ ret = load_session_from_path(path_ptr, session_name,
+ &validation_ctx, override);
+ if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
+ goto end;
+ }
+ /*
+ * Continue even if the session was found since we have to try
+ * the system wide sessions.
+ */
+ session_loaded = true;
}
+ }
- ret = validate_path_creds(path);
- if (ret && autoload) {
- ret = 0;
- goto end;
+ /* Reset path pointer for the system wide dir. */
+ path_ptr = NULL;
+
+ /* Try system wide configuration directory. */
+ if (autoload) {
+ sys_path = DEFAULT_SESSION_SYSTEM_CONFIGPATH "/"
+ DEFAULT_SESSION_CONFIG_AUTOLOAD;
+ ret = validate_path_creds(sys_path);
+ if (ret) {
+ path_ptr = sys_path;
}
+ } else {
+ sys_path = DEFAULT_SESSION_SYSTEM_CONFIGPATH;
+ path_ptr = sys_path;
+ }
- ret = load_session_from_path(path, session_name,
- &validation_ctx, override);
- if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
- /* Session found or an error occured */
- goto end;
+ if (path_ptr) {
+ ret = load_session_from_path(path_ptr, session_name,
+ &validation_ctx, override);
+ if (!ret) {
+ session_loaded = true;
}
}
} else {
*/
ret = 0;
}
+
+ if (session_loaded && ret == -LTTNG_ERR_LOAD_SESSION_NOENT) {
+ /* A matching session was found in one of the search paths. */
+ ret = 0;
+ }
return ret;
}