projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Add the ACCOUNTING flag to ht creation and set bucket size to 0
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-consumer.c
diff --git
a/src/bin/lttng-sessiond/ust-consumer.c
b/src/bin/lttng-sessiond/ust-consumer.c
index aabe49403fbc1215d423986cb7dfa71301da2a47..465dd07d74489cd26135126f903e1a30aa6070a2 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-52,7
+52,8
@@
static int send_channel(int sock, struct ust_app_channel *uchan)
uchan->obj->shm_fd,
uchan->attr.subbuf_size,
uchan->obj->memory_map_size,
uchan->obj->shm_fd,
uchan->attr.subbuf_size,
uchan->obj->memory_map_size,
- uchan->name);
+ uchan->name,
+ uchan->streams.count);
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
@@
-100,7
+101,8
@@
static int send_channel_stream(int sock, struct ust_app_channel *uchan,
consumer->net_seq_index,
0, /* Metadata flag unset */
stream->name,
consumer->net_seq_index,
0, /* Metadata flag unset */
stream->name,
- pathname);
+ pathname,
+ usess->id);
/* Send stream and file descriptor */
fds[0] = stream->obj->shm_fd;
/* Send stream and file descriptor */
fds[0] = stream->obj->shm_fd;
@@
-208,7
+210,8
@@
static int send_metadata(int sock, struct ust_app_session *usess,
usess->metadata->obj->shm_fd,
usess->metadata->attr.subbuf_size,
usess->metadata->obj->memory_map_size,
usess->metadata->obj->shm_fd,
usess->metadata->attr.subbuf_size,
usess->metadata->obj->memory_map_size,
- "metadata");
+ "metadata",
+ 1);
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
@@
-264,7
+267,8
@@
static int send_metadata(int sock, struct ust_app_session *usess,
consumer->net_seq_index,
1, /* Flag metadata set */
"metadata",
consumer->net_seq_index,
1, /* Flag metadata set */
"metadata",
- pathname);
+ pathname,
+ usess->id);
/* Send stream and file descriptor */
fds[0] = usess->metadata->stream_obj->shm_fd;
/* Send stream and file descriptor */
fds[0] = usess->metadata->stream_obj->shm_fd;
This page took
0.027496 seconds
and
4
git commands to generate.