const char * const config_element_buffer_type = "buffer_type";
const char * const config_element_session = "session";
const char * const config_element_sessions = "sessions";
-const char * const config_element_perf = "perf";
+const char * const config_element_context_perf = "perf";
+const char * const config_element_context_app = "app";
+const char * const config_element_context_app_provider_name = "provider_name";
+const char * const config_element_context_app_ctx_name = "ctx_name";
const char * const config_element_config = "config";
const char * const config_element_started = "started";
const char * const config_element_snapshot_mode = "snapshot_mode";
const char * const config_element_loglevel = "loglevel";
const char * const config_element_loglevel_type = "loglevel_type";
const char * const config_element_filter = "filter";
+const char * const config_element_filter_expression = "filter_expression";
const char * const config_element_snapshot_outputs = "snapshot_outputs";
const char * const config_element_consumer_output = "consumer_output";
const char * const config_element_destination = "destination";
const char * const config_event_context_hostname = "HOSTNAME";
const char * const config_event_context_ip = "IP";
const char * const config_event_context_perf_thread_counter = "PERF_THREAD_COUNTER";
+const char * const config_event_context_app = "APP";
+
struct consumer_output {
int enabled;
ret = xmlTextWriterStartElement(writer->writer, encoded_element_name);
xmlFree(encoded_element_name);
end:
- return ret > 0 ? 0 : ret;
+ return ret >= 0 ? 0 : ret;
}
LTTNG_HIDDEN
ret = xmlTextWriterEndElement(writer->writer);
end:
- return ret > 0 ? 0 : ret;
+ return ret >= 0 ? 0 : ret;
}
LTTNG_HIDDEN
encoded_element_name, "%" PRIu64, value);
xmlFree(encoded_element_name);
end:
- return ret > 0 ? 0 : ret;
+ return ret >= 0 ? 0 : ret;
}
LTTNG_HIDDEN
encoded_element_name, "%" PRIi64, value);
xmlFree(encoded_element_name);
end:
- return ret > 0 ? 0 : ret;
+ return ret >= 0 ? 0 : ret;
}
LTTNG_HIDDEN
end:
xmlFree(encoded_element_name);
xmlFree(encoded_value);
- return ret > 0 ? 0 : ret;
+ return ret >= 0 ? 0 : ret;
}
static
config_element_type)) {
/* type */
xmlChar *content = xmlNodeGetContent(context_child_node);
+
if (!content) {
ret = -LTTNG_ERR_NOMEM;
goto end;
}
context.ctx = ret;
- } else {
+ } else if (!strcmp((const char *) context_child_node->name,
+ config_element_context_perf)) {
+ /* perf */
xmlNodePtr perf_attr_node;
- /* perf */
context.ctx = handle->domain.type == LTTNG_DOMAIN_KERNEL ?
LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER :
LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER;
free(content);
}
}
+ } else if (!strcmp((const char *) context_child_node->name,
+ config_element_context_app)) {
+ /* application context */
+ xmlNodePtr app_ctx_node;
+
+ context.ctx = LTTNG_EVENT_CONTEXT_APP_CONTEXT;
+ for (app_ctx_node = xmlFirstElementChild(context_child_node);
+ app_ctx_node; app_ctx_node =
+ xmlNextElementSibling(app_ctx_node)) {
+ xmlChar *content;
+ char **target = strcmp(
+ (const char *) app_ctx_node->name,
+ config_element_context_app_provider_name) == 0 ?
+ &context.u.app_ctx.provider_name :
+ &context.u.app_ctx.ctx_name;
+
+ content = xmlNodeGetContent(app_ctx_node);
+ if (!content) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+
+ *target = (char *) content;
+ }
+ } else {
+ /* Unrecognized context type */
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
}
ret = lttng_add_context(handle, &context, NULL, channel_name);
+ if (context.ctx == LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
+ free(context.u.app_ctx.provider_name);
+ free(context.u.app_ctx.ctx_name);
+ }
end:
return ret;
}