X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=d89249879aece2dc99ea2b138dfcc3784154f097;hp=ba938d9f1578863b9253c28d61bbe7bd29b4ff08;hb=fb83fe64f250bec7416f18891a8264450c61ead3;hpb=045fc61744f711fd2e4ca84c6339d97f1eafc71d diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c index ba938d9f1..d89249879 100644 --- a/src/common/config/session-config.c +++ b/src/common/config/session-config.c @@ -95,6 +95,8 @@ const char * const config_element_output_type = "output_type"; const char * const config_element_tracefile_size = "tracefile_size"; const char * const config_element_tracefile_count = "tracefile_count"; const char * const config_element_live_timer_interval = "live_timer_interval"; +const char * const config_element_discarded_events = "discarded_events"; +const char * const config_element_lost_packets = "lost_packets"; const char * const config_element_type = "type"; const char * const config_element_buffer_type = "buffer_type"; const char * const config_element_session = "session"; @@ -109,6 +111,7 @@ 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"; @@ -454,7 +457,40 @@ int config_writer_open_element(struct config_writer *writer, ret = xmlTextWriterStartElement(writer->writer, encoded_element_name); xmlFree(encoded_element_name); end: - return ret > 0 ? 0 : ret; + return ret >= 0 ? 0 : ret; +} + +LTTNG_HIDDEN +int config_writer_write_attribute(struct config_writer *writer, + const char *name, const char *value) +{ + int ret; + xmlChar *encoded_name = NULL; + xmlChar *encoded_value = NULL; + + if (!writer || !writer->writer || !name || !name[0]) { + ret = -1; + goto end; + } + + encoded_name = encode_string(name); + if (!encoded_name) { + ret = -1; + goto end; + } + + encoded_value = encode_string(value); + if (!encoded_value) { + ret = -1; + goto end; + } + + ret = xmlTextWriterWriteAttribute(writer->writer, encoded_name, + encoded_value); +end: + xmlFree(encoded_name); + xmlFree(encoded_value); + return ret >= 0 ? 0 : ret; } LTTNG_HIDDEN @@ -469,7 +505,7 @@ int config_writer_close_element(struct config_writer *writer) ret = xmlTextWriterEndElement(writer->writer); end: - return ret > 0 ? 0 : ret; + return ret >= 0 ? 0 : ret; } LTTNG_HIDDEN @@ -494,7 +530,7 @@ int config_writer_write_element_unsigned_int(struct config_writer *writer, encoded_element_name, "%" PRIu64, value); xmlFree(encoded_element_name); end: - return ret > 0 ? 0 : ret; + return ret >= 0 ? 0 : ret; } LTTNG_HIDDEN @@ -519,7 +555,7 @@ int config_writer_write_element_signed_int(struct config_writer *writer, encoded_element_name, "%" PRIi64, value); xmlFree(encoded_element_name); end: - return ret > 0 ? 0 : ret; + return ret >= 0 ? 0 : ret; } LTTNG_HIDDEN @@ -561,7 +597,7 @@ int config_writer_write_element_string(struct config_writer *writer, end: xmlFree(encoded_element_name); xmlFree(encoded_value); - return ret > 0 ? 0 : ret; + return ret >= 0 ? 0 : ret; } static