X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng.h;h=fd1ef936eb4167fb409c4c34a5cb5f55ac7b9d42;hp=476310ba404c5655345e1b6e3699ac5b643b2fce;hb=0e1155633b00241b8b1e5a9bb683cf91b28f5eeb;hpb=f4a088f723845847249e069fea4d0c1b579d5fd1

diff --git a/src/common/mi-lttng.h b/src/common/mi-lttng.h
index 476310ba4..fd1ef936e 100644
--- a/src/common/mi-lttng.h
+++ b/src/common/mi-lttng.h
@@ -138,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;
@@ -148,7 +177,7 @@ 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 */
+/* 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;
@@ -157,7 +186,7 @@ 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);
@@ -324,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.
@@ -425,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.
@@ -493,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.