Cleanup configure.ac

[lttng-tools.git] / include / lttng-kernel.h

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
index dd28ff178763c6aea24247517a9d3e1b7ceb166e..ac9370d2f48f5f3b35bc22de1c8d22fbff19b2bb 100644 (file)
--- a/include/lttng-kernel.h
+++ b/include/lttng-kernel.h
@@ -5,8 +5,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,9 @@
 #ifndef _LTTNG_KERNEL_H
 #define _LTTNG_KERNEL_H
 
-#include "lttng-share.h"
+#include <stdint.h>
+
+#include <lttng-share.h>
 
 #define LTTNG_SYM_NAME_LEN  128
 
@@ -32,9 +34,13 @@
  */
 
 enum lttng_kernel_instrumentation {
+       LTTNG_KERNEL_ALL           = -1,   /* Used within lttng-tools */
        LTTNG_KERNEL_TRACEPOINT    = 0,
        LTTNG_KERNEL_KPROBE        = 1,
        LTTNG_KERNEL_FUNCTION      = 2,
+       LTTNG_KERNEL_KRETPROBE     = 3,
+       LTTNG_KERNEL_NOOP          = 4,    /* not hooked */
+       LTTNG_KERNEL_SYSCALL       = 5,
 };
 
 enum lttng_kernel_context_type {
@@ -54,7 +60,7 @@ enum lttng_kernel_context_type {
 struct lttng_kernel_perf_counter_ctx {
        uint32_t type;
        uint64_t config;
-       char name[LTTNG_SYMBOL_NAME_LEN];
+       char name[LTTNG_SYM_NAME_LEN];
 };
 
 /* Event/Channel context */
@@ -65,6 +71,13 @@ struct lttng_kernel_context {
        } u;
 };
 
+struct lttng_kernel_kretprobe {
+       uint64_t addr;
+
+       uint64_t offset;
+       char symbol_name[LTTNG_SYM_NAME_LEN];
+};
+
 /*
  * Either addr is used, or symbol_name and offset.
  */
@@ -85,6 +98,7 @@ struct lttng_kernel_event {
        enum lttng_kernel_instrumentation instrumentation;
        /* Per instrumentation type configuration */
        union {
+               struct lttng_kernel_kretprobe kretprobe;
                struct lttng_kernel_kprobe kprobe;
                struct lttng_kernel_function ftrace;
        } u;
@@ -96,4 +110,12 @@ struct lttng_kernel_tracer_version {
        uint32_t sublevel;
 };
 
+enum lttng_kernel_calibrate_type {
+       LTTNG_KERNEL_CALIBRATE_KRETPROBE,
+};
+
+struct lttng_kernel_calibrate {
+       enum lttng_kernel_calibrate_type type;  /* type (input) */
+};
+
 #endif /* _LTTNG_KERNEL_H */