projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
init private data
[lttng-ust.git]
/
liblttng-ust
/
lttng-ust-abi.c
diff --git
a/liblttng-ust/lttng-ust-abi.c
b/liblttng-ust/lttng-ust-abi.c
index 639165eb3b21ad6a8606d7f3c0e720945f652d04..e7ef1579a575ff1212735b9f3f3c03cde46b7ed1 100644
(file)
--- a/
liblttng-ust/lttng-ust-abi.c
+++ b/
liblttng-ust/lttng-ust-abi.c
@@
-370,6
+370,7
@@
int lttng_abi_create_channel(int session_objd,
struct ltt_channel *chan;
int chan_objd;
int ret = 0;
struct ltt_channel *chan;
int chan_objd;
int ret = 0;
+ struct ltt_channel chan_priv_init;
chan_objd = objd_alloc(NULL, <tng_channel_ops);
if (chan_objd < 0) {
chan_objd = objd_alloc(NULL, <tng_channel_ops);
if (chan_objd < 0) {
@@
-397,6
+398,10
@@
int lttng_abi_create_channel(int session_objd,
transport_name = "<unknown>";
break;
}
transport_name = "<unknown>";
break;
}
+ memset(&chan_priv_init, 0, sizeof(chan_priv_init));
+ /* Copy of session UUID for consumer (availability through shm) */
+ memcpy(chan_priv_init.uuid, session->uuid, sizeof(session->uuid));
+
/*
* We tolerate no failure path after channel creation. It will stay
* invariant for the rest of the session.
/*
* We tolerate no failure path after channel creation. It will stay
* invariant for the rest of the session.
@@
-408,7
+413,8
@@
int lttng_abi_create_channel(int session_objd,
chan_param->read_timer_interval,
&chan_param->shm_fd,
&chan_param->wait_fd,
chan_param->read_timer_interval,
&chan_param->shm_fd,
&chan_param->wait_fd,
- &chan_param->memory_map_size);
+ &chan_param->memory_map_size,
+ &chan_priv_init);
if (!chan) {
ret = -EINVAL;
goto chan_error;
if (!chan) {
ret = -EINVAL;
goto chan_error;
@@
-421,8
+427,6
@@
int lttng_abi_create_channel(int session_objd,
}
/* The channel created holds a reference on the session */
objd_ref(session_objd);
}
/* The channel created holds a reference on the session */
objd_ref(session_objd);
- /* Copy of session UUID for consumer (availability through shm) */
- memcpy(chan->uuid, session->uuid, sizeof(session->uuid));
return chan_objd;
return chan_objd;
This page took
0.02483 seconds
and
4
git commands to generate.