usertrace fast work

[lttv.git] / usertrace-fast / ltt-usertrace-fast.h

diff --git a/usertrace-fast/ltt-usertrace-fast.h b/usertrace-fast/ltt-usertrace-fast.h
index ac509c24a8933bf19bbac5b57b3f3f3cd03a0506..dd3bd02591d077dbacb2d5f8e755e8c73d227d09 100644 (file)
--- a/usertrace-fast/ltt-usertrace-fast.h
+++ b/usertrace-fast/ltt-usertrace-fast.h
@@ -10,6 +10,7 @@
 
 #include <errno.h>
 #include <asm/atomic.h>
+#include <pthread.h>
 
 #ifndef        LTT_BUF_SIZE_CPU
 #define LTT_BUF_SIZE_CPU 1048576
@@ -27,21 +28,27 @@ struct ltt_buf {
        atomic_t        events_lost;
 };
 
-struct lttng_trace_info {
-       struct _pthread_cleanup_buffer cleanup;
+struct ltt_trace_info {
        int init;
        int filter;
+#ifndef LTT_USE_THREADS
+       pid_t daemon_id;
+#else
+       pthread_t daemon_id;
+#endif //LTT_USE_THREADS
        atomic_t nesting;
        struct {
                struct ltt_buf facilities;
-               char facilities_buf[LTT_BUF_SIZE_FACILITIES] __attribute__ ((aligned (8)));
                struct ltt_buf cpu;
+               char facilities_buf[LTT_BUF_SIZE_FACILITIES] __attribute__ ((aligned (8)));
                char cpu_buf[LTT_BUF_SIZE_CPU] __attribute__ ((aligned (8)));
        } channel;
 };
 
-extern __thread struct lttng_trace_info lttng_trace_info;
+extern __thread struct ltt_trace_info *thread_trace_info;
 
 void ltt_thread_init(void);
 
+void ltt_usertrace_fast_buffer_switch(void);
+
 #endif //_LTT_USERTRACE_FAST_H