X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracer.h;h=2f489f6c7df314a94fdb9208264caec8b57ce6b9;hb=8f09cb9340387a52b483752c5d2d6c36035b26bc;hp=cc3974e2a9d45ef0febc077b153ffa7637fe2ad3;hpb=31d392f1a565abd0751302d8c52b9f9e695e051e;p=ust.git

diff --git a/libust/tracer.h b/libust/tracer.h
index cc3974e..2f489f6 100644
--- a/libust/tracer.h
+++ b/libust/tracer.h
@@ -26,12 +26,12 @@
 
 #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 */
@@ -65,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;	/*
@@ -86,8 +87,14 @@ 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 */
+	struct cds_list_head node;		/* active markers list */
 	const char *channel;
 	const char *name;
 	const char *format;
@@ -151,7 +158,7 @@ struct ltt_trace_ops {
 struct ltt_transport {
 	char *name;
 	struct module *owner;
-	struct list_head node;
+	struct cds_list_head node;
 	struct ltt_trace_ops ops;
 };
 
@@ -163,7 +170,7 @@ enum trace_mode { LTT_TRACE_NORMAL, LTT_TRACE_FLIGHT, LTT_TRACE_HYBRID };
 /* Per-trace information - each trace/flight recorder represented by one */
 struct ust_trace {
 	/* First 32 bytes cache-hot cacheline */
-	struct list_head list;
+	struct cds_list_head list;
 	struct ltt_trace_ops *ops;
 	int active;
 	/* Second 32 bytes cache-hot cacheline */
@@ -178,9 +185,9 @@ struct ust_trace {
 	struct {
 		struct dentry			*trace_root;
 	} dentry;
-	struct kref kref; /* Each channel has a kref of the trace struct */
+	struct urcu_ref urcu_ref; /* Each channel has a urcu_ref of the trace struct */
 	struct ltt_transport *transport;
-	struct kref ltt_transport_kref;
+	struct urcu_ref ltt_transport_urcu_ref;
 	char trace_name[NAME_MAX];
 } ____cacheline_aligned;
 
@@ -241,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);
@@ -264,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 *chan,
+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)
@@ -283,7 +288,7 @@ static __inline__ size_t ltt_write_event_header(struct ust_trace *trace,
 	return buf_offset;
 
 slow_path:
-	return ltt_write_event_header_slow(trace, chan, buf, buf_offset,
+	return ltt_write_event_header_slow(chan, buf, buf_offset,
 				eID, event_size, tsc, rflags);
 }
 
@@ -338,6 +343,36 @@ static __inline__ void ltt_write_trace_header(struct ust_trace *trace,
 	header->freq_scale = trace->freq_scale;
 }
 
+#ifndef UST_VALGRIND
+
+static __inline__ int ust_get_cpu(void)
+{
+	int cpu;
+
+	cpu = sched_getcpu();
+	if (likely(cpu >= 0))
+		return cpu;
+	/*
+	 * If getcpu(2) is not implemented in the Kernel use CPU 0 as fallback.
+	 */
+	return 0;
+}
+
+#else	/* #else #ifndef UST_VALGRIND */
+
+static __inline__ int ust_get_cpu(void)
+{
+	/*
+	 * 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	/* #else #ifndef UST_VALGRIND */
 
 /*
  * Size reserved for high priority events (interrupts, NMI, BH) at the end of a
@@ -407,8 +442,8 @@ extern void ltt_core_register(int (*function)(u8, void *));
 
 extern void ltt_core_unregister(void);
 
-extern void ltt_release_trace(struct kref *kref);
-extern void ltt_release_transport(struct kref *kref);
+extern void ltt_release_trace(struct urcu_ref *urcu_ref);
+extern void ltt_release_transport(struct urcu_ref *urcu_ref);
 
 extern void ltt_dump_marker_state(struct ust_trace *trace);