projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: remove trailing white spaces across project
[lttng-ust.git]
/
liblttng-ust
/
lttng-ring-buffer-metadata-client.h
diff --git
a/liblttng-ust/lttng-ring-buffer-metadata-client.h
b/liblttng-ust/lttng-ring-buffer-metadata-client.h
index 64940163d10250c4ba0e2dcbc60ee8df3f7e774d..1ca8b580d19ba5ae3582851d9b1536642787019f 100644
(file)
--- 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
*/
* 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"
#include <stdint.h>
#include <lttng/ust-events.h>
#include "lttng/bitfield.h"
@@
-208,7
+209,8
@@
struct lttng_channel *_channel_create(const char *name,
unsigned int read_timer_interval,
unsigned char *uuid,
uint32_t chan_id,
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;
{
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,
&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;
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)
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;
{
unsigned long o_begin;
struct lttng_ust_lib_ring_buffer *buf;
This page took
0.023796 seconds
and
4
git commands to generate.