X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.h;h=01a50773c263ab562c9955105f7f5495c8fc06f7;hp=c07377f8ea38711cfbd72951982ff173640ff683;hb=c8fea79c745d42ea8143b7020ae11b4fc2da0d8a;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76 diff --git a/src/common/ust-consumer/ust-consumer.h b/src/common/ust-consumer/ust-consumer.h index c07377f8e..01a50773c 100644 --- a/src/common/ust-consumer/ust-consumer.h +++ b/src/common/ust-consumer/ust-consumer.h @@ -19,51 +19,26 @@ #ifndef _LTTNG_USTCONSUMER_H #define _LTTNG_USTCONSUMER_H -#include #include -#include +#include #ifdef HAVE_LIBLTTNG_UST_CTL -/* - * Mmap the ring buffer, read it and write the data to the tracefile. - * - * Returns the number of bytes written, else negative value on error. - */ -extern ssize_t lttng_ustconsumer_on_read_subbuffer_mmap( - struct lttng_consumer_local_data *ctx, - struct lttng_consumer_stream *stream, unsigned long len); - -/* Not implemented */ -extern ssize_t lttng_ustconsumer_on_read_subbuffer_splice( - struct lttng_consumer_local_data *ctx, - struct lttng_consumer_stream *stream, unsigned long len); - -/* - * Take a snapshot for a specific fd - * - * Returns 0 on success, < 0 on error - */ -int lttng_ustconsumer_take_snapshot(struct lttng_consumer_local_data *ctx, - struct lttng_consumer_stream *stream); +int lttng_ustconsumer_take_snapshot(struct lttng_consumer_stream *stream); -/* - * Get the produced position - * - * Returns 0 on success, < 0 on error - */ int lttng_ustconsumer_get_produced_snapshot( - struct lttng_consumer_local_data *ctx, - struct lttng_consumer_stream *stream, - unsigned long *pos); + struct lttng_consumer_stream *stream, unsigned long *pos); +int lttng_ustconsumer_get_consumed_snapshot( + struct lttng_consumer_stream *stream, unsigned long *pos); int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx, int sock, struct pollfd *consumer_sockpoll); extern int lttng_ustconsumer_allocate_channel(struct lttng_consumer_channel *chan); extern void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan); -extern int lttng_ustconsumer_allocate_stream(struct lttng_consumer_stream *stream); +extern void lttng_ustconsumer_free_channel(struct lttng_consumer_channel *chan); +extern int lttng_ustconsumer_add_stream(struct lttng_consumer_stream *stream); extern void lttng_ustconsumer_del_stream(struct lttng_consumer_stream *stream); int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream, @@ -72,12 +47,34 @@ int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream); void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream); +int lttng_ustctl_get_mmap_read_offset(struct lttng_consumer_stream *stream, + unsigned long *off); +void *lttng_ustctl_get_mmap_base(struct lttng_consumer_stream *stream); +int lttng_ustconsumer_get_stream_id(struct lttng_consumer_stream *stream, + uint64_t *stream_id); +int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream); +void lttng_ustconsumer_close_all_metadata(struct lttng_ht *ht); +void lttng_ustconsumer_close_metadata(struct lttng_consumer_channel *metadata); +void lttng_ustconsumer_close_stream_wakeup(struct lttng_consumer_stream *stream); +int lttng_ustconsumer_recv_metadata(int sock, uint64_t key, uint64_t offset, + uint64_t len, struct lttng_consumer_channel *channel, + int timer, int wait); +int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx, + struct lttng_consumer_channel *channel, int timer, int wait); +int lttng_ustconsumer_sync_metadata(struct lttng_consumer_local_data *ctx, + struct lttng_consumer_stream *metadata); +void lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream, + int producer); +int lttng_ustconsumer_get_current_timestamp( + struct lttng_consumer_stream *stream, uint64_t *ts); + #else /* HAVE_LIBLTTNG_UST_CTL */ static inline ssize_t lttng_ustconsumer_on_read_subbuffer_mmap( struct lttng_consumer_local_data *ctx, - struct lttng_consumer_stream *stream, unsigned long len) + struct lttng_consumer_stream *stream, unsigned long len, + unsigned long padding) { return -ENOSYS; } @@ -85,23 +82,21 @@ ssize_t lttng_ustconsumer_on_read_subbuffer_mmap( static inline ssize_t lttng_ustconsumer_on_read_subbuffer_splice( struct lttng_consumer_local_data *ctx, - struct lttng_consumer_stream *uststream, unsigned long len) + struct lttng_consumer_stream *uststream, unsigned long len, + unsigned long padding) { return -ENOSYS; } static inline -int lttng_ustconsumer_take_snapshot(struct lttng_consumer_local_data *ctx, - struct lttng_consumer_stream *stream) +int lttng_ustconsumer_take_snapshot(struct lttng_consumer_stream *stream) { return -ENOSYS; } static inline int lttng_ustconsumer_get_produced_snapshot( - struct lttng_consumer_local_data *ctx, - struct lttng_consumer_stream *stream, - unsigned long *pos) + struct lttng_consumer_stream *stream, unsigned long *pos) { return -ENOSYS; } @@ -125,7 +120,12 @@ void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan) } static inline -int lttng_ustconsumer_allocate_stream(struct lttng_consumer_stream *stream) +void lttng_ustconsumer_free_channel(struct lttng_consumer_channel *chan) +{ +} + +static inline +int lttng_ustconsumer_add_stream(struct lttng_consumer_stream *stream) { return -ENOSYS; } @@ -153,6 +153,70 @@ void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream) { } +static inline +int lttng_ustctl_get_mmap_read_offset(struct lttng_consumer_stream *stream, + unsigned long *off) +{ + return -ENOSYS; +} +static inline +int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream) +{ + return -ENOSYS; +} +static inline +void *lttng_ustctl_get_mmap_base(struct lttng_consumer_stream *stream) +{ + return NULL; +} +static inline +void lttng_ustconsumer_close_all_metadata(struct lttng_ht *ht) +{ +} +static inline +void lttng_ustconsumer_close_metadata(struct lttng_consumer_channel *metadata) +{ +} +static inline +void lttng_ustconsumer_close_stream_wakeup(struct lttng_consumer_stream *stream) +{ +} +static inline +int lttng_ustconsumer_recv_metadata(int sock, uint64_t key, uint64_t offset, + uint64_t len, struct lttng_consumer_channel *channel, + int timer) +{ + return -ENOSYS; +} +static inline +int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx, + struct lttng_consumer_channel *channel, int timer, int wait) +{ + return -ENOSYS; +} +static inline +int lttng_ustconsumer_sync_metadata(struct lttng_consumer_local_data *ctx, + struct lttng_consumer_stream *metadata) +{ + return -ENOSYS; +} +static inline +void lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream, + int producer) +{ +} +static inline +int lttng_ustconsumer_get_current_timestamp( + struct lttng_consumer_stream *stream, uint64_t *ts) +{ + return -ENOSYS; +} +static inline +int lttng_ustconsumer_get_stream_id(struct lttng_consumer_stream *stream, + uint64_t *stream_id) +{ + return -ENOSYS; +} #endif /* HAVE_LIBLTTNG_UST_CTL */ #endif /* _LTTNG_USTCONSUMER_H */