Minor fixes to header files

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

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
index 2d88012b079c2d4a5070fdf6ec11d79c84ce2e46..394962054877f751a653050013a7b448e64a70b1 100644 (file)
--- a/include/lttng-kernel.h
+++ b/include/lttng-kernel.h
@@ -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
 
@@ -35,6 +37,7 @@ enum lttng_kernel_instrumentation {
        LTTNG_KERNEL_TRACEPOINT    = 0,
        LTTNG_KERNEL_KPROBE        = 1,
        LTTNG_KERNEL_FUNCTION      = 2,
+       LTTNG_KERNEL_KRETPROBE     = 3,
 };
 
 enum lttng_kernel_context_type {
@@ -54,7 +57,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 +68,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 +95,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 +107,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 */