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 3259bff84d8b8821b42e0a978a030ff3b1cb8920..394962054877f751a653050013a7b448e64a70b1 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,31 +21,63 @@
 #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
 
+/*
+ * LTTng DebugFS ABI structures.
+ *
+ * This is the kernel ABI copied from lttng-modules tree.
+ */
+
 enum lttng_kernel_instrumentation {
        LTTNG_KERNEL_TRACEPOINT    = 0,
        LTTNG_KERNEL_KPROBE        = 1,
        LTTNG_KERNEL_FUNCTION      = 2,
+       LTTNG_KERNEL_KRETPROBE     = 3,
 };
 
-/*
- * LTTng consumer mode
- */
-enum lttng_kernel_output {
-       LTTNG_KERNEL_SPLICE       = 0,
-       LTTNG_KERNEL_MMAP         = 1,
+enum lttng_kernel_context_type {
+       LTTNG_KERNEL_CONTEXT_PID            = 0,
+       LTTNG_KERNEL_CONTEXT_PERF_COUNTER   = 1,
+       LTTNG_KERNEL_CONTEXT_COMM           = 2,
+       LTTNG_KERNEL_CONTEXT_PRIO           = 3,
+       LTTNG_KERNEL_CONTEXT_NICE           = 4,
+       LTTNG_KERNEL_CONTEXT_VPID           = 5,
+       LTTNG_KERNEL_CONTEXT_TID            = 6,
+       LTTNG_KERNEL_CONTEXT_VTID           = 7,
+       LTTNG_KERNEL_CONTEXT_PPID           = 8,
+       LTTNG_KERNEL_CONTEXT_VPPID          = 9,
+};
+
+/* Perf counter attributes */
+struct lttng_kernel_perf_counter_ctx {
+       uint32_t type;
+       uint64_t config;
+       char name[LTTNG_SYM_NAME_LEN];
+};
+
+/* Event/Channel context */
+struct lttng_kernel_context {
+       enum lttng_kernel_context_type ctx;
+       union {
+               struct lttng_kernel_perf_counter_ctx perf_counter;
+       } u;
+};
+
+struct lttng_kernel_kretprobe {
+       uint64_t addr;
+
+       uint64_t offset;
+       char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
 /*
- * LTTng DebugFS ABI structures.
- *
- * This is the kernel ABI copied from lttng-modules tree.
+ * Either addr is used, or symbol_name and offset.
  */
-
-/* Either addr is used or symbol_name and offset. */
 struct lttng_kernel_kprobe {
        uint64_t addr;
 
@@ -53,7 +85,8 @@ struct lttng_kernel_kprobe {
        char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
-struct lttng_kernel_function_tracer {
+/* Function tracer */
+struct lttng_kernel_function {
        char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
@@ -62,8 +95,9 @@ 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_tracer ftrace;
+               struct lttng_kernel_function ftrace;
        } u;
 };
 
@@ -73,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 */