X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Flttng%2Flttng.h;h=e59b2d31d41c6ad18c1b936f41cf47679454d50c;hb=34c40351d4b1341e24944e4edf2174e58eefae1a;hp=85fdfaa257605f36ebbd7d99030e8f3ca32e97b9;hpb=4634f12e972571bf8ab9cb3892e1d472aa7e0ddc;p=lttng-tools.git

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index 85fdfaa25..e59b2d31d 100644
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -23,7 +23,17 @@
 #define LTTNG_H
 
 #include <limits.h>
+/*
+ * Necessary to include the fixed width type limits on glibc versions older
+ * than 2.18 when building with a C++ compiler.
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
 #include <stdint.h>
+#undef __STDC_LIMIT_MACROS
+#else /* #ifndef __STDC_LIMIT_MACROS */
+#include <stdint.h>
+#endif /* #else #ifndef __STDC_LIMIT_MACROS */
 #include <sys/types.h>
 
 /* Error codes that can be returned by API calls */
@@ -95,6 +105,22 @@ enum lttng_loglevel {
 	LTTNG_LOGLEVEL_DEBUG                  = 14,
 };
 
+/*
+ * Available loglevels for the JUL domain. Those are an exact map from the
+ * class java.util.logging.Level.
+ */
+enum lttng_loglevel_jul {
+	LTTNG_LOGLEVEL_JUL_OFF                = INT32_MAX,
+	LTTNG_LOGLEVEL_JUL_SEVERE             = 1000,
+	LTTNG_LOGLEVEL_JUL_WARNING            = 900,
+	LTTNG_LOGLEVEL_JUL_INFO               = 800,
+	LTTNG_LOGLEVEL_JUL_CONFIG             = 700,
+	LTTNG_LOGLEVEL_JUL_FINE               = 500,
+	LTTNG_LOGLEVEL_JUL_FINER              = 400,
+	LTTNG_LOGLEVEL_JUL_FINEST             = 300,
+	LTTNG_LOGLEVEL_JUL_ALL                = INT32_MIN,
+};
+
 /*
  * LTTng consumer mode
  */
@@ -106,7 +132,7 @@ enum lttng_event_output {
 /* Event context possible type */
 enum lttng_event_context_type {
 	LTTNG_EVENT_CONTEXT_PID               = 0,
-	LTTNG_EVENT_CONTEXT_PERF_COUNTER      = 1,
+	LTTNG_EVENT_CONTEXT_PERF_COUNTER      = 1,	/* Backward compat. */
 	LTTNG_EVENT_CONTEXT_PROCNAME          = 2,
 	LTTNG_EVENT_CONTEXT_PRIO              = 3,
 	LTTNG_EVENT_CONTEXT_NICE              = 4,
@@ -118,6 +144,8 @@ enum lttng_event_context_type {
 	LTTNG_EVENT_CONTEXT_PTHREAD_ID        = 10,
 	LTTNG_EVENT_CONTEXT_HOSTNAME          = 11,
 	LTTNG_EVENT_CONTEXT_IP                = 12,
+	LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER  = 13,
+	LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER = 14,
 };
 
 enum lttng_calibrate_type {