ust: continue

[ust.git] / libtracing / tracer.h

diff --git a/libtracing/tracer.h b/libtracing/tracer.h
index 6e98f2b7e0ad64c19e0107602a7a168fb4420c4d..cff0705c1020ef15e95a0e93a7cff07d7f449e35 100644 (file)
--- a/libtracing/tracer.h
+++ b/libtracing/tracer.h
@@ -28,6 +28,8 @@
 #include "list.h"
 #include "kernelcompat.h"
 #include "channels.h"
+#include "tracercore.h"
+#include "marker.h"
 
 /* Number of bytes to log with a read/write event */
 #define LTT_LOG_RW_SIZE                        32L
@@ -68,13 +70,13 @@ size_t ltt_serialize_data(struct rchan_buf *buf, size_t buf_offset,
                        void *serialize_private,
                        int *largest_align, const char *fmt, va_list *args);
 
-//ust// struct ltt_available_probe {
-//ust//        const char *name;               /* probe name */
-//ust//        const char *format;
-//ust//        marker_probe_func *probe_func;
-//ust//        ltt_serialize_cb callbacks[LTT_NR_CALLBACKS];
-//ust//        struct list_head node;          /* registered probes list */
-//ust// };
+struct ltt_available_probe {
+       const char *name;               /* probe name */
+       const char *format;
+       marker_probe_func *probe_func;
+       ltt_serialize_cb callbacks[LTT_NR_CALLBACKS];
+       struct list_head node;          /* registered probes list */
+};
 
 struct ltt_probe_private_data {
        struct ltt_trace_struct *trace; /*
@@ -153,9 +155,9 @@ struct ltt_trace_ops {
        int (*user_blocking) (struct ltt_trace_struct *trace,
                                unsigned int index, size_t data_size,
                                struct user_dbg_data *dbg);
-//ust//        /* End of first 32 bytes cacheline */
-//ust//        int (*create_dirs) (struct ltt_trace_struct *new_trace);
-//ust//        void (*remove_dirs) (struct ltt_trace_struct *new_trace);
+       /* End of first 32 bytes cacheline */
+       int (*create_dirs) (struct ltt_trace_struct *new_trace);
+       void (*remove_dirs) (struct ltt_trace_struct *new_trace);
        int (*create_channel) (const char *trace_name,
                                struct ltt_trace_struct *trace,
                                struct dentry *dir, const char *channel_name,
@@ -332,7 +334,7 @@ static inline unsigned char ltt_get_header_size(
        size_t orig_offset = offset;
        size_t padding;
 
-       BUILD_BUG_ON(sizeof(struct ltt_event_header) != sizeof(u32));
+//ust//        BUILD_BUG_ON(sizeof(struct ltt_event_header) != sizeof(u32));
 
        padding = ltt_align(offset, sizeof(struct ltt_event_header));
        offset += padding;