#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_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;
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 (ret) {
- goto end;
- }
-
- if (!event.enabled) {
- /*
- * Note that we should use lttng_disable_event_ext() (2.6+) to
- * eliminate the risk of clashing on events of the same
- * name (with different event types and loglevels).
- *
- * Unfortunately, lttng_disable_event_ext() only performs a
- * match on the name and event type and errors out if any other
- * event attribute is not set to its default value.
- *
- * This will disable all events that match this name.
- */
- ret = lttng_disable_event(handle, event.name, channel_name);
+ 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++) {
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;
}
{
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;
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;
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,
- log4j_domain, output_node, live_timer_interval);
+ 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,
- log4j_domain, output_node, UINT64_MAX);
+ ret = create_session((const char *) name, kernel_domain,
+ ust_domain, jul_domain, log4j_domain,
+ output_node, UINT64_MAX);
}
if (ret) {
goto error;
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(ust_domain);
free(jul_domain);
free(log4j_domain);
- free(name);
+ xmlFree(name);
return ret;
}
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;
int override, unsigned int autoload)
{
int ret;
+ bool session_loaded = false;
const char *path_ptr = NULL;
struct session_config_validation_ctx validation_ctx = { 0 };
* Continue even if the session was found since we have to try
* the system wide sessions.
*/
+ session_loaded = true;
}
}
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,
&validation_ctx, override);
+ if (!ret) {
+ session_loaded = true;
+ }
}
} else {
ret = access(path, F_OK);
*/
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;
}
projects / lttng-tools.git / blobdiff