tracectl cleanup v3

[ust.git] / libust / tracer.h

diff --git a/libust/tracer.h b/libust/tracer.h
index e4ff21e4044da00aa9e347a1eea0d9cab2ba41e3..c5df6ece9c33a49751596c39134f193a5861a500 100644 (file)
--- a/libust/tracer.h
+++ b/libust/tracer.h
@@ -26,12 +26,13 @@
 
 #include <sys/types.h>
 #include <stdarg.h>
-#include <ust/kernelcompat.h>
+#include <ust/marker.h>
+#include <ust/probe.h>
+#include <ust/core.h>
 #include "channels.h"
 #include "tracercore.h"
 #include "tracerconst.h"
-#include <ust/marker.h>
-#include <ust/probe.h>
+#include "buffers.h"
 
 /* Number of bytes to log with a read/write event */
 #define LTT_LOG_RW_SIZE                        32L
@@ -64,7 +65,8 @@ struct ltt_serialize_closure {
 extern size_t ltt_serialize_data(struct ust_buffer *buf, size_t buf_offset,
                        struct ltt_serialize_closure *closure,
                        void *serialize_private,
-                       int *largest_align, const char *fmt, va_list *args);
+                       unsigned int stack_pos_ctx, int *largest_align,
+                       const char *fmt, va_list *args);
 
 struct ltt_probe_private_data {
        struct ust_trace *trace;        /*
@@ -85,6 +87,12 @@ enum ltt_channels {
        LTT_CHANNEL_UST,
 };
 
+struct chan_info_struct {
+       const char *name;
+       unsigned int def_subbufsize;
+       unsigned int def_subbufcount;
+};
+
 struct ltt_active_marker {
        struct list_head node;          /* active markers list */
        const char *channel;
@@ -213,8 +221,8 @@ struct ltt_subbuffer_header {
                                         * used all along the trace.
                                         */
        uint32_t freq_scale;            /* Frequency scaling (divisor) */
-       uint32_t lost_size;             /* Size unused at end of subbuffer */
-       uint32_t buf_size;              /* Size of this subbuffer */
+       uint32_t data_size;             /* Size of data in subbuffer */
+       uint32_t sb_size;               /* Subbuffer size (including padding) */
        uint32_t events_lost;           /*
                                         * Events lost in this subbuffer since
                                         * the beginning of the trace.
@@ -240,8 +248,7 @@ static __inline__ size_t ltt_subbuffer_header_size(void)
        return offsetof(struct ltt_subbuffer_header, header_end);
 }
 
-extern size_t ltt_write_event_header_slow(struct ust_trace *trace,
-               struct ust_channel *channel,
+extern size_t ltt_write_event_header_slow(struct ust_channel *channel,
                struct ust_buffer *buf, long buf_offset,
                u16 eID, u32 event_size,
                u64 tsc, unsigned int rflags);
@@ -263,8 +270,7 @@ extern size_t ltt_write_event_header_slow(struct ust_trace *trace,
  *
  * returns : offset where the event data must be written.
  */
-static __inline__ size_t ltt_write_event_header(struct ust_trace *trace,
-               struct ust_channel *channel,
+static __inline__ size_t ltt_write_event_header(struct ust_channel *chan,
                struct ust_buffer *buf, long buf_offset,
                u16 eID, u32 event_size,
                u64 tsc, unsigned int rflags)
@@ -275,11 +281,14 @@ static __inline__ size_t ltt_write_event_header(struct ust_trace *trace,
                goto slow_path;
 
        header.id_time = eID << LTT_TSC_BITS;
+       header.id_time |= (u32)tsc & LTT_TSC_MASK;
+       ust_buffers_write(buf, buf_offset, &header, sizeof(header));
+       buf_offset += sizeof(header);
 
        return buf_offset;
 
 slow_path:
-       return ltt_write_event_header_slow(trace, channel, buf, buf_offset,
+       return ltt_write_event_header_slow(chan, buf, buf_offset,
                                eID, event_size, tsc, rflags);
 }
 
@@ -313,7 +322,7 @@ slow_path:
 #define LTT_DEFAULT_N_SUBBUFS_HIGH     2
 #define LTT_TRACER_MAGIC_NUMBER                0x00D6B7ED
 #define LTT_TRACER_VERSION_MAJOR       2
-#define LTT_TRACER_VERSION_MINOR       3
+#define LTT_TRACER_VERSION_MINOR       6
 
 /**
  * ust_write_trace_header - Write trace header
@@ -334,6 +343,21 @@ static __inline__ void ltt_write_trace_header(struct ust_trace *trace,
        header->freq_scale = trace->freq_scale;
 }
 
+static __inline__ int ust_get_cpu(void)
+{
+#ifndef UST_VALGRIND
+       return sched_getcpu();
+#else
+       /* Valgrind does not support the sched_getcpu() vsyscall.
+        * It causes it to detect a segfault in the program and stop it.
+        * So if we want to check libust with valgrind, we have to refrain
+        * from using this call. TODO: it would probably be better to return
+        * other values too, to better test it.
+        */
+       return 0;
+#endif
+}
+
 
 /*
  * Size reserved for high priority events (interrupts, NMI, BH) at the end of a
@@ -381,7 +405,7 @@ extern int ltt_trace_set_channel_enable(const char *trace_name,
 extern int ltt_trace_set_channel_overwrite(const char *trace_name,
                const char *channel_name, unsigned int overwrite);
 extern int ltt_trace_alloc(const char *trace_name);
-extern int ltt_trace_destroy(const char *trace_name);
+extern int ltt_trace_destroy(const char *trace_name, int drop);
 extern int ltt_trace_start(const char *trace_name);
 extern int ltt_trace_stop(const char *trace_name);