Makes kprobe attribute specific to kernel

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
index 3259bff84d8b8821b42e0a978a030ff3b1cb8920..29731748501aee899240b27b2976f218e26b1bf3 100644 (file)
--- a/include/lttng-kernel.h
+++ b/include/lttng-kernel.h
@@ -45,15 +45,8 @@ enum lttng_kernel_output {
  * This is the kernel ABI copied from lttng-modules tree.
  */
 
  * This is the kernel ABI copied from lttng-modules tree.
  */
 

-/* Either addr is used or symbol_name and offset. */
-struct lttng_kernel_kprobe {
-       uint64_t addr;
-
-       uint64_t offset;
-       char symbol_name[LTTNG_SYM_NAME_LEN];
-};
-
-struct lttng_kernel_function_tracer {
+/* Function tracer */
+struct lttng_kernel_function_attr {

        char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
        char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 


@@ -62,8 +55,8 @@ struct lttng_kernel_event {
        enum lttng_kernel_instrumentation instrumentation;
        /* Per instrumentation type configuration */
        union {
        enum lttng_kernel_instrumentation instrumentation;
        /* Per instrumentation type configuration */
        union {

-               struct lttng_kernel_kprobe kprobe;
-               struct lttng_kernel_function_tracer ftrace;
+               struct lttng_kernel_kprobe_attr kprobe;
+               struct lttng_kernel_function_attr ftrace;

        } u;
 };
 
        } u;
 };
 

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index 448bd9fdcf944f432a757a7622286a3c3323bdaf..ac7c435044d47a481bb1c29c081b039e75115127 100644 (file)
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -94,9 +94,9 @@ struct lttng_kernel_context {
 };
 
 /*
 };
 
 /*

- * Either addr is used or symbol_name and offset.
+ * Kernel Kprobe. Either addr is used or symbol_name and offset.

  */
  */

-struct lttng_event_kprobe_attr {
+struct lttng_kernel_kprobe_attr {

        uint64_t addr;
 
        uint64_t offset;
        uint64_t addr;
 
        uint64_t offset;


@@ -118,7 +118,7 @@ struct lttng_event {
        enum lttng_event_type type;
        /* Per event type configuration */
        union {
        enum lttng_event_type type;
        /* Per event type configuration */
        union {

-               struct lttng_event_kprobe_attr kprobe;
+               struct lttng_kernel_kprobe_attr kprobe;

                struct lttng_event_function_attr ftrace;
        } attr;
 };
                struct lttng_event_function_attr ftrace;
        } attr;
 };


@@ -132,7 +132,7 @@ struct lttng_channel_attr {
        uint64_t num_subbuf;                /* power of 2 */
        unsigned int switch_timer_interval; /* usec */
        unsigned int read_timer_interval;   /* usec */
        uint64_t num_subbuf;                /* power of 2 */
        unsigned int switch_timer_interval; /* usec */
        unsigned int read_timer_interval;   /* usec */

-       enum lttng_event_output output;    /* splice, mmap */
+       enum lttng_event_output output;     /* splice, mmap */

 };
 
 /*
 };
 
 /*