X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng.c;h=1ff9f936c0cb160c55c49469b7e7f1ef9c32e7cc;hb=6dca8ba7dec3b31acb7b43f5e4431676acf4e664;hp=c4bda37bb84ede2269429a698ee74cc363820d4d;hpb=f5a2d630c739bf23e1bb7d1ab5602d21ec12aedb;p=lttng-tools.git diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c index c4bda37bb..1ff9f936c 100644 --- a/src/common/mi-lttng.c +++ b/src/common/mi-lttng.c @@ -1,52 +1,44 @@ /* - * Copyright (C) 2014 - Jonathan Rajotte - * - Olivier Cotte - * Copyright (C) 2016 - Jérémie Galarneau + * Copyright (C) 2014 Jonathan Rajotte + * Copyright (C) 2014 Olivier Cotte + * Copyright (C) 2016 Jérémie Galarneau * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2 only, as - * published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "lttng/tracker.h" #define _LGPL_SOURCE +#include "mi-lttng.h" #include #include -#include +#include #include -#include "mi-lttng.h" +#include -#include -#define MI_SCHEMA_MAJOR_VERSION 3 -#define MI_SCHEMA_MINOR_VERSION 0 +#define MI_SCHEMA_MAJOR_VERSION 4 +#define MI_SCHEMA_MINOR_VERSION 1 /* Machine interface namespace URI */ -LTTNG_HIDDEN const char * const mi_lttng_xmlns = "xmlns"; -LTTNG_HIDDEN const char * const mi_lttng_xmlns_xsi = "xmlns:xsi"; -LTTNG_HIDDEN const char * const mi_lttng_w3_schema_uri = "http://www.w3.org/2001/XMLSchema-instance"; -LTTNG_HIDDEN const char * const mi_lttng_schema_location = "xsi:schemaLocation"; -LTTNG_HIDDEN const char * const mi_lttng_schema_location_uri = +const char * const mi_lttng_xmlns = "xmlns"; +const char * const mi_lttng_xmlns_xsi = "xmlns:xsi"; +const char * const mi_lttng_w3_schema_uri = "http://www.w3.org/2001/XMLSchema-instance"; +const char * const mi_lttng_schema_location = "xsi:schemaLocation"; +const char * const mi_lttng_schema_location_uri = DEFAULT_LTTNG_MI_NAMESPACE " " "https://lttng.org/xml/schemas/lttng-mi/" XSTR(MI_SCHEMA_MAJOR_VERSION) "/lttng-mi-" XSTR(MI_SCHEMA_MAJOR_VERSION) "." XSTR(MI_SCHEMA_MINOR_VERSION) ".xsd"; -LTTNG_HIDDEN const char * const mi_lttng_schema_version = "schemaVersion"; -LTTNG_HIDDEN const char * const mi_lttng_schema_version_value = XSTR(MI_SCHEMA_MAJOR_VERSION) +const char * const mi_lttng_schema_version = "schemaVersion"; +const char * const mi_lttng_schema_version_value = XSTR(MI_SCHEMA_MAJOR_VERSION) "." XSTR(MI_SCHEMA_MINOR_VERSION); /* Strings related to command */ const char * const mi_lttng_element_command = "command"; const char * const mi_lttng_element_command_action = "snapshot_action"; const char * const mi_lttng_element_command_add_context = "add-context"; +const char *const mi_lttng_element_command_add_trigger = "add-trigger"; const char * const mi_lttng_element_command_create = "create"; const char * const mi_lttng_element_command_destroy = "destroy"; const char * const mi_lttng_element_command_disable_channel = "disable-channel"; @@ -54,13 +46,15 @@ const char * const mi_lttng_element_command_disable_event = "disable-event"; const char * const mi_lttng_element_command_enable_channels = "enable-channel"; const char * const mi_lttng_element_command_enable_event = "enable-event"; const char * const mi_lttng_element_command_list = "list"; +const char *const mi_lttng_element_command_list_trigger = "list-trigger"; const char * const mi_lttng_element_command_load = "load"; -LTTNG_HIDDEN const char * const mi_lttng_element_command_metadata = "metadata"; -LTTNG_HIDDEN const char * const mi_lttng_element_command_metadata_action = "metadata_action"; -LTTNG_HIDDEN const char * const mi_lttng_element_command_regenerate = "regenerate"; -LTTNG_HIDDEN const char * const mi_lttng_element_command_regenerate_action = "regenerate_action"; +const char * const mi_lttng_element_command_metadata = "metadata"; +const char * const mi_lttng_element_command_metadata_action = "metadata_action"; +const char * const mi_lttng_element_command_regenerate = "regenerate"; +const char * const mi_lttng_element_command_regenerate_action = "regenerate_action"; const char * const mi_lttng_element_command_name = "name"; const char * const mi_lttng_element_command_output = "output"; +const char *const mi_lttng_element_command_remove_trigger = "remove-trigger"; const char * const mi_lttng_element_command_save = "save"; const char * const mi_lttng_element_command_set_session = "set-session"; const char * const mi_lttng_element_command_snapshot = "snapshot"; @@ -74,9 +68,10 @@ const char * const mi_lttng_element_command_success = "success"; const char * const mi_lttng_element_command_track = "track"; const char * const mi_lttng_element_command_untrack = "untrack"; const char * const mi_lttng_element_command_version = "version"; -LTTNG_HIDDEN const char * const mi_lttng_element_command_rotate = "rotate"; -LTTNG_HIDDEN const char * const mi_lttng_element_command_enable_rotation = "enable-rotation"; -LTTNG_HIDDEN const char * const mi_lttng_element_command_disable_rotation = "disable-rotation"; +const char * const mi_lttng_element_command_rotate = "rotate"; +const char * const mi_lttng_element_command_enable_rotation = "enable-rotation"; +const char * const mi_lttng_element_command_disable_rotation = "disable-rotation"; +const char * const mi_lttng_element_command_clear = "clear"; /* Strings related to version command */ const char * const mi_lttng_element_version = "version"; @@ -104,8 +99,8 @@ const char * const mi_lttng_element_save = "save"; /* Strings related to load command */ const char * const mi_lttng_element_load = "load"; -LTTNG_HIDDEN const char * const mi_lttng_element_load_overrides = "overrides"; -LTTNG_HIDDEN const char * const mi_lttng_element_load_override_url = "url"; +const char * const mi_lttng_element_load_overrides = "overrides"; +const char * const mi_lttng_element_load_override_url = "url"; /* General elements of mi_lttng */ const char * const mi_lttng_element_empty = ""; @@ -182,57 +177,277 @@ const char * const mi_lttng_element_snapshots = "snapshots"; /* String related to track/untrack command */ const char * const mi_lttng_element_track_untrack_all_wildcard = "*"; -LTTNG_HIDDEN const char * const mi_lttng_element_session_name = "session_name"; +const char * const mi_lttng_element_session_name = "session_name"; /* String related to rotate command */ -LTTNG_HIDDEN const char * const mi_lttng_element_rotation = "rotation"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotate_status = "status"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule = "rotation_schedule"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedules = "rotation_schedules"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_result = "rotation_schedule_result"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_results = "rotation_schedule_results"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_periodic = "periodic"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_periodic_time_us = "time_us"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_size_threshold = "size_threshold"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule_size_threshold_bytes = "bytes"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_state = "state"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location = "location"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_local = "local"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_local_absolute_path = "absolute_path"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay = "relay"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_host = "host"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_control_port = "control_port"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_data_port = "data_port"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_protocol = "protocol"; -LTTNG_HIDDEN const char * const mi_lttng_element_rotation_location_relay_relative_path = "relative_path"; +const char * const mi_lttng_element_rotation = "rotation"; +const char * const mi_lttng_element_rotate_status = "status"; +const char * const mi_lttng_element_rotation_schedule = "rotation_schedule"; +const char * const mi_lttng_element_rotation_schedules = "rotation_schedules"; +const char * const mi_lttng_element_rotation_schedule_result = "rotation_schedule_result"; +const char * const mi_lttng_element_rotation_schedule_results = "rotation_schedule_results"; +const char * const mi_lttng_element_rotation_schedule_periodic = "periodic"; +const char * const mi_lttng_element_rotation_schedule_periodic_time_us = "time_us"; +const char * const mi_lttng_element_rotation_schedule_size_threshold = "size_threshold"; +const char * const mi_lttng_element_rotation_schedule_size_threshold_bytes = "bytes"; +const char * const mi_lttng_element_rotation_state = "state"; +const char * const mi_lttng_element_rotation_location = "location"; +const char * const mi_lttng_element_rotation_location_local = "local"; +const char * const mi_lttng_element_rotation_location_local_absolute_path = "absolute_path"; +const char * const mi_lttng_element_rotation_location_relay = "relay"; +const char * const mi_lttng_element_rotation_location_relay_host = "host"; +const char * const mi_lttng_element_rotation_location_relay_control_port = "control_port"; +const char * const mi_lttng_element_rotation_location_relay_data_port = "data_port"; +const char * const mi_lttng_element_rotation_location_relay_protocol = "protocol"; +const char * const mi_lttng_element_rotation_location_relay_relative_path = "relative_path"; /* String related to enum lttng_rotation_state */ -LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_ongoing = "ONGOING"; -LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_completed = "COMPLETED"; -LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_expired = "EXPIRED"; -LTTNG_HIDDEN const char * const mi_lttng_rotation_state_str_error = "ERROR"; +const char * const mi_lttng_rotation_state_str_ongoing = "ONGOING"; +const char * const mi_lttng_rotation_state_str_completed = "COMPLETED"; +const char * const mi_lttng_rotation_state_str_expired = "EXPIRED"; +const char * const mi_lttng_rotation_state_str_error = "ERROR"; /* String related to enum lttng_trace_archive_location_relay_protocol_type */ -LTTNG_HIDDEN const char * const mi_lttng_rotation_location_relay_protocol_str_tcp = "TCP"; +const char * const mi_lttng_rotation_location_relay_protocol_str_tcp = "TCP"; + +/* String related to rate_policy elements */ +const char *const mi_lttng_element_rate_policy = "rate_policy"; +const char *const mi_lttng_element_rate_policy_every_n = + "rate_policy_every_n"; +const char *const mi_lttng_element_rate_policy_once_after_n = + "rate_policy_once_after_n"; + +const char *const mi_lttng_element_rate_policy_every_n_interval = + "interval"; +const char + *const mi_lttng_element_rate_policy_once_after_n_threshold = + "threshold"; + +/* String related to action elements */ +const char *const mi_lttng_element_action = "action"; +const char *const mi_lttng_element_action_list = "action_list"; +const char *const mi_lttng_element_action_notify = "action_notify"; +const char *const mi_lttng_element_action_start_session = + "action_start_session"; +const char *const mi_lttng_element_action_stop_session = + "action_stop_session"; +const char *const mi_lttng_element_action_rotate_session = + "action_rotate_session"; +const char *const mi_lttng_element_action_snapshot_session = + "action_snapshot_session"; +const char *const mi_lttng_element_action_snapshot_session_output = + "output"; + +/* String related to condition */ +const char *const mi_lttng_element_condition = "condition"; +const char *const mi_lttng_element_condition_buffer_usage_high = + "condition_buffer_usage_high"; +const char *const mi_lttng_element_condition_buffer_usage_low = + "condition_buffer_usage_low"; +const char *const mi_lttng_element_condition_event_rule_matches = + "condition_event_rule_matches"; +const char *const mi_lttng_element_condition_session_consumed_size = + "condition_session_consumed_size"; +const char *const mi_lttng_element_condition_session_rotation = + "condition_session_rotation"; +const char + *const mi_lttng_element_condition_session_rotation_completed = + "condition_session_rotation_completed"; +const char + *const mi_lttng_element_condition_session_rotation_ongoing = + "condition_session_rotation_ongoing"; + +const char *const mi_lttng_element_condition_channel_name = + "channel_name"; +const char *const mi_lttng_element_condition_threshold_bytes = + "threshold_bytes"; +const char *const mi_lttng_element_condition_threshold_ratio = + "threshold_ratio"; + +/* String related to capture descriptor */ +const char *const mi_lttng_element_capture_descriptor = + "capture_descriptor"; +const char *const mi_lttng_element_capture_descriptors = + "capture_descriptors"; + +/* String related to event expression */ +const char *const mi_lttng_element_event_expr = "event_expr"; +const char *const mi_lttng_element_event_expr_payload_field = + "event_expr_payload_field"; +const char *const mi_lttng_element_event_expr_channel_context_field = + "event_expr_channel_context_field"; +const char + *const mi_lttng_element_event_expr_app_specific_context_field = + "event_expr_app_specific_context_field"; +const char *const mi_lttng_element_event_expr_array_field_element = + "event_expr_array_field_element"; +const char *const mi_lttng_element_event_expr_provider_name = + "provider_name"; +const char *const mi_lttng_element_event_expr_type_name = + "type_name"; +const char *const mi_lttng_element_event_expr_index = "index"; + +/* String related to event rule */ +const char *const mi_lttng_element_event_rule = "event_rule"; + +/* String related to lttng_event_rule_type */ +const char *const mi_lttng_element_event_rule_event_name = + "event_name"; +const char *const mi_lttng_element_event_rule_name_pattern = + "name_pattern"; +const char *const mi_lttng_element_event_rule_filter_expression = + "filter_expression"; + +const char *const mi_lttng_element_event_rule_jul_logging = + "event_rule_jul_logging"; +const char *const mi_lttng_element_event_rule_kernel_kprobe = + "event_rule_kernel_kprobe"; +const char *const mi_lttng_element_event_rule_kernel_syscall = + "event_rule_kernel_syscall"; +const char *const mi_lttng_element_event_rule_kernel_tracepoint = + "event_rule_kernel_tracepoint"; +const char *const mi_lttng_element_event_rule_kernel_uprobe = + "event_rule_kernel_uprobe"; +const char *const mi_lttng_element_event_rule_log4j_logging = + "event_rule_log4j_logging"; +const char *const mi_lttng_element_event_rule_python_logging = + "event_rule_python_logging"; +const char *const mi_lttng_element_event_rule_user_tracepoint = + "event_rule_user_tracepoint"; + +/* String related to lttng_event_rule_kernel_syscall. */ +const char *const + mi_lttng_element_event_rule_kernel_syscall_emission_site = + "emission_site"; + +/* String related to enum lttng_event_rule_kernel_syscall_emission_site. */ +const char *const + mi_lttng_event_rule_kernel_syscall_emission_site_entry_exit = + "entry+exit"; +const char + *const mi_lttng_event_rule_kernel_syscall_emission_site_entry = + "entry"; +const char *const + mi_lttng_event_rule_kernel_syscall_emission_site_exit = "exit"; + +/* String related to lttng_event_rule_user_tracepoint */ +const char *const + mi_lttng_element_event_rule_user_tracepoint_name_pattern_exclusions = + "name_pattern_exclusions"; +const char *const + mi_lttng_element_event_rule_user_tracepoint_name_pattern_exclusion = + "name_pattern_exclusion"; + +/* String related to log level rule. */ +const char *const mi_lttng_element_log_level_rule = + "log_level_rule"; +const char *const mi_lttng_element_log_level_rule_exactly = + "log_level_rule_exactly"; +const char + *const mi_lttng_element_log_level_rule_at_least_as_severe_as = + "log_level_rule_at_least_as_severe_as"; +const char *const mi_lttng_element_log_level_rule_level = "level"; + +/* String related to kernel probe location. */ +const char *const mi_lttng_element_kernel_probe_location = + "kernel_probe_location"; +const char + *const mi_lttng_element_kernel_probe_location_symbol_offset = + "kernel_probe_location_symbol_offset"; +const char *const + mi_lttng_element_kernel_probe_location_symbol_offset_name = + "name"; +const char *const + mi_lttng_element_kernel_probe_location_symbol_offset_offset = + "offset"; + +const char *const mi_lttng_element_kernel_probe_location_address = + "kernel_probe_location_address"; +const char + *const mi_lttng_element_kernel_probe_location_address_address = + "address"; + +/* String related to userspace probe location. */ +const char *const mi_lttng_element_userspace_probe_location = + "userspace_probe_location"; +const char + *const mi_lttng_element_userspace_probe_location_binary_path = + "binary_path"; +const char + *const mi_lttng_element_userspace_probe_location_function = + "userspace_probe_location_function"; +const char + *const mi_lttng_element_userspace_probe_location_function_name = + "name"; +const char + *const mi_lttng_element_userspace_probe_location_lookup_method = + "userspace_probe_location_lookup_method"; +const char *const + mi_lttng_element_userspace_probe_location_lookup_method_function_default = + "userspace_probe_location_lookup_method_function_default"; +const char *const + mi_lttng_element_userspace_probe_location_lookup_method_function_elf = + "userspace_probe_location_lookup_method_function_elf"; +const char *const + mi_lttng_element_userspace_probe_location_lookup_method_tracepoint_sdt = + "userspace_probe_location_lookup_method_tracepoint_sdt"; +const char + *const mi_lttng_element_userspace_probe_location_tracepoint = + "userspace_probe_location_tracepoint"; +const char *const + mi_lttng_element_userspace_probe_location_tracepoint_probe_name = + "probe_name"; +const char *const + mi_lttng_element_userspace_probe_location_tracepoint_provider_name = + "provider_name"; + +/* String related to enum + * lttng_userspace_probe_location_function_instrumentation_type */ +const char *const + mi_lttng_element_userspace_probe_location_function_instrumentation_type = + "instrumentation_type"; +const char *const + mi_lttng_userspace_probe_location_function_instrumentation_type_entry = + "ENTRY"; + +/* String related to trigger */ +const char *const mi_lttng_element_triggers = "triggers"; +const char *const mi_lttng_element_trigger = "trigger"; +const char *const mi_lttng_element_trigger_owner_uid = "owner_uid"; + +/* String related to error_query. */ +const char *const mi_lttng_element_error_query_result = + "error_query_result"; +const char *const mi_lttng_element_error_query_result_counter = + "error_query_result_counter"; +const char *const + mi_lttng_element_error_query_result_counter_value = "value"; +const char *const mi_lttng_element_error_query_result_description = + "description"; +const char *const mi_lttng_element_error_query_result_name = + "name"; +const char *const mi_lttng_element_error_query_result_type = + "type"; +const char *const mi_lttng_element_error_query_results = + "error_query_results"; /* String related to add-context command */ -LTTNG_HIDDEN const char * const mi_lttng_element_context_symbol = "symbol"; +const char * const mi_lttng_element_context_symbol = "symbol"; /* Deprecated symbols preserved for ABI compatibility. */ -const char * const mi_lttng_context_type_perf_counter; -const char * const mi_lttng_context_type_perf_cpu_counter; -const char * const mi_lttng_context_type_perf_thread_counter; -const char * const mi_lttng_element_track_untrack_pid_target; -const char * const mi_lttng_element_track_untrack_targets; -const char * const mi_lttng_element_calibrate; -const char * const mi_lttng_element_calibrate_function; -const char * const mi_lttng_element_command_calibrate; +LTTNG_EXPORT const char * const mi_lttng_context_type_perf_counter; +LTTNG_EXPORT const char * const mi_lttng_context_type_perf_cpu_counter; +LTTNG_EXPORT const char * const mi_lttng_context_type_perf_thread_counter; +LTTNG_EXPORT const char * const mi_lttng_element_track_untrack_pid_target; +LTTNG_EXPORT const char * const mi_lttng_element_track_untrack_targets; +LTTNG_EXPORT const char * const mi_lttng_element_calibrate; +LTTNG_EXPORT const char * const mi_lttng_element_calibrate_function; +LTTNG_EXPORT const char * const mi_lttng_element_command_calibrate; /* This is a merge of jul loglevel and regular loglevel * Those should never overlap by definition * (see struct lttng_event loglevel) */ -LTTNG_HIDDEN const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain) { switch (domain) { @@ -348,7 +563,6 @@ const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain) } } -LTTNG_HIDDEN const char *mi_lttng_logleveltype_string(enum lttng_loglevel_type value) { switch (value) { @@ -438,6 +652,8 @@ const char *mi_lttng_event_contexttype_string(enum lttng_event_context_type val) return config_event_context_net_ns; case LTTNG_EVENT_CONTEXT_PID_NS: return config_event_context_pid_ns; + case LTTNG_EVENT_CONTEXT_TIME_NS: + return config_event_context_time_ns; case LTTNG_EVENT_CONTEXT_USER_NS: return config_event_context_user_ns; case LTTNG_EVENT_CONTEXT_UTS_NS: @@ -471,7 +687,6 @@ const char *mi_lttng_event_contexttype_string(enum lttng_event_context_type val) } } -LTTNG_HIDDEN const char *mi_lttng_eventfieldtype_string(enum lttng_event_field_type val) { switch (val) { @@ -488,10 +703,8 @@ const char *mi_lttng_eventfieldtype_string(enum lttng_event_field_type val) } } -LTTNG_HIDDEN const char *mi_lttng_domaintype_string(enum lttng_domain_type value) { - /* Note: This is a *duplicate* of get_domain_str from bin/lttng/utils.c */ switch (value) { case LTTNG_DOMAIN_KERNEL: return config_domain_type_kernel; @@ -505,12 +718,11 @@ const char *mi_lttng_domaintype_string(enum lttng_domain_type value) return config_domain_type_python; default: /* Should not have an unknown domain */ - assert(0); + abort(); return NULL; } } -LTTNG_HIDDEN const char *mi_lttng_buffertype_string(enum lttng_buffer_type value) { switch (value) { @@ -522,12 +734,11 @@ const char *mi_lttng_buffertype_string(enum lttng_buffer_type value) return config_buffer_type_global; default: /* Should not have an unknow buffer type */ - assert(0); + abort(); return NULL; } } -LTTNG_HIDDEN const char *mi_lttng_rotation_state_string(enum lttng_rotation_state value) { switch (value) { @@ -541,12 +752,11 @@ const char *mi_lttng_rotation_state_string(enum lttng_rotation_state value) return mi_lttng_rotation_state_str_error; default: /* Should not have an unknow rotation state. */ - assert(0); + abort(); return NULL; } } -LTTNG_HIDDEN const char *mi_lttng_trace_archive_location_relay_protocol_type_string( enum lttng_trace_archive_location_relay_protocol_type value) { @@ -554,13 +764,12 @@ const char *mi_lttng_trace_archive_location_relay_protocol_type_string( case LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP: return mi_lttng_rotation_location_relay_protocol_str_tcp; default: - /* Should not have an unknow relay protocol. */ - assert(0); + /* Should not have an unknown relay protocol. */ + abort(); return NULL; } } -LTTNG_HIDDEN struct mi_writer *mi_lttng_writer_create(int fd_output, int mi_output_type) { struct mi_writer *mi_writer; @@ -588,7 +797,6 @@ err_destroy: return NULL; } -LTTNG_HIDDEN int mi_lttng_writer_destroy(struct mi_writer *writer) { int ret; @@ -608,7 +816,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_writer_command_open(struct mi_writer *writer, const char *command) { int ret; @@ -655,26 +862,22 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_writer_command_close(struct mi_writer *writer) { return mi_lttng_writer_close_element(writer); } -LTTNG_HIDDEN int mi_lttng_writer_open_element(struct mi_writer *writer, const char *element_name) { return config_writer_open_element(writer->writer, element_name); } -LTTNG_HIDDEN int mi_lttng_writer_close_element(struct mi_writer *writer) { return config_writer_close_element(writer->writer); } -LTTNG_HIDDEN int mi_lttng_close_multi_element(struct mi_writer *writer, unsigned int nb_element) { @@ -694,7 +897,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_writer_write_element_unsigned_int(struct mi_writer *writer, const char *element_name, uint64_t value) { @@ -702,7 +904,6 @@ int mi_lttng_writer_write_element_unsigned_int(struct mi_writer *writer, element_name, value); } -LTTNG_HIDDEN int mi_lttng_writer_write_element_signed_int(struct mi_writer *writer, const char *element_name, int64_t value) { @@ -710,7 +911,6 @@ int mi_lttng_writer_write_element_signed_int(struct mi_writer *writer, element_name, value); } -LTTNG_HIDDEN int mi_lttng_writer_write_element_bool(struct mi_writer *writer, const char *element_name, int value) { @@ -718,7 +918,6 @@ int mi_lttng_writer_write_element_bool(struct mi_writer *writer, element_name, value); } -LTTNG_HIDDEN int mi_lttng_writer_write_element_string(struct mi_writer *writer, const char *element_name, const char *value) { @@ -726,8 +925,15 @@ int mi_lttng_writer_write_element_string(struct mi_writer *writer, element_name, value); } -LTTNG_HIDDEN -int mi_lttng_version(struct mi_writer *writer, struct mi_lttng_version *version, +int mi_lttng_writer_write_element_double(struct mi_writer *writer, + const char *element_name, + double value) +{ + return config_writer_write_element_double( + writer->writer, element_name, value); +} + +int mi_lttng_version(struct mi_writer *writer, struct mi_lttng_version_data *version, const char *lttng_description, const char *lttng_license) { int ret; @@ -808,19 +1014,17 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_sessions_open(struct mi_writer *writer) { return mi_lttng_writer_open_element(writer, config_element_sessions); } -LTTNG_HIDDEN int mi_lttng_session(struct mi_writer *writer, struct lttng_session *session, int is_open) { int ret; - assert(session); + LTTNG_ASSERT(session); /* Open sessions element */ ret = mi_lttng_writer_open_element(writer, @@ -874,13 +1078,11 @@ end: } -LTTNG_HIDDEN int mi_lttng_domains_open(struct mi_writer *writer) { return mi_lttng_writer_open_element(writer, config_element_domains); } -LTTNG_HIDDEN int mi_lttng_domain(struct mi_writer *writer, struct lttng_domain *domain, int is_open) { @@ -888,7 +1090,7 @@ int mi_lttng_domain(struct mi_writer *writer, const char *str_domain; const char *str_buffer; - assert(domain); + LTTNG_ASSERT(domain); /* Open domain element */ ret = mi_lttng_writer_open_element(writer, config_element_domain); @@ -928,19 +1130,17 @@ end: } -LTTNG_HIDDEN int mi_lttng_channels_open(struct mi_writer *writer) { return mi_lttng_writer_open_element(writer, config_element_channels); } -LTTNG_HIDDEN int mi_lttng_channel(struct mi_writer *writer, struct lttng_channel *channel, int is_open) { int ret = 0; - assert(channel); + LTTNG_ASSERT(channel); /* Opening channel element */ ret = mi_lttng_writer_open_element(writer, config_element_channel); @@ -979,7 +1179,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_channel_attr(struct mi_writer *writer, struct lttng_channel_attr *attr) { @@ -989,7 +1188,7 @@ int mi_lttng_channel_attr(struct mi_writer *writer, uint64_t discarded_events, lost_packets, monitor_timer_interval; int64_t blocking_timeout; - assert(attr); + LTTNG_ASSERT(attr); ret = lttng_channel_get_discarded_event_count(chan, &discarded_events); if (ret) { @@ -1133,7 +1332,6 @@ end: } -LTTNG_HIDDEN int mi_lttng_event_common_attributes(struct mi_writer *writer, struct lttng_event *event) { @@ -1231,7 +1429,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_event_tracepoint_loglevel(struct mi_writer *writer, struct lttng_event *event, enum lttng_domain_type domain) { @@ -1260,7 +1457,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_event_tracepoint_no_loglevel(struct mi_writer *writer, struct lttng_event *event) { @@ -1268,7 +1464,6 @@ int mi_lttng_event_tracepoint_no_loglevel(struct mi_writer *writer, return write_event_exclusions(writer, event); } -LTTNG_HIDDEN int mi_lttng_event_function_probe(struct mi_writer *writer, struct lttng_event *event) { @@ -1448,7 +1643,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_event_function_entry(struct mi_writer *writer, struct lttng_event *event) { @@ -1477,13 +1671,11 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_events_open(struct mi_writer *writer) { return mi_lttng_writer_open_element(writer, config_element_events); } -LTTNG_HIDDEN int mi_lttng_event(struct mi_writer *writer, struct lttng_event *event, int is_open, enum lttng_domain_type domain) { @@ -1533,30 +1725,85 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_trackers_open(struct mi_writer *writer) { - return mi_lttng_writer_open_element(writer, config_element_trackers); + return mi_lttng_writer_open_element( + writer, config_element_process_attr_trackers); } -LTTNG_HIDDEN -int mi_lttng_pid_tracker_open(struct mi_writer *writer) +static int get_tracker_elements(enum lttng_process_attr process_attr, + const char **element_process_attr_tracker, + const char **element_process_attr_value) +{ + int ret = 0; + + switch (process_attr) { + case LTTNG_PROCESS_ATTR_PROCESS_ID: + *element_process_attr_tracker = + config_element_process_attr_tracker_pid; + *element_process_attr_value = + config_element_process_attr_pid_value; + break; + case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID: + *element_process_attr_tracker = + config_element_process_attr_tracker_vpid; + *element_process_attr_value = + config_element_process_attr_vpid_value; + break; + case LTTNG_PROCESS_ATTR_USER_ID: + *element_process_attr_tracker = + config_element_process_attr_tracker_uid; + *element_process_attr_value = + config_element_process_attr_uid_value; + break; + case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID: + *element_process_attr_tracker = + config_element_process_attr_tracker_vuid; + *element_process_attr_value = + config_element_process_attr_vuid_value; + break; + case LTTNG_PROCESS_ATTR_GROUP_ID: + *element_process_attr_tracker = + config_element_process_attr_tracker_gid; + *element_process_attr_value = + config_element_process_attr_gid_value; + break; + case LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID: + *element_process_attr_tracker = + config_element_process_attr_tracker_vgid; + *element_process_attr_value = + config_element_process_attr_vgid_value; + break; + default: + ret = LTTNG_ERR_SAVE_IO_FAIL; + } + return ret; +} + +int mi_lttng_process_attribute_tracker_open( + struct mi_writer *writer, enum lttng_process_attr process_attr) { int ret; + const char *element_tracker, *element_value; + + ret = get_tracker_elements( + process_attr, &element_tracker, &element_value); + if (ret) { + return ret; + } - /* Open element pid_tracker */ - ret = mi_lttng_writer_open_element(writer, config_element_pid_tracker); + /* Open process attribute tracker element */ + ret = mi_lttng_writer_open_element(writer, element_tracker); if (ret) { goto end; } - /* Open targets element */ - ret = mi_lttng_targets_open(writer); + /* Open values element */ + ret = mi_lttng_process_attr_values_open(writer); end: return ret; } -LTTNG_HIDDEN int mi_lttng_pids_open(struct mi_writer *writer) { return mi_lttng_writer_open_element(writer, config_element_pids); @@ -1566,8 +1813,9 @@ int mi_lttng_pids_open(struct mi_writer *writer) * TODO: move the listing of pid for user agent to process semantic on * mi api bump. The use of process element break the mi api. */ -LTTNG_HIDDEN -int mi_lttng_pid(struct mi_writer *writer, pid_t pid , const char *name, +int mi_lttng_pid(struct mi_writer *writer, + pid_t pid, + const char *name, int is_open) { int ret; @@ -1603,36 +1851,133 @@ end: return ret; } -LTTNG_HIDDEN -int mi_lttng_targets_open(struct mi_writer *writer) +int mi_lttng_process_attr_values_open(struct mi_writer *writer) { - return mi_lttng_writer_open_element(writer, - config_element_targets); + return mi_lttng_writer_open_element( + writer, config_element_process_attr_values); } -LTTNG_HIDDEN -int mi_lttng_pid_target(struct mi_writer *writer, pid_t pid, int is_open) +int mi_lttng_all_process_attribute_value(struct mi_writer *writer, + enum lttng_process_attr process_attr, + bool is_open) { int ret; + const char *element_id_tracker, *element_target_id; - ret = mi_lttng_writer_open_element(writer, - config_element_target_pid); + ret = get_tracker_elements( + process_attr, &element_id_tracker, &element_target_id); + if (ret) { + return ret; + } + + ret = mi_lttng_writer_open_element(writer, element_target_id); if (ret) { goto end; } - /* Writing pid number - * Special case for element all on track untrack command - * All pid is represented as wildcard * - */ - if ((int) pid == -1) { - ret = mi_lttng_writer_write_element_string(writer, - config_element_pid, - mi_lttng_element_track_untrack_all_wildcard); - } else { - ret = mi_lttng_writer_write_element_signed_int(writer, - config_element_pid, (int) pid); + ret = mi_lttng_writer_open_element(writer, config_element_type); + if (ret) { + goto end; + } + + ret = mi_lttng_writer_write_element_bool(writer, config_element_all, 1); + if (ret) { + goto end; + } + + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto end; + } + + if (!is_open) { + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto end; + } + } +end: + return ret; +} + +int mi_lttng_integral_process_attribute_value(struct mi_writer *writer, + enum lttng_process_attr process_attr, + int64_t value, + bool is_open) +{ + int ret; + const char *element_id_tracker, *element_target_id; + + ret = get_tracker_elements( + process_attr, &element_id_tracker, &element_target_id); + if (ret) { + return ret; } + + ret = mi_lttng_writer_open_element(writer, element_target_id); + if (ret) { + goto end; + } + + ret = mi_lttng_writer_open_element(writer, config_element_type); + if (ret) { + goto end; + } + + ret = mi_lttng_writer_write_element_signed_int( + writer, config_element_process_attr_id, value); + if (ret) { + goto end; + } + + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto end; + } + + if (!is_open) { + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto end; + } + } + +end: + return ret; +} + +int mi_lttng_string_process_attribute_value(struct mi_writer *writer, + enum lttng_process_attr process_attr, + const char *value, + bool is_open) + +{ + int ret; + const char *element_id_tracker, *element_target_id; + + ret = get_tracker_elements( + process_attr, &element_id_tracker, &element_target_id); + if (ret) { + return ret; + } + + ret = mi_lttng_writer_open_element(writer, element_target_id); + if (ret) { + goto end; + } + + ret = mi_lttng_writer_open_element(writer, config_element_type); + if (ret) { + goto end; + } + + ret = mi_lttng_writer_write_element_string( + writer, config_element_name, value); + if (ret) { + goto end; + } + + ret = mi_lttng_writer_close_element(writer); if (ret) { goto end; } @@ -1648,13 +1993,11 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_event_fields_open(struct mi_writer *writer) { return mi_lttng_writer_open_element(writer, mi_lttng_element_event_fields); } -LTTNG_HIDDEN int mi_lttng_event_field(struct mi_writer *writer, struct lttng_event_field *field) { @@ -1704,7 +2047,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_perf_counter_context(struct mi_writer *writer, struct lttng_event_perf_counter_ctx *perf_context) { @@ -1778,7 +2120,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_context(struct mi_writer *writer, struct lttng_event_context *context, int is_open) { @@ -1840,7 +2181,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_snapshot_output_session_name(struct mi_writer *writer, const char *session_name) { @@ -1869,9 +2209,8 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_snapshot_list_output(struct mi_writer *writer, - struct lttng_snapshot_output *output) + const struct lttng_snapshot_output *output) { int ret; @@ -1924,7 +2263,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_snapshot_del_output(struct mi_writer *writer, int id, const char *name, const char *current_session_name) { @@ -1975,7 +2313,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_snapshot_add_output(struct mi_writer *writer, const char *current_session_name, const char *n_ptr, struct lttng_snapshot_output *output) @@ -2031,7 +2368,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_snapshot_record(struct mi_writer *writer, const char *current_session_name, const char *url, const char *cmdline_ctrl_url, const char *cmdline_data_url) @@ -2078,7 +2414,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_rotation_schedule(struct mi_writer *writer, const struct lttng_rotation_schedule *schedule) { @@ -2094,13 +2429,13 @@ int mi_lttng_rotation_schedule(struct mi_writer *writer, status = lttng_rotation_schedule_periodic_get_period(schedule, &value); element_name = mi_lttng_element_rotation_schedule_periodic; - value_name = mi_lttng_element_rotation_schedule_periodic_time_us; + value_name = mi_lttng_element_rotation_schedule_periodic_time_us; break; case LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD: status = lttng_rotation_schedule_size_threshold_get_threshold( schedule, &value); element_name = mi_lttng_element_rotation_schedule_size_threshold; - value_name = mi_lttng_element_rotation_schedule_size_threshold_bytes; + value_name = mi_lttng_element_rotation_schedule_size_threshold_bytes; break; default: ret = -1; @@ -2138,7 +2473,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_rotation_schedule_result(struct mi_writer *writer, const struct lttng_rotation_schedule *schedule, bool success) @@ -2175,7 +2509,7 @@ int mi_lttng_rotation_schedule_result(struct mi_writer *writer, } /* Close rotation_schedule_result element */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(writer); if (ret) { goto end; } @@ -2323,7 +2657,6 @@ end: return ret; } -LTTNG_HIDDEN int mi_lttng_rotate(struct mi_writer *writer, const char *session_name, enum lttng_rotation_state rotation_state,