X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng.c;h=e8236d841300650a4f8b68b92a8dbf6e6ac5416e;hp=f77b6b648c30b541817c237cf0cfdb59f2f2afb0;hb=dbd512ea8aa5349849aeeccda6130aa9e28cf23c;hpb=e10b6a1c2fad4f300523cf8cfb57aba2bfa101c0 diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c index f77b6b648..e8236d841 100644 --- a/src/common/mi-lttng.c +++ b/src/common/mi-lttng.c @@ -19,7 +19,9 @@ #define _LGPL_SOURCE #include +#include #include +#include #include "mi-lttng.h" #include @@ -28,25 +30,23 @@ #define MI_SCHEMA_MINOR_VERSION 0 /* Machine interface namespace URI */ -const char * const mi_lttng_xmlns = "xmlns"; -const char * const mi_lttng_ns_uri = "http://lttng.org/xml/ns/lttng-mi"; -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 = - "http://lttng.org/xml/ns/lttng-mi" " " - "http://lttng.org/xml/schemas/lttng-mi/" XSTR(MI_SCHEMA_MAJOR_VERSION) +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 = + 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"; -const char * const mi_lttng_schema_version = "schemaVersion"; -const char * const mi_lttng_schema_version_value = XSTR(MI_SCHEMA_MAJOR_VERSION) +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) "." 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_calibrate = "calibrate"; 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"; @@ -55,6 +55,10 @@ 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_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_name = "name"; const char * const mi_lttng_element_command_output = "output"; const char * const mi_lttng_element_command_save = "save"; @@ -70,6 +74,9 @@ 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"; +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"; /* Strings related to version command */ const char * const mi_lttng_element_version = "version"; @@ -86,13 +93,8 @@ const char * const mi_lttng_element_version_web = "url"; const char * const mi_lttng_element_event_field = "event_field"; const char * const mi_lttng_element_event_fields = "event_fields"; -/* String related to lttng_event_context */ -const char * const mi_lttng_context_type_perf_counter = "PERF_COUNTER"; -const char * const mi_lttng_context_type_perf_cpu_counter = "PERF_CPU_COUNTER"; -const char * const mi_lttng_context_type_perf_thread_counter = "PERF_THREAD_COUNTER"; - /* String related to lttng_event_perf_counter_ctx */ -const char * const mi_lttng_element_perf_counter_context = "perf_counter_context"; +const char * const mi_lttng_element_perf_counter_context = "perf"; /* Strings related to pid */ const char * const mi_lttng_element_pid_id = "id"; @@ -102,6 +104,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"; /* General elements of mi_lttng */ const char * const mi_lttng_element_empty = ""; @@ -167,10 +171,6 @@ const char * const mi_lttng_loglevel_type_range = "RANGE"; const char * const mi_lttng_loglevel_type_single = "SINGLE"; const char * const mi_lttng_loglevel_type_unknown = "UNKNOWN"; -/* String related to lttng_calibrate */ -const char * const mi_lttng_element_calibrate = "calibrate"; -const char * const mi_lttng_element_calibrate_function = "FUNCTION"; - /* String related to a lttng_snapshot_output */ const char * const mi_lttng_element_snapshot_ctrl_url = "ctrl_url"; const char * const mi_lttng_element_snapshot_data_url = "data_url"; @@ -182,6 +182,26 @@ 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"; + +/* String related to rotate command */ +LTTNG_HIDDEN const char * const mi_lttng_element_rotation = "rotation"; +LTTNG_HIDDEN const char * const mi_lttng_element_rotations = "rotations"; +LTTNG_HIDDEN const char * const mi_lttng_element_rotate_status = "status"; +LTTNG_HIDDEN const char * const mi_lttng_element_rotation_schedule = "rotation_schedule"; + +/* String related to add-context command */ +LTTNG_HIDDEN 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; /* This is a merge of jul loglevel and regular loglevel * Those should never overlap by definition @@ -298,10 +318,9 @@ const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain) return mi_lttng_loglevel_str_unknown; } break; + default: + return mi_lttng_loglevel_str_unknown; } - - /* Reaching this means the domain is unknown. */ - return mi_lttng_loglevel_str_unknown; } LTTNG_HIDDEN @@ -342,18 +361,12 @@ const char *mi_lttng_eventtype_string(enum lttng_event_type value) } } -LTTNG_HIDDEN +static const char *mi_lttng_event_contexttype_string(enum lttng_event_context_type val) { switch (val) { case LTTNG_EVENT_CONTEXT_PID: return config_event_context_pid; - case LTTNG_EVENT_CONTEXT_PERF_COUNTER: - return mi_lttng_context_type_perf_counter; - case LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER: - return mi_lttng_context_type_perf_thread_counter; - case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER: - return mi_lttng_context_type_perf_cpu_counter; case LTTNG_EVENT_CONTEXT_PROCNAME: return config_event_context_procname; case LTTNG_EVENT_CONTEXT_PRIO: @@ -376,6 +389,18 @@ const char *mi_lttng_event_contexttype_string(enum lttng_event_context_type val) return config_event_context_hostname; case LTTNG_EVENT_CONTEXT_IP: return config_event_context_ip; + case LTTNG_EVENT_CONTEXT_INTERRUPTIBLE: + return config_event_context_interruptible; + case LTTNG_EVENT_CONTEXT_PREEMPTIBLE: + return config_event_context_preemptible; + case LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE: + return config_event_context_need_reschedule; + case LTTNG_EVENT_CONTEXT_MIGRATABLE: + return config_event_context_migratable; + case LTTNG_EVENT_CONTEXT_CALLSTACK_USER: + return config_event_context_callstack_user; + case LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL: + return config_event_context_callstack_kernel; default: return NULL; } @@ -437,22 +462,6 @@ const char *mi_lttng_buffertype_string(enum lttng_buffer_type value) } } -LTTNG_HIDDEN -const char *mi_lttng_calibratetype_string(enum lttng_calibrate_type val) -{ - const char *ret; - - switch (val) { - case LTTNG_CALIBRATE_FUNCTION: - ret = mi_lttng_element_calibrate_function; - break; - default: - ret = mi_lttng_element_empty; - break; - } - return ret; -} - LTTNG_HIDDEN struct mi_writer *mi_lttng_writer_create(int fd_output, int mi_output_type) { @@ -517,7 +526,7 @@ int mi_lttng_writer_command_open(struct mi_writer *writer, const char *command) } ret = config_writer_write_attribute(writer->writer, - mi_lttng_xmlns, mi_lttng_ns_uri); + mi_lttng_xmlns, DEFAULT_LTTNG_MI_NAMESPACE); if (ret) { goto end; } @@ -877,9 +886,35 @@ int mi_lttng_channel_attr(struct mi_writer *writer, struct lttng_channel_attr *attr) { int ret = 0; + struct lttng_channel *chan = caa_container_of(attr, + struct lttng_channel, attr); + uint64_t discarded_events, lost_packets, monitor_timer_interval; + int64_t blocking_timeout; assert(attr); + ret = lttng_channel_get_discarded_event_count(chan, &discarded_events); + if (ret) { + goto end; + } + + ret = lttng_channel_get_lost_packet_count(chan, &lost_packets); + if (ret) { + goto end; + } + + ret = lttng_channel_get_monitor_timer_interval(chan, + &monitor_timer_interval); + if (ret) { + goto end; + } + + ret = lttng_channel_get_blocking_timeout(chan, + &blocking_timeout); + if (ret) { + goto end; + } + /* Opening Attributes */ ret = mi_lttng_writer_open_element(writer, config_element_attributes); if (ret) { @@ -926,6 +961,22 @@ int mi_lttng_channel_attr(struct mi_writer *writer, goto end; } + /* Monitor timer interval in usec */ + ret = mi_lttng_writer_write_element_unsigned_int(writer, + config_element_monitor_timer_interval, + monitor_timer_interval); + if (ret) { + goto end; + } + + /* Retry timeout in usec */ + ret = mi_lttng_writer_write_element_signed_int(writer, + config_element_blocking_timeout, + blocking_timeout); + if (ret) { + goto end; + } + /* Event output */ ret = mi_lttng_writer_write_element_string(writer, config_element_output_type, @@ -958,6 +1009,22 @@ int mi_lttng_channel_attr(struct mi_writer *writer, goto end; } + /* Discarded events */ + ret = mi_lttng_writer_write_element_unsigned_int(writer, + config_element_discarded_events, + discarded_events); + if (ret) { + goto end; + } + + /* Lost packets */ + ret = mi_lttng_writer_write_element_unsigned_int(writer, + config_element_lost_packets, + lost_packets); + if (ret) { + goto end; + } + /* Closing attributes */ ret = mi_lttng_writer_close_element(writer); if (ret) { @@ -1003,7 +1070,7 @@ int mi_lttng_event_common_attributes(struct mi_writer *writer, } /* Event filter expression */ - ret = lttng_event_get_filter_string(event, &filter_expression); + ret = lttng_event_get_filter_expression(event, &filter_expression); if (ret) { goto end; } @@ -1021,6 +1088,51 @@ end: return ret; } +static int write_event_exclusions(struct mi_writer *writer, + struct lttng_event *event) +{ + int i; + int ret; + int exclusion_count; + + /* Open event exclusions */ + ret = mi_lttng_writer_open_element(writer, config_element_exclusions); + if (ret) { + goto end; + } + + exclusion_count = lttng_event_get_exclusion_name_count(event); + if (exclusion_count < 0) { + ret = exclusion_count; + goto end; + } + + for (i = 0; i < exclusion_count; i++) { + const char *name; + + ret = lttng_event_get_exclusion_name(event, i, &name); + if (ret) { + /* Close exclusions */ + mi_lttng_writer_close_element(writer); + goto end; + } + + ret = mi_lttng_writer_write_element_string(writer, + config_element_exclusion, name); + if (ret) { + /* Close exclusions */ + mi_lttng_writer_close_element(writer); + goto end; + } + } + + /* Close exclusions */ + ret = mi_lttng_writer_close_element(writer); + +end: + return ret; +} + LTTNG_HIDDEN int mi_lttng_event_tracepoint_loglevel(struct mi_writer *writer, struct lttng_event *event, enum lttng_domain_type domain) @@ -1043,12 +1155,8 @@ int mi_lttng_event_tracepoint_loglevel(struct mi_writer *writer, goto end; } - /* event exclusion filter */ - ret = mi_lttng_writer_write_element_bool(writer, - config_element_exclusion, event->exclusion); - if (ret) { - goto end; - } + /* Event exclusions */ + ret = write_event_exclusions(writer, event); end: return ret; @@ -1059,8 +1167,7 @@ int mi_lttng_event_tracepoint_no_loglevel(struct mi_writer *writer, struct lttng_event *event) { /* event exclusion filter */ - return mi_lttng_writer_write_element_bool(writer, - config_element_exclusion, event->exclusion); + return write_event_exclusions(writer, event); } LTTNG_HIDDEN @@ -1358,25 +1465,74 @@ end: } LTTNG_HIDDEN -int mi_lttng_calibrate(struct mi_writer *writer, - struct lttng_calibrate *calibrate) +int mi_lttng_perf_counter_context(struct mi_writer *writer, + struct lttng_event_perf_counter_ctx *perf_context) { int ret; - /* Open calibrate element */ - ret = mi_lttng_writer_open_element(writer, mi_lttng_element_calibrate); + /* Open perf_counter_context */ + ret = mi_lttng_writer_open_element(writer, + mi_lttng_element_perf_counter_context); if (ret) { goto end; } - /* Calibration type */ - ret = mi_lttng_writer_write_element_string(writer, config_element_type, - mi_lttng_calibratetype_string(calibrate->type)); + /* Type */ + ret = mi_lttng_writer_write_element_unsigned_int(writer, + config_element_type, perf_context->type); + if (ret) { + goto end; + } + + /* Config */ + ret = mi_lttng_writer_write_element_unsigned_int(writer, + config_element_config, perf_context->config); + if (ret) { + goto end; + } + + /* Name of the perf counter */ + ret = mi_lttng_writer_write_element_string(writer, + config_element_name, perf_context->name); + if (ret) { + goto end; + } + + /* Close perf_counter_context */ + ret = mi_lttng_writer_close_element(writer); +end: + return ret; +} + +static +int mi_lttng_app_context(struct mi_writer *writer, + const char *provider_name, const char *ctx_name) +{ + int ret; + + /* Open app */ + ret = mi_lttng_writer_open_element(writer, + config_element_context_app); if (ret) { goto end; } - /* Closing calibrate element */ + /* provider_name */ + ret = mi_lttng_writer_write_element_string(writer, + config_element_context_app_provider_name, + provider_name); + if (ret) { + goto end; + } + + /* ctx_name */ + ret = mi_lttng_writer_write_element_string(writer, + config_element_context_app_ctx_name, ctx_name); + if (ret) { + goto end; + } + + /* Close app */ ret = mi_lttng_writer_close_element(writer); end: return ret; @@ -1387,39 +1543,53 @@ int mi_lttng_context(struct mi_writer *writer, struct lttng_event_context *context, int is_open) { int ret; - const char *type_string; - struct lttng_event_perf_counter_ctx *perf_context; + /* Open context */ ret = mi_lttng_writer_open_element(writer , config_element_context); if (ret) { goto end; } - type_string = mi_lttng_event_contexttype_string(context->ctx); - if (!type_string) { - ret = -LTTNG_ERR_INVALID; - goto end; - } - - /* Print context type */ - ret = mi_lttng_writer_write_element_string(writer, config_element_type, - type_string); - /* Special case for PERF_*_COUNTER * print the lttng_event_perf_counter_ctx*/ switch (context->ctx) { case LTTNG_EVENT_CONTEXT_PERF_COUNTER: case LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER: case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER: - perf_context = &context->u.perf_counter; + { + struct lttng_event_perf_counter_ctx *perf_context = + &context->u.perf_counter; ret = mi_lttng_perf_counter_context(writer, perf_context); if (ret) { goto end; } break; + } + case LTTNG_EVENT_CONTEXT_APP_CONTEXT: + { + ret = mi_lttng_app_context(writer, + context->u.app_ctx.provider_name, + context->u.app_ctx.ctx_name); + if (ret) { + goto end; + } + break; + } default: + { + const char *type_string = mi_lttng_event_contexttype_string( + context->ctx); + if (!type_string) { + ret = -LTTNG_ERR_INVALID; + goto end; + } + + /* Print context type */ + ret = mi_lttng_writer_write_element_string(writer, + config_element_type, type_string); break; } + } /* Close context */ if (!is_open) { @@ -1430,46 +1600,6 @@ end: return ret; } -LTTNG_HIDDEN -int mi_lttng_perf_counter_context(struct mi_writer *writer, - struct lttng_event_perf_counter_ctx *perf_context) -{ - int ret; - - /* Open perf_counter_context */ - ret = mi_lttng_writer_open_element(writer, - mi_lttng_element_perf_counter_context); - if (ret) { - goto end; - } - - /* Type */ - ret = mi_lttng_writer_write_element_unsigned_int(writer, - config_element_type, perf_context->type); - if (ret) { - goto end; - } - - /* Config */ - ret = mi_lttng_writer_write_element_unsigned_int(writer, - config_element_config, perf_context->config); - if (ret) { - goto end; - } - - /* Name of the perf counter */ - ret = mi_lttng_writer_write_element_string(writer, - config_element_name, perf_context->name); - if (ret) { - goto end; - } - - /* Close perf_counter_context */ - ret = mi_lttng_writer_close_element(writer); -end: - return ret; -} - LTTNG_HIDDEN int mi_lttng_snapshot_output_session_name(struct mi_writer *writer, const char *session_name)