X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-metadata-client.h;h=cdf48b3bdb5a3982b348ee0f3dc8a8c9e57963c7;hb=418446732612a7d47c019cf839f09f7d86621b34;hp=64940163d10250c4ba0e2dcbc60ee8df3f7e774d;hpb=e56bb47c3af00db3bc9e2dea711bef4882e6ef4c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.h b/liblttng-ust/lttng-ring-buffer-metadata-client.h
index 64940163..cdf48b3b 100644
--- a/liblttng-ust/lttng-ring-buffer-metadata-client.h
+++ b/liblttng-ust/lttng-ring-buffer-metadata-client.h
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stddef.h>
 #include <stdint.h>
 #include <lttng/ust-events.h>
 #include "lttng/bitfield.h"
@@ -138,7 +139,7 @@ static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, uint64_t ts
 	if (!header)
 		return;
 	header->content_size = data_size * CHAR_BIT;		/* in bits */
-	header->packet_size = PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */
+	header->packet_size = LTTNG_UST_PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */
 	/*
 	 * We do not care about the records lost count, because the metadata
 	 * channel waits and retry.
@@ -208,7 +209,8 @@ struct lttng_channel *_channel_create(const char *name,
 				unsigned int read_timer_interval,
 				unsigned char *uuid,
 				uint32_t chan_id,
-				const int *stream_fds, int nr_stream_fds)
+				const int *stream_fds, int nr_stream_fds,
+				int64_t blocking_timeout)
 {
 	struct lttng_channel chan_priv_init;
 	struct lttng_ust_shm_handle *handle;
@@ -224,7 +226,7 @@ struct lttng_channel *_channel_create(const char *name,
 			&chan_priv_init,
 			buf_addr, subbuf_size, num_subbuf,
 			switch_timer_interval, read_timer_interval,
-			stream_fds, nr_stream_fds);
+			stream_fds, nr_stream_fds, blocking_timeout);
 	if (!handle)
 		return NULL;
 	lttng_chan = priv;
@@ -271,7 +273,6 @@ void lttng_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx, const void *sr
 
 static
 size_t lttng_packet_avail_size(struct channel *chan, struct lttng_ust_shm_handle *handle)
-			     
 {
 	unsigned long o_begin;
 	struct lttng_ust_lib_ring_buffer *buf;