X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Flttng-events.h;h=0439ea7a18c4bab8d372e38ec63ff9a6d5292a14;hb=c1ef86f0812ff62354175f4c7136930814b8f850;hp=b15182c80f08357c08426f97acb223a788314e9c;hpb=1dbfff0c0126804b07e9c11ba2307f65a95a650b;p=lttng-ust.git

diff --git a/include/ust/lttng-events.h b/include/ust/lttng-events.h
index b15182c8..0439ea7a 100644
--- a/include/ust/lttng-events.h
+++ b/include/ust/lttng-events.h
@@ -72,11 +72,14 @@ struct lttng_integer_type {
 	enum lttng_string_encodings encoding;
 };
 
+/*
+ * Only float and double are supported. long double is not supported at
+ * the moment.
+ */
 #define _float_mant_dig(_type)						\
 	(sizeof(_type) == sizeof(float) ? FLT_MANT_DIG			\
 		: (sizeof(_type) == sizeof(double) ? DBL_MANT_DIG	\
-		: (sizeof(_type) == sizeof(long double) ? LDBL_MANT_DIG	\
-		: 0)))
+		: 0))
 
 #define __type_float(_type)					\
 	{							\
@@ -87,7 +90,6 @@ struct lttng_integer_type {
 				- _float_mant_dig(_type),	\
 		  .mant_dig = _float_mant_dig(_type),		\
 		  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
-		  .signedness = lttng_is_signed_type(_type),	\
 		  .reverse_byte_order = __BYTE_ORDER != __FLOAT_WORD_ORDER, \
 		},						\
 	}							\
@@ -177,6 +179,8 @@ struct lttng_probe_desc {
 	struct cds_list_head head;		/* chain registered probes */
 };
 
+struct ust_pending_probe;
+
 /*
  * ltt_event structure is referred to by the tracing fast path. It must be
  * kept small.
@@ -192,21 +196,29 @@ struct ltt_event {
 	union {
 	} u;
 	struct cds_list_head list;		/* Event list */
+	struct ust_pending_probe *pending_probe;
 	int metadata_dumped:1;
 };
 
 struct channel;
+struct shm_handle;
 
 struct ltt_channel_ops {
-	struct shm_handle *(*channel_create)(const char *name,
+	struct ltt_channel *(*channel_create)(const char *name,
 				struct ltt_channel *ltt_chan,
 				void *buf_addr,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
-				unsigned int read_timer_interval);
-	void (*channel_destroy)(struct shm_handle *handle);
-	struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan);
-	void (*buffer_read_close)(struct lib_ring_buffer *buf);
+				unsigned int read_timer_interval,
+				int *shm_fd, int *wait_fd,
+				uint64_t *memory_map_size);
+	void (*channel_destroy)(struct ltt_channel *ltt_chan);
+	struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan,
+				struct shm_handle *handle,
+				int *shm_fd, int *wait_fd,
+				uint64_t *memory_map_size);
+	void (*buffer_read_close)(struct lib_ring_buffer *buf,
+				struct shm_handle *handle);
 	int (*event_reserve)(struct lib_ring_buffer_ctx *ctx,
 			     uint32_t event_id);
 	void (*event_commit)(struct lib_ring_buffer_ctx *ctx);
@@ -217,7 +229,8 @@ struct ltt_channel_ops {
 	 * packet. Note that the size returned is only a hint, since it
 	 * may change due to concurrent writes.
 	 */
-	size_t (*packet_avail_size)(struct channel *chan);
+	size_t (*packet_avail_size)(struct channel *chan,
+				    struct shm_handle *handle);
 	//wait_queue_head_t *(*get_reader_wait_queue)(struct channel *chan);
 	//wait_queue_head_t *(*get_hp_wait_queue)(struct channel *chan);
 	int (*is_finalized)(struct channel *chan);
@@ -233,6 +246,7 @@ struct ltt_channel {
 	struct ltt_session *session;
 	int objd;			/* Object associated to channel */
 	unsigned int free_event_id;	/* Next event ID to allocate */
+	unsigned int used_event_id;	/* Max allocated event IDs */
 	struct cds_list_head list;	/* Channel list */
 	struct ltt_channel_ops *ops;
 	int header_type;		/* 0: unset, 1: compact, 2: large */
@@ -269,12 +283,16 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
 				       void *buf_addr,
 				       size_t subbuf_size, size_t num_subbuf,
 				       unsigned int switch_timer_interval,
-				       unsigned int read_timer_interval);
+				       unsigned int read_timer_interval,
+				       int *shm_fd, int *wait_fd,
+				       uint64_t *memory_map_size);
 struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
 				       int overwrite, void *buf_addr,
 				       size_t subbuf_size, size_t num_subbuf,
 				       unsigned int switch_timer_interval,
-				       unsigned int read_timer_interval);
+				       unsigned int read_timer_interval,
+				       int *shm_fd, int *wait_fd,
+				       uint64_t *memory_map_size);
 
 struct ltt_event *ltt_event_create(struct ltt_channel *chan,
 				   struct lttng_ust_event *event_param,
@@ -289,21 +307,23 @@ void ltt_transport_register(struct ltt_transport *transport);
 void ltt_transport_unregister(struct ltt_transport *transport);
 
 void synchronize_trace(void);
-//int ltt_debugfs_abi_init(void);
-//void ltt_debugfs_abi_exit(void);
 
 int ltt_probe_register(struct lttng_probe_desc *desc);
 void ltt_probe_unregister(struct lttng_probe_desc *desc);
+int pending_probe_fix_events(const struct lttng_event_desc *desc);
 const struct lttng_event_desc *ltt_event_get(const char *name);
 void ltt_event_put(const struct lttng_event_desc *desc);
 int ltt_probes_init(void);
 void ltt_probes_exit(void);
-struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx);
-void lttng_remove_context_field(struct lttng_ctx **ctx,
+int lttng_find_context(struct lttng_ctx *ctx, const char *name);
+struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p);
+void lttng_remove_context_field(struct lttng_ctx **ctx_p,
 				struct lttng_ctx_field *field);
 void lttng_destroy_context(struct lttng_ctx *ctx);
 int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx);
-
-//extern const struct file_operations lttng_tracepoint_list_fops;
+int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_pthread_id_to_ctx(struct lttng_ctx **ctx);
+void lttng_context_vtid_reset(void);
+void lttng_context_vpid_reset(void);
 
 #endif /* _UST_LTTNG_EVENTS_H */