ring buffer context: cpu number becomes an output of reserve

[lttng-ust.git] / liblttng-ust / ust-events-internal.h

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index f6ab27a2572bd2e2e923cce77501d34f7869c8f1..d0facc1e241ce18765a5796cd5e36d70fd741904 100644 (file)
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -251,7 +251,7 @@ struct lttng_event_notifier_group {
 struct lttng_transport {
        char *name;
        struct cds_list_head node;
-       struct lttng_ust_channel_ops ops;
+       struct lttng_ust_channel_buffer_ops ops;
        const struct lttng_ust_lib_ring_buffer_config *client_config;
 };
 
@@ -347,8 +347,8 @@ struct lttng_enum {
 
 struct lttng_ust_shm_handle;
 
-struct lttng_ust_channel_ops_private {
-       struct lttng_ust_channel_ops *pub;      /* Public channels ops interface */
+struct lttng_ust_channel_buffer_ops_private {
+       struct lttng_ust_channel_buffer_ops *pub;       /* Public channel buffer ops interface */
 
        struct lttng_ust_channel_buffer *(*channel_create)(const char *name,
                        void *buf_addr,
@@ -754,7 +754,7 @@ struct lttng_counter *lttng_ust_counter_create(
                const char *counter_transport_name,
                size_t number_dimensions, const struct lttng_counter_dimension *dimensions);
 
-#ifdef HAVE_PERF_EVENT
+#ifdef HAVE_LINUX_PERF_EVENT_H
 
 __attribute__((visibility("hidden")))
 int lttng_add_perf_counter_to_ctx(uint32_t type,
@@ -768,7 +768,7 @@ int lttng_perf_counter_init(void);
 __attribute__((visibility("hidden")))
 void lttng_perf_counter_exit(void);
 
-#else /* #ifdef HAVE_PERF_EVENT */
+#else /* #ifdef HAVE_LINUX_PERF_EVENT_H */
 
 static inline
 int lttng_add_perf_counter_to_ctx(uint32_t type,
@@ -787,7 +787,7 @@ static inline
 void lttng_perf_counter_exit(void)
 {
 }
-#endif /* #else #ifdef HAVE_PERF_EVENT */
+#endif /* #else #ifdef HAVE_LINUX_PERF_EVENT_H */
 
 __attribute__((visibility("hidden")))
 int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list);