X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracer.h;h=c316c9aefe6bc3d128781633b0cd8773efc79f54;hb=0222e1213f196b66cbc08cd29093aca4a28e9ffb;hp=0fa2e4dd929fcb54254fa0fff4f93fae965e5e69;hpb=518d7abb8e3720433c611499f704c3bd9d554102;p=ust.git

diff --git a/libust/tracer.h b/libust/tracer.h
index 0fa2e4d..c316c9a 100644
--- a/libust/tracer.h
+++ b/libust/tracer.h
@@ -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 */