X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng.h;h=fd1ef936eb4167fb409c4c34a5cb5f55ac7b9d42;hp=6215df56734414b21d360bd7233e15c91a947d66;hb=0e1155633b00241b8b1e5a9bb683cf91b28f5eeb;hpb=50534d6fb4b1f0557b45919c8efad209f68b5e26 diff --git a/src/common/mi-lttng.h b/src/common/mi-lttng.h index 6215df567..fd1ef936e 100644 --- a/src/common/mi-lttng.h +++ b/src/common/mi-lttng.h @@ -50,41 +50,41 @@ struct mi_lttng_version { /* Strings related to command */ const char * const mi_lttng_element_command; -const char * const mi_lttng_element_command_name; const char * const mi_lttng_element_command_action; -const char * const mi_lttng_element_command_version; -const char * const mi_lttng_element_command_enable_event; -const char * const mi_lttng_element_command_list; -const char * const mi_lttng_element_command_save; -const char * const mi_lttng_element_command_load; -const char * const mi_lttng_element_command_stop; -const char * const mi_lttng_element_command_start; +const char * const mi_lttng_element_command_add_context; +const char * const mi_lttng_element_command_calibrate; const char * const mi_lttng_element_command_create; const char * const mi_lttng_element_command_destroy; -const char * const mi_lttng_element_command_calibrate; -const char * const mi_lttng_element_command_add_context; +const char * const mi_lttng_element_command_disable_channel; +const char * const mi_lttng_element_command_disable_event; const char * const mi_lttng_element_command_enable_channels; +const char * const mi_lttng_element_command_enable_event; +const char * const mi_lttng_element_command_list; +const char * const mi_lttng_element_command_load; +const char * const mi_lttng_element_command_name; +const char * const mi_lttng_element_command_output; +const char * const mi_lttng_element_command_save; const char * const mi_lttng_element_command_set_session; -const char * const mi_lttng_element_command_disable_event; -const char * const mi_lttng_element_command_disable_channel; const char * const mi_lttng_element_command_snapshot; -const char * const mi_lttng_element_command_list_snapshot; -const char * const mi_lttng_element_command_del_snapshot; -const char * const mi_lttng_element_command_add_snapshot; -const char * const mi_lttng_element_command_record_snapshot; -const char * const mi_lttng_element_command_output; +const char * const mi_lttng_element_command_snapshot_add; +const char * const mi_lttng_element_command_snapshot_del; +const char * const mi_lttng_element_command_snapshot_list; +const char * const mi_lttng_element_command_snapshot_record; +const char * const mi_lttng_element_command_start; +const char * const mi_lttng_element_command_stop; const char * const mi_lttng_element_command_success; +const char * const mi_lttng_element_command_version; /* Strings related to version command */ const char * const mi_lttng_element_version; -const char * const mi_lttng_element_version_str; -const char * const mi_lttng_element_version_web; +const char * const mi_lttng_element_version_commit; +const char * const mi_lttng_element_version_description; +const char * const mi_lttng_element_version_license; const char * const mi_lttng_element_version_major; const char * const mi_lttng_element_version_minor; -const char * const mi_lttng_element_version_license; -const char * const mi_lttng_element_version_commit; const char * const mi_lttng_element_version_patch_level; -const char * const mi_lttng_element_version_description; +const char * const mi_lttng_element_version_str; +const char * const mi_lttng_element_version_web; /* String related to a lttng_event_field */ const char * const mi_lttng_element_event_field; @@ -110,13 +110,15 @@ const char * const mi_lttng_element_save; const char * const mi_lttng_element_load; /* General element of mi_lttng */ -const char * const mi_lttng_element_type_other; -const char * const mi_lttng_element_type_integer; +const char * const mi_lttng_element_empty; +const char * const mi_lttng_element_id; +const char * const mi_lttng_element_nowrite; +const char * const mi_lttng_element_success; const char * const mi_lttng_element_type_enum; const char * const mi_lttng_element_type_float; +const char * const mi_lttng_element_type_integer; +const char * const mi_lttng_element_type_other; const char * const mi_lttng_element_type_string; -const char * const mi_lttng_element_nowrite; -const char * const mi_lttng_element_success; /* String related to loglevel */ const char * const mi_lttng_loglevel_str_alert; @@ -136,6 +138,35 @@ const char * const mi_lttng_loglevel_str_notice; const char * const mi_lttng_loglevel_str_unknown; const char * const mi_lttng_loglevel_str_warning; +/* String related to loglevel JUL */ +const char * const mi_lttng_loglevel_str_jul_all; +const char * const mi_lttng_loglevel_str_jul_config; +const char * const mi_lttng_loglevel_str_jul_fine; +const char * const mi_lttng_loglevel_str_jul_finer; +const char * const mi_lttng_loglevel_str_jul_finest; +const char * const mi_lttng_loglevel_str_jul_info; +const char * const mi_lttng_loglevel_str_jul_off; +const char * const mi_lttng_loglevel_str_jul_severe; +const char * const mi_lttng_loglevel_str_jul_warning; + +/* String related to loglevel Log4j */ +const char * const mi_lttng_loglevel_str_log4j_off; +const char * const mi_lttng_loglevel_str_log4j_fatal; +const char * const mi_lttng_loglevel_str_log4j_error; +const char * const mi_lttng_loglevel_str_log4j_warn; +const char * const mi_lttng_loglevel_str_log4j_info; +const char * const mi_lttng_loglevel_str_log4j_debug; +const char * const mi_lttng_loglevel_str_log4j_trace; +const char * const mi_lttng_loglevel_str_log4j_all; + +/* String related to loglevel Python */ +const char * const mi_lttng_loglevel_str_python_critical; +const char * const mi_lttng_loglevel_str_python_error; +const char * const mi_lttng_loglevel_str_python_warning; +const char * const mi_lttng_loglevel_str_python_info; +const char * const mi_lttng_loglevel_str_python_debug; +const char * const mi_lttng_loglevel_str_python_notset; + /* String related to loglevel type */ const char * const mi_lttng_loglevel_type_all; const char * const mi_lttng_loglevel_type_range; @@ -146,16 +177,16 @@ const char * const mi_lttng_loglevel_type_unknown; const char * const mi_lttng_element_calibrate; const char * const mi_lttng_element_calibrate_function; -/* String related to a lttng_snashot */ -const char * const mi_lttng_element_snapshots; -const char * const mi_lttng_element_snapshot_session_name; -const char * const mi_lttng_element_snapshot_n_ptr; -const char * const mi_lttng_element_snapshot_data_url; +/* String related to a lttng_snapshot */ const char * const mi_lttng_element_snapshot_ctrl_url; +const char * const mi_lttng_element_snapshot_data_url; const char * const mi_lttng_element_snapshot_max_size; +const char * const mi_lttng_element_snapshot_n_ptr; +const char * const mi_lttng_element_snapshot_session_name; +const char * const mi_lttng_element_snapshots; /* Utility string function */ -const char *mi_lttng_loglevel_string(int value); +const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain); const char *mi_lttng_logleveltype_string(enum lttng_loglevel_type value); const char *mi_lttng_eventfieldtype_string(enum lttng_event_field_type value); const char *mi_lttng_domaintype_string(enum lttng_domain_type value); @@ -322,7 +353,7 @@ int mi_lttng_sessions_open(struct mi_writer *writer); * is_open Defines whether or not the session element shall be closed. * This should be used carefully and the client * must close the session element. - * Use case: nested addtionnal information on a session + * Use case: nested additional information on a session * ex: domain,channel event. * * Returns zero if the element's value could be written. @@ -423,12 +454,13 @@ int mi_lttng_event_common_attributes(struct mi_writer *writer, * * writer An instance of a mi writer. * event single trace event. + * domain Event's domain * * Returns zero if the element's value could be written. * Negative values indicate an error. */ int mi_lttng_event_tracepoint_loglevel(struct mi_writer *writer, - struct lttng_event *event); + struct lttng_event *event, enum lttng_domain_type domain); /* * Machine interface for kernel tracepoint event with no loglevel. @@ -491,12 +523,13 @@ int mi_lttng_events_open(struct mi_writer *writer); * This should be used carefully and the client * must close the event element. * Use case: nested additional information + * domain Event's domain * * Returns zero if the element's value could be written. * Negative values indicate an error. */ int mi_lttng_event(struct mi_writer *writer, struct lttng_event *event, - int is_open); + int is_open, enum lttng_domain_type domain); /* * Machine interface for struct lttng_event_field.