projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.12.4
[lttng-ust.git]
/
liblttng-ust
/
lttng-ring-buffer-client.h
diff --git
a/liblttng-ust/lttng-ring-buffer-client.h
b/liblttng-ust/lttng-ring-buffer-client.h
index 2f67799e19feb676cb0da2b9eef26e5f74a2c0a3..7078938dbeb16b78326bef9a587d828072f15163 100644
(file)
--- a/
liblttng-ust/lttng-ring-buffer-client.h
+++ b/
liblttng-ust/lttng-ring-buffer-client.h
@@
-580,12
+580,11
@@
static int client_stream_id(struct lttng_ust_lib_ring_buffer *buf,
struct lttng_ust_shm_handle *handle,
uint64_t *stream_id)
{
struct lttng_ust_shm_handle *handle,
uint64_t *stream_id)
{
- struct packet_header *header;
+ struct channel *chan = shmp(handle, buf->backend.chan);
+ struct lttng_channel *lttng_chan = channel_get_private(chan);
+
+ *stream_id = lttng_chan->id;
- header = client_packet_header(buf, handle);
- if (!header)
- return -1;
- *stream_id = header->stream_id;
return 0;
}
return 0;
}
@@
-608,6
+607,8
@@
static int client_sequence_number(struct lttng_ust_lib_ring_buffer *buf,
struct packet_header *header;
header = client_packet_header(buf, handle);
struct packet_header *header;
header = client_packet_header(buf, handle);
+ if (!header)
+ return -1;
*seq = header->ctx.packet_seq_num;
return 0;
}
*seq = header->ctx.packet_seq_num;
return 0;
}
@@
-616,10
+617,8
@@
static int client_instance_id(struct lttng_ust_lib_ring_buffer *buf,
struct lttng_ust_shm_handle *handle,
uint64_t *id)
{
struct lttng_ust_shm_handle *handle,
uint64_t *id)
{
-
struct packet_header *header
;
+
*id = buf->backend.cpu
;
- header = client_packet_header(buf, handle);
- *id = header->stream_instance_id;
return 0;
}
return 0;
}
@@
-682,7
+681,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;
@@
-698,7
+698,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;
This page took
0.026979 seconds
and
4
git commands to generate.