X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Fust-events.h;h=328a875336294f044bc5909ba45773ee1cfea1c9;hb=5ea386c3b8e3566ec0b6710c82aae433de4d944a;hp=d541f81f3445a3c37068ad362ea6c06522394e25;hpb=3327ac33b865cf2ee76934ded1c4b3b177edc3b9;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index d541f81f..328a8753 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -30,10 +30,18 @@
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 #include <stdint.h>
+#include <lttng/ust-config.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ust-endian.h>
 #include <float.h>
+#include <errno.h>
+#include <urcu/ref.h>
+#include <pthread.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define LTTNG_UST_UUID_LEN		16
 
@@ -232,6 +240,8 @@ union lttng_ctx_value {
 	double d;
 };
 
+struct lttng_perf_counter_field;
+
 #define LTTNG_UST_CTX_FIELD_PADDING	40
 struct lttng_ctx_field {
 	struct lttng_event_field event_field;
@@ -242,16 +252,18 @@ struct lttng_ctx_field {
 	void (*get_value)(struct lttng_ctx_field *field,
 			 union lttng_ctx_value *value);
 	union {
+		struct lttng_perf_counter_field *perf_counter;
 		char padding[LTTNG_UST_CTX_FIELD_PADDING];
 	} u;
 	void (*destroy)(struct lttng_ctx_field *field);
 };
 
-#define LTTNG_UST_CTX_PADDING	24
+#define LTTNG_UST_CTX_PADDING	20
 struct lttng_ctx {
 	struct lttng_ctx_field *fields;
 	unsigned int nr_fields;
 	unsigned int allocated_fields;
+	unsigned int largest_align;
 	char padding[LTTNG_UST_CTX_PADDING];
 };
 
@@ -427,9 +439,13 @@ struct lttng_channel_ops {
 			unsigned int switch_timer_interval,
 			unsigned int read_timer_interval,
 			unsigned char *uuid,
-			uint32_t chan_id);
+			uint32_t chan_id,
+			const int *stream_fds, int nr_stream_fds);
 	void (*channel_destroy)(struct lttng_channel *chan);
-	void *_deprecated1;
+	union {
+		void *_deprecated1;
+		unsigned long has_strcpy:1;		/* ABI has strcpy */
+	} u;
 	void *_deprecated2;
 	int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 			     uint32_t event_id);
@@ -448,6 +464,8 @@ struct lttng_channel_ops {
 	int (*is_finalized)(struct channel *chan);
 	int (*is_disabled)(struct channel *chan);
 	int (*flush_buffer)(struct channel *chan, struct lttng_ust_shm_handle *handle);
+	void (*event_strcpy)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+			const char *src, size_t len);
 };
 
 /*
@@ -574,6 +592,7 @@ void lttng_probes_exit(void);
 int lttng_find_context(struct lttng_ctx *ctx, const char *name);
 int lttng_get_context_index(struct lttng_ctx *ctx, const char *name);
 struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p);
+void lttng_context_update(struct lttng_ctx *ctx);
 void lttng_remove_context_field(struct lttng_ctx **ctx_p,
 				struct lttng_ctx_field *field);
 void lttng_destroy_context(struct lttng_ctx *ctx);
@@ -585,6 +604,33 @@ int lttng_add_ip_to_ctx(struct lttng_ctx **ctx);
 void lttng_context_vtid_reset(void);
 void lttng_context_vpid_reset(void);
 
+#ifdef LTTNG_UST_HAVE_PERF_EVENT
+int lttng_add_perf_counter_to_ctx(uint32_t type,
+				  uint64_t config,
+				  const char *name,
+				  struct lttng_ctx **ctx);
+int lttng_perf_counter_init(void);
+void lttng_perf_counter_exit(void);
+#else /* #ifdef LTTNG_UST_HAVE_PERF_EVENT */
+static inline
+int lttng_add_perf_counter_to_ctx(uint32_t type,
+				  uint64_t config,
+				  const char *name,
+				  struct lttng_ctx **ctx)
+{
+	return -ENOSYS;
+}
+static inline
+int lttng_perf_counter_init(void)
+{
+	return 0;
+}
+static inline
+void lttng_perf_counter_exit(void)
+{
+}
+#endif /* #else #ifdef LTTNG_UST_HAVE_PERF_EVENT */
+
 extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata;
 extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_discard;
 extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite;
@@ -613,4 +659,8 @@ typedef int (*t_statedump_func_ptr)(struct lttng_session *session);
 void lttng_handle_pending_statedump(void *owner);
 struct cds_list_head *_lttng_get_sessions(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LTTNG_UST_EVENTS_H */