X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=08d66851b45b07909c183f51c7a5018626879ed7;hb=4bd69c5f1161cd065f487da0f4c1aa03a73c47e4;hp=a8ea68eda42fdb92fc0177d02a6c239d6d281bd4;hpb=f7af9a72c6709249c199989685bcd7d878ba2b33;p=lttng-tools.git diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c index a8ea68eda..08d66851b 100644 --- a/src/common/config/session-config.c +++ b/src/common/config/session-config.c @@ -7,7 +7,6 @@ #include "lttng/tracker.h" #define _LGPL_SOURCE -#include #include #include #include @@ -52,18 +51,18 @@ struct session_config_validation_ctx { xmlSchemaValidCtxtPtr schema_validation_ctx; }; -LTTNG_HIDDEN const char * const config_element_all = "all"; -const char * const config_str_yes = "yes"; -const char * const config_str_true = "true"; -const char * const config_str_on = "on"; -const char * const config_str_no = "no"; -const char * const config_str_false = "false"; -const char * const config_str_off = "off"; -const char * const config_xml_encoding = "UTF-8"; -const size_t config_xml_encoding_bytes_per_char = 2; /* Size of the encoding's largest character */ -const char * const config_xml_indent_string = "\t"; -const char * const config_xml_true = "true"; -const char * const config_xml_false = "false"; +const char * const config_element_all = "all"; +LTTNG_EXPORT const char * const config_str_yes = "yes"; +LTTNG_EXPORT const char * const config_str_true = "true"; +LTTNG_EXPORT const char * const config_str_on = "on"; +LTTNG_EXPORT const char * const config_str_no = "no"; +LTTNG_EXPORT const char * const config_str_false = "false"; +LTTNG_EXPORT const char * const config_str_off = "off"; +LTTNG_EXPORT const char * const config_xml_encoding = "UTF-8"; +LTTNG_EXPORT const size_t config_xml_encoding_bytes_per_char = 2; /* Size of the encoding's largest character */ +LTTNG_EXPORT const char * const config_xml_indent_string = "\t"; +LTTNG_EXPORT const char * const config_xml_true = "true"; +LTTNG_EXPORT const char * const config_xml_false = "false"; const char * const config_element_channel = "channel"; const char * const config_element_channels = "channels"; @@ -82,16 +81,16 @@ const char * const config_element_symbol_name = "symbol_name"; const char * const config_element_address = "address"; const char * const config_element_offset = "offset"; -LTTNG_HIDDEN const char * const config_element_userspace_probe_lookup = "lookup_method"; -LTTNG_HIDDEN const char * const config_element_userspace_probe_lookup_function_default = "DEFAULT"; -LTTNG_HIDDEN const char * const config_element_userspace_probe_lookup_function_elf = "ELF"; -LTTNG_HIDDEN const char * const config_element_userspace_probe_lookup_tracepoint_sdt = "SDT"; -LTTNG_HIDDEN const char * const config_element_userspace_probe_location_binary_path = "binary_path"; -LTTNG_HIDDEN const char * const config_element_userspace_probe_function_attributes = "userspace_probe_function_attributes"; -LTTNG_HIDDEN const char * const config_element_userspace_probe_function_location_function_name = "function_name"; -LTTNG_HIDDEN const char * const config_element_userspace_probe_tracepoint_attributes = "userspace_probe_tracepoint_attributes"; -LTTNG_HIDDEN const char * const config_element_userspace_probe_tracepoint_location_provider_name = "provider_name"; -LTTNG_HIDDEN const char * const config_element_userspace_probe_tracepoint_location_probe_name = "probe_name"; +const char * const config_element_userspace_probe_lookup = "lookup_method"; +const char * const config_element_userspace_probe_lookup_function_default = "DEFAULT"; +const char * const config_element_userspace_probe_lookup_function_elf = "ELF"; +const char * const config_element_userspace_probe_lookup_tracepoint_sdt = "SDT"; +const char * const config_element_userspace_probe_location_binary_path = "binary_path"; +const char * const config_element_userspace_probe_function_attributes = "userspace_probe_function_attributes"; +const char * const config_element_userspace_probe_function_location_function_name = "function_name"; +const char * const config_element_userspace_probe_tracepoint_attributes = "userspace_probe_tracepoint_attributes"; +const char * const config_element_userspace_probe_tracepoint_location_provider_name = "provider_name"; +const char * const config_element_userspace_probe_tracepoint_location_probe_name = "probe_name"; const char * const config_element_name = "name"; const char * const config_element_enabled = "enabled"; @@ -100,30 +99,30 @@ const char * const config_element_subbuf_size = "subbuffer_size"; const char * const config_element_num_subbuf = "subbuffer_count"; const char * const config_element_switch_timer_interval = "switch_timer_interval"; const char * const config_element_read_timer_interval = "read_timer_interval"; -LTTNG_HIDDEN const char * const config_element_monitor_timer_interval = "monitor_timer_interval"; -LTTNG_HIDDEN const char * const config_element_blocking_timeout = "blocking_timeout"; +const char * const config_element_monitor_timer_interval = "monitor_timer_interval"; +const char * const config_element_blocking_timeout = "blocking_timeout"; const char * const config_element_output = "output"; 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"; -LTTNG_HIDDEN const char * const config_element_discarded_events = "discarded_events"; -LTTNG_HIDDEN const char * const config_element_lost_packets = "lost_packets"; +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"; const char * const config_element_sessions = "sessions"; -LTTNG_HIDDEN const char * const config_element_context_perf = "perf"; -LTTNG_HIDDEN const char * const config_element_context_app = "app"; -LTTNG_HIDDEN const char * const config_element_context_app_provider_name = "provider_name"; -LTTNG_HIDDEN const char * const config_element_context_app_ctx_name = "ctx_name"; +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"; -LTTNG_HIDDEN const char * const config_element_filter_expression = "filter_expression"; +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"; @@ -136,36 +135,36 @@ const char * const config_element_pid = "pid"; const char * const config_element_pids = "pids"; const char * const config_element_shared_memory_path = "shared_memory_path"; -LTTNG_HIDDEN const char * const config_element_process_attr_id = "id"; -LTTNG_HIDDEN const char * const config_element_process_attr_tracker_pid = "pid_process_attr_tracker"; -LTTNG_HIDDEN const char * const config_element_process_attr_tracker_vpid = "vpid_process_attr_tracker"; -LTTNG_HIDDEN const char * const config_element_process_attr_tracker_uid = "uid_process_attr_tracker"; -LTTNG_HIDDEN const char * const config_element_process_attr_tracker_vuid = "vuid_process_attr_tracker"; -LTTNG_HIDDEN const char * const config_element_process_attr_tracker_gid = "gid_process_attr_tracker"; -LTTNG_HIDDEN const char * const config_element_process_attr_tracker_vgid = "vgid_process_attr_tracker"; -LTTNG_HIDDEN const char * const config_element_process_attr_trackers = "process_attr_trackers"; -LTTNG_HIDDEN const char * const config_element_process_attr_values = "process_attr_values"; -LTTNG_HIDDEN const char * const config_element_process_attr_value_type = "process_attr_value_type"; -LTTNG_HIDDEN const char * const config_element_process_attr_pid_value = "pid"; -LTTNG_HIDDEN const char * const config_element_process_attr_vpid_value = "vpid"; -LTTNG_HIDDEN const char * const config_element_process_attr_uid_value = "uid"; -LTTNG_HIDDEN const char * const config_element_process_attr_vuid_value = "vuid"; -LTTNG_HIDDEN const char * const config_element_process_attr_gid_value = "gid"; -LTTNG_HIDDEN const char * const config_element_process_attr_vgid_value = "vgid"; -LTTNG_HIDDEN const char * const config_element_process_attr_tracker_type = "process_attr_tracker_type"; +const char * const config_element_process_attr_id = "id"; +const char * const config_element_process_attr_tracker_pid = "pid_process_attr_tracker"; +const char * const config_element_process_attr_tracker_vpid = "vpid_process_attr_tracker"; +const char * const config_element_process_attr_tracker_uid = "uid_process_attr_tracker"; +const char * const config_element_process_attr_tracker_vuid = "vuid_process_attr_tracker"; +const char * const config_element_process_attr_tracker_gid = "gid_process_attr_tracker"; +const char * const config_element_process_attr_tracker_vgid = "vgid_process_attr_tracker"; +const char * const config_element_process_attr_trackers = "process_attr_trackers"; +const char * const config_element_process_attr_values = "process_attr_values"; +const char * const config_element_process_attr_value_type = "process_attr_value_type"; +const char * const config_element_process_attr_pid_value = "pid"; +const char * const config_element_process_attr_vpid_value = "vpid"; +const char * const config_element_process_attr_uid_value = "uid"; +const char * const config_element_process_attr_vuid_value = "vuid"; +const char * const config_element_process_attr_gid_value = "gid"; +const char * const config_element_process_attr_vgid_value = "vgid"; +const char * const config_element_process_attr_tracker_type = "process_attr_tracker_type"; /* Used for support of legacy tracker serialization (< 2.12). */ -LTTNG_HIDDEN const char * const config_element_trackers_legacy = "trackers"; -LTTNG_HIDDEN const char * const config_element_pid_tracker_legacy = "pid_tracker"; -LTTNG_HIDDEN const char * const config_element_tracker_targets_legacy = "targets"; -LTTNG_HIDDEN const char * const config_element_tracker_pid_target_legacy = "pid_target"; -LTTNG_HIDDEN const char * const config_element_tracker_pid_legacy = "pid"; - -LTTNG_HIDDEN const char * const config_element_rotation_schedules = "rotation_schedules"; -LTTNG_HIDDEN const char * const config_element_rotation_schedule_periodic = "periodic"; -LTTNG_HIDDEN const char * const config_element_rotation_schedule_periodic_time_us = "time_us"; -LTTNG_HIDDEN const char * const config_element_rotation_schedule_size_threshold = "size_threshold"; -LTTNG_HIDDEN const char * const config_element_rotation_schedule_size_threshold_bytes = "bytes"; +const char * const config_element_trackers_legacy = "trackers"; +const char * const config_element_pid_tracker_legacy = "pid_tracker"; +const char * const config_element_tracker_targets_legacy = "targets"; +const char * const config_element_tracker_pid_target_legacy = "pid_target"; +const char * const config_element_tracker_pid_legacy = "pid"; + +const char * const config_element_rotation_schedules = "rotation_schedules"; +const char * const config_element_rotation_schedule_periodic = "periodic"; +const char * const config_element_rotation_schedule_periodic_time_us = "time_us"; +const char * const config_element_rotation_schedule_size_threshold = "size_threshold"; +const char * const config_element_rotation_schedule_size_threshold_bytes = "bytes"; const char * const config_domain_type_kernel = "KERNEL"; const char * const config_domain_type_ust = "UST"; @@ -190,7 +189,7 @@ const char * const config_loglevel_type_single = "SINGLE"; const char * const config_event_type_all = "ALL"; const char * const config_event_type_tracepoint = "TRACEPOINT"; const char * const config_event_type_probe = "PROBE"; -LTTNG_HIDDEN const char * const config_event_type_userspace_probe = "USERSPACE_PROBE"; +const char * const config_event_type_userspace_probe = "USERSPACE_PROBE"; const char * const config_event_type_function = "FUNCTION"; const char * const config_event_type_function_entry = "FUNCTION_ENTRY"; const char * const config_event_type_noop = "NOOP"; @@ -211,35 +210,36 @@ const char * const config_event_context_pthread_id = "PTHREAD_ID"; 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"; -LTTNG_HIDDEN const char * const config_event_context_app = "APP"; -LTTNG_HIDDEN const char * const config_event_context_interruptible = "INTERRUPTIBLE"; -LTTNG_HIDDEN const char * const config_event_context_preemptible = "PREEMPTIBLE"; -LTTNG_HIDDEN const char * const config_event_context_need_reschedule = "NEED_RESCHEDULE"; -LTTNG_HIDDEN const char * const config_event_context_migratable = "MIGRATABLE"; -LTTNG_HIDDEN const char * const config_event_context_callstack_user= "CALLSTACK_USER"; -LTTNG_HIDDEN const char * const config_event_context_callstack_kernel = "CALLSTACK_KERNEL"; -LTTNG_HIDDEN const char * const config_event_context_cgroup_ns = "CGROUP_NS"; -LTTNG_HIDDEN const char * const config_event_context_ipc_ns = "IPC_NS"; -LTTNG_HIDDEN const char * const config_event_context_mnt_ns = "MNT_NS"; -LTTNG_HIDDEN const char * const config_event_context_net_ns = "NET_NS"; -LTTNG_HIDDEN const char * const config_event_context_pid_ns = "PID_NS"; -LTTNG_HIDDEN const char * const config_event_context_user_ns = "USER_NS"; -LTTNG_HIDDEN const char * const config_event_context_uts_ns = "UTS_NS"; -LTTNG_HIDDEN const char * const config_event_context_uid = "UID"; -LTTNG_HIDDEN const char * const config_event_context_euid = "EUID"; -LTTNG_HIDDEN const char * const config_event_context_suid = "SUID"; -LTTNG_HIDDEN const char * const config_event_context_gid = "GID"; -LTTNG_HIDDEN const char * const config_event_context_egid = "EGID"; -LTTNG_HIDDEN const char * const config_event_context_sgid = "SGID"; -LTTNG_HIDDEN const char * const config_event_context_vuid = "VUID"; -LTTNG_HIDDEN const char * const config_event_context_veuid = "VEUID"; -LTTNG_HIDDEN const char * const config_event_context_vsuid = "VSUID"; -LTTNG_HIDDEN const char * const config_event_context_vgid = "VGID"; -LTTNG_HIDDEN const char * const config_event_context_vegid = "VEGID"; -LTTNG_HIDDEN const char * const config_event_context_vsgid = "VSGID"; +const char * const config_event_context_app = "APP"; +const char * const config_event_context_interruptible = "INTERRUPTIBLE"; +const char * const config_event_context_preemptible = "PREEMPTIBLE"; +const char * const config_event_context_need_reschedule = "NEED_RESCHEDULE"; +const char * const config_event_context_migratable = "MIGRATABLE"; +const char * const config_event_context_callstack_user= "CALLSTACK_USER"; +const char * const config_event_context_callstack_kernel = "CALLSTACK_KERNEL"; +const char * const config_event_context_cgroup_ns = "CGROUP_NS"; +const char * const config_event_context_ipc_ns = "IPC_NS"; +const char * const config_event_context_mnt_ns = "MNT_NS"; +const char * const config_event_context_net_ns = "NET_NS"; +const char * const config_event_context_pid_ns = "PID_NS"; +const char * const config_event_context_time_ns = "TIME_NS"; +const char * const config_event_context_user_ns = "USER_NS"; +const char * const config_event_context_uts_ns = "UTS_NS"; +const char * const config_event_context_uid = "UID"; +const char * const config_event_context_euid = "EUID"; +const char * const config_event_context_suid = "SUID"; +const char * const config_event_context_gid = "GID"; +const char * const config_event_context_egid = "EGID"; +const char * const config_event_context_sgid = "SGID"; +const char * const config_event_context_vuid = "VUID"; +const char * const config_event_context_veuid = "VEUID"; +const char * const config_event_context_vsuid = "VSUID"; +const char * const config_event_context_vgid = "VGID"; +const char * const config_event_context_vegid = "VEGID"; +const char * const config_event_context_vsgid = "VSGID"; /* Deprecated symbols */ -const char * const config_element_perf; +LTTNG_EXPORT const char * const config_element_perf; enum process_event_node_phase { CREATION = 0, @@ -259,7 +259,7 @@ static int config_entry_handler_filter(struct handler_filter_args *args, int ret = 0; struct config_entry entry = { section, name, value }; - assert(args); + LTTNG_ASSERT(args); if (!section || !name || !value) { ret = -EIO; @@ -277,7 +277,6 @@ end: return ret; } -LTTNG_HIDDEN int config_get_section_entries(const char *override_path, const char *section, config_entry_handler_cb handler, void *user_data) { @@ -352,7 +351,6 @@ error: return ret; } -LTTNG_HIDDEN int config_parse_value(const char *value) { int i, ret = 0; @@ -409,7 +407,7 @@ static xmlChar *encode_string(const char *in_str) xmlCharEncodingHandlerPtr handler; int out_len, ret, in_len; - assert(in_str); + LTTNG_ASSERT(in_str); handler = xmlFindCharEncodingHandler(config_xml_encoding); if (!handler) { @@ -441,7 +439,6 @@ end: return out_str; } -LTTNG_HIDDEN struct config_writer *config_writer_create(int fd_output, int indent) { int ret; @@ -484,7 +481,6 @@ error_destroy: return NULL; } -LTTNG_HIDDEN int config_writer_destroy(struct config_writer *writer) { int ret = 0; @@ -508,7 +504,6 @@ end: return ret; } -LTTNG_HIDDEN int config_writer_open_element(struct config_writer *writer, const char *element_name) { @@ -532,7 +527,6 @@ end: return ret >= 0 ? 0 : ret; } -LTTNG_HIDDEN int config_writer_write_attribute(struct config_writer *writer, const char *name, const char *value) { @@ -565,7 +559,6 @@ end: return ret >= 0 ? 0 : ret; } -LTTNG_HIDDEN int config_writer_close_element(struct config_writer *writer) { int ret; @@ -580,7 +573,6 @@ end: return ret >= 0 ? 0 : ret; } -LTTNG_HIDDEN int config_writer_write_element_unsigned_int(struct config_writer *writer, const char *element_name, uint64_t value) { @@ -605,7 +597,6 @@ end: return ret >= 0 ? 0 : ret; } -LTTNG_HIDDEN int config_writer_write_element_signed_int(struct config_writer *writer, const char *element_name, int64_t value) { @@ -630,7 +621,6 @@ end: return ret >= 0 ? 0 : ret; } -LTTNG_HIDDEN int config_writer_write_element_bool(struct config_writer *writer, const char *element_name, int value) { @@ -638,7 +628,31 @@ int config_writer_write_element_bool(struct config_writer *writer, value ? config_xml_true : config_xml_false); } -LTTNG_HIDDEN +int config_writer_write_element_double(struct config_writer *writer, + const char *element_name, + double value) +{ + int ret; + xmlChar *encoded_element_name; + + if (!writer || !writer->writer || !element_name || !element_name[0]) { + ret = -1; + goto end; + } + + encoded_element_name = encode_string(element_name); + if (!encoded_element_name) { + ret = -1; + goto end; + } + + ret = xmlTextWriterWriteFormatElement( + writer->writer, encoded_element_name, "%f", value); + xmlFree(encoded_element_name); +end: + return ret >= 0 ? 0 : ret; +} + int config_writer_write_element_string(struct config_writer *writer, const char *element_name, const char *value) { @@ -711,7 +725,7 @@ void fini_session_config_validation_ctx( } static -char *get_session_config_xsd_path() +char *get_session_config_xsd_path(void) { char *xsd_path; const char *base_path = lttng_secure_getenv(DEFAULT_SESSION_CONFIG_XSD_PATH_ENV); @@ -842,12 +856,14 @@ int parse_bool(xmlChar *str, int *val) goto end; } - if (!strcmp((const char *) str, config_xml_true)) { + if (!strcmp((const char *) str, config_xml_true) || + !strcmp((const char *) str, "1")) { *val = 1; - } else if (!strcmp((const char *) str, config_xml_false)) { + } else if (!strcmp((const char *) str, config_xml_false) || + !strcmp((const char *) str, "0")) { *val = 0; } else { - WARN("Invalid boolean value encoutered (%s).", + WARN("Invalid boolean value encountered (%s).", (const char *) str); ret = -1; } @@ -1094,6 +1110,9 @@ int get_context_type(xmlChar *context_type) } else if (!strcmp((char *) context_type, config_event_context_pid_ns)) { ret = LTTNG_EVENT_CONTEXT_PID_NS; + } else if (!strcmp((char *) context_type, + config_event_context_time_ns)) { + ret = LTTNG_EVENT_CONTEXT_TIME_NS; } else if (!strcmp((char *) context_type, config_event_context_user_ns)) { ret = LTTNG_EVENT_CONTEXT_USER_NS; @@ -1226,7 +1245,7 @@ int process_consumer_output(xmlNodePtr consumer_output_node, int ret; xmlNodePtr node; - assert(output); + LTTNG_ASSERT(output); for (node = xmlFirstElementChild(consumer_output_node); node; node = xmlNextElementSibling(node)) { @@ -1292,7 +1311,7 @@ int create_session_net_output(const char *name, const char *control_uri, struct lttng_handle *handle; const char *uri = NULL; - assert(name); + LTTNG_ASSERT(name); handle = lttng_create_handle(name, NULL); if (!handle) { @@ -1321,7 +1340,7 @@ int create_snapshot_session(const char *session_name, xmlNodePtr output_node, xmlNodePtr snapshot_output_list_node; xmlNodePtr snapshot_output_node; - assert(session_name); + LTTNG_ASSERT(session_name); ret = lttng_create_session_snapshot(session_name, NULL); if (ret) { @@ -1474,7 +1493,7 @@ int create_session(const char *name, const char *data_uri = NULL; const char *path = NULL; - assert(name); + LTTNG_ASSERT(name); if (output_node) { consumer_output_node = xmlFirstElementChild(output_node); @@ -1740,8 +1759,8 @@ int process_probe_attribute_node(xmlNodePtr probe_attribute_node, { int ret; - assert(probe_attribute_node); - assert(attr); + LTTNG_ASSERT(probe_attribute_node); + LTTNG_ASSERT(attr); if (!strcmp((const char *) probe_attribute_node->name, config_element_address)) { @@ -1824,9 +1843,9 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle, unsigned long exclusion_count = 0; char *filter_expression = NULL; - assert(event_node); - assert(handle); - assert(channel_name); + LTTNG_ASSERT(event_node); + LTTNG_ASSERT(handle); + LTTNG_ASSERT(channel_name); event = lttng_event_create(); if (!event) { @@ -1851,7 +1870,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle, event->loglevel = LTTNG_LOGLEVEL_DEBUG; break; default: - assert(0); + abort(); } for (node = xmlFirstElementChild(event_node); node; @@ -2156,9 +2175,9 @@ int process_events_node(xmlNodePtr events_node, struct lttng_handle *handle, struct lttng_event event; xmlNodePtr node; - assert(events_node); - assert(handle); - assert(channel_name); + LTTNG_ASSERT(events_node); + LTTNG_ASSERT(handle); + LTTNG_ASSERT(channel_name); for (node = xmlFirstElementChild(events_node); node; node = xmlNextElementSibling(node)) { @@ -2200,10 +2219,10 @@ int process_channel_attr_node(xmlNodePtr attr_node, { int ret; - assert(attr_node); - assert(channel); - assert(contexts_node); - assert(events_node); + LTTNG_ASSERT(attr_node); + LTTNG_ASSERT(channel); + LTTNG_ASSERT(contexts_node); + LTTNG_ASSERT(events_node); if (!strcmp((const char *) attr_node->name, config_element_name)) { xmlChar *content; @@ -2506,8 +2525,8 @@ int process_context_node(xmlNodePtr context_node, struct lttng_event_context context; xmlNodePtr context_child_node = xmlFirstElementChild(context_node); - assert(handle); - assert(channel_name); + LTTNG_ASSERT(handle); + LTTNG_ASSERT(channel_name); if (!context_child_node) { ret = -LTTNG_ERR_LOAD_INVALID_CONFIG; @@ -2751,7 +2770,7 @@ static int process_legacy_pid_tracker_node( LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID : LTTNG_PROCESS_ATTR_PROCESS_ID; - assert(handle); + LTTNG_ASSERT(handle); tracker_handle_ret_code = lttng_session_get_tracker_handle( handle->session_name, handle->domain.type, @@ -2879,8 +2898,8 @@ static int process_id_tracker_node(xmlNodePtr id_tracker_node, struct lttng_process_attr_tracker_handle *tracker_handle = NULL; enum lttng_process_attr_tracker_handle_status status; - assert(handle); - assert(id_tracker_node); + LTTNG_ASSERT(handle); + LTTNG_ASSERT(id_tracker_node); tracker_handle_ret_code = lttng_session_get_tracker_handle( handle->session_name, handle->domain.type, process_attr, @@ -3067,7 +3086,7 @@ int process_domain_node(xmlNodePtr domain_node, const char *session_name) xmlNodePtr vgid_tracker_node = NULL; xmlNodePtr node; - assert(session_name); + LTTNG_ASSERT(session_name); ret = init_domain(domain_node, &domain); if (ret) { @@ -3703,7 +3722,7 @@ static int validate_file_read_creds(const char *path) { int ret; - assert(path); + LTTNG_ASSERT(path); /* Can we read the file. */ ret = access(path, R_OK); @@ -3730,8 +3749,8 @@ int load_session_from_file(const char *path, const char *session_name, xmlNodePtr sessions_node; xmlNodePtr session_node; - assert(path); - assert(validation_ctx); + LTTNG_ASSERT(path); + LTTNG_ASSERT(validation_ctx); ret = validate_file_read_creds(path); if (ret != 1) { @@ -3767,10 +3786,24 @@ int load_session_from_file(const char *path, const char *session_name, xmlNextElementSibling(session_node)) { ret = process_session_node(session_node, session_name, overwrite, overrides); - if (session_name && ret == 0) { - /* Target session found and loaded */ - session_found = 1; - break; + if (!session_name && ret) { + /* Loading error occurred. */ + goto end; + } else if (session_name) { + if (ret == 0) { + /* Target session found and loaded */ + session_found = 1; + break; + } else if (ret == -LTTNG_ERR_NO_SESSION) { + /* + * Ignore this error, we are looking for a + * specific session. + */ + ret = 0; + } else { + /* Loading error occurred. */ + goto end; + } } } end: @@ -3778,9 +3811,6 @@ end: if (!ret) { ret = session_found ? 0 : -LTTNG_ERR_LOAD_SESSION_NOENT; } - if (ret == -LTTNG_ERR_NO_SESSION) { - ret = -LTTNG_ERR_LOAD_SESSION_NOENT; - } return ret; } @@ -3794,8 +3824,8 @@ int load_session_from_path(const char *path, const char *session_name, struct lttng_dynamic_buffer file_path; size_t path_len; - assert(path); - assert(validation_ctx); + LTTNG_ASSERT(path); + LTTNG_ASSERT(validation_ctx); path_len = strlen(path); lttng_dynamic_buffer_init(&file_path); if (path_len >= LTTNG_PATH_MAX) { @@ -3956,7 +3986,7 @@ static int validate_path_creds(const char *path) int ret, uid = getuid(); struct stat buf; - assert(path); + LTTNG_ASSERT(path); if (uid == 0) { goto valid; @@ -3980,7 +4010,6 @@ invalid: return 0; } -LTTNG_HIDDEN int config_load_session(const char *path, const char *session_name, int overwrite, unsigned int autoload, const struct config_load_session_override_attr *overrides) @@ -4002,16 +4031,17 @@ int config_load_session(const char *path, const char *session_name, /* Try home path */ home_path = utils_get_home_dir(); if (home_path) { - char path[PATH_MAX]; + char path_buf[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); + ret = snprintf(path_buf, sizeof(path_buf), + DEFAULT_SESSION_HOME_CONFIGPATH + "/" DEFAULT_SESSION_CONFIG_AUTOLOAD, + home_path); if (ret < 0) { PERROR("snprintf session autoload home config path"); ret = -LTTNG_ERR_INVALID; @@ -4023,19 +4053,20 @@ int config_load_session(const char *path, const char *session_name, * avoid any user session daemon to try to load kernel sessions * automatically and failing all the times. */ - ret = validate_path_creds(path); + ret = validate_path_creds(path_buf); if (ret) { - path_ptr = path; + path_ptr = path_buf; } } else { - ret = snprintf(path, sizeof(path), - DEFAULT_SESSION_HOME_CONFIGPATH, home_path); + ret = snprintf(path_buf, sizeof(path_buf), + DEFAULT_SESSION_HOME_CONFIGPATH, + home_path); if (ret < 0) { PERROR("snprintf session home config path"); ret = -LTTNG_ERR_INVALID; goto end; } - path_ptr = path; + path_ptr = path_buf; } if (path_ptr) { ret = load_session_from_path(path_ptr, session_name,