projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: ust: conditionally enable the underscore prefix variant quirk
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
buffer-registry.cpp
diff --git
a/src/bin/lttng-sessiond/buffer-registry.cpp
b/src/bin/lttng-sessiond/buffer-registry.cpp
index 7a446633b8f878cbd6cfaad67a2a07ee33dd281b..ab7d11ae4f51f093c4907f74a23377034cff3cf5 100644
(file)
--- a/
src/bin/lttng-sessiond/buffer-registry.cpp
+++ b/
src/bin/lttng-sessiond/buffer-registry.cpp
@@
-202,7
+202,7
@@
struct buffer_reg_uid *buffer_reg_uid_find(uint64_t session_id,
if (!node) {
goto end;
}
if (!node) {
goto end;
}
- reg =
caa_container_of(node, struct buffer_reg_uid,
node);
+ reg =
lttng::utils::container_of(node, &buffer_reg_uid::
node);
end:
return reg;
end:
return reg;
@@
-314,7
+314,7
@@
struct buffer_reg_pid *buffer_reg_pid_find(uint64_t session_id)
if (!node) {
goto end;
}
if (!node) {
goto end;
}
- reg =
caa_container_of(node, struct buffer_reg_pid,
node);
+ reg =
lttng::utils::container_of(node, &buffer_reg_pid::
node);
end:
return reg;
end:
return reg;
@@
-472,7
+472,7
@@
struct buffer_reg_channel *buffer_reg_channel_find(uint64_t key,
if (!node) {
goto end;
}
if (!node) {
goto end;
}
- chan =
caa_container_of(node, struct buffer_reg_channel,
node);
+ chan =
lttng::utils::container_of(node, &buffer_reg_channel::
node);
end:
return chan;
end:
return chan;
@@
-601,7
+601,6
@@
static void buffer_reg_session_destroy(struct buffer_reg_session *regp,
switch (domain) {
case LTTNG_DOMAIN_UST:
ust_registry_session_destroy(regp->reg.ust);
switch (domain) {
case LTTNG_DOMAIN_UST:
ust_registry_session_destroy(regp->reg.ust);
- free(regp->reg.ust);
break;
default:
abort();
break;
default:
abort();
@@
-631,9
+630,9
@@
void buffer_reg_uid_remove(struct buffer_reg_uid *regp)
static void rcu_free_buffer_reg_uid(struct rcu_head *head)
{
struct lttng_ht_node_u64 *node =
static void rcu_free_buffer_reg_uid(struct rcu_head *head)
{
struct lttng_ht_node_u64 *node =
-
caa_container_of(head, struct lttng_ht_node_u64,
head);
+
lttng::utils::container_of(head, <tng_ht_node_u64::
head);
struct buffer_reg_uid *reg =
struct buffer_reg_uid *reg =
-
caa_container_of(node, struct buffer_reg_uid,
node);
+
lttng::utils::container_of(node, &buffer_reg_uid::
node);
buffer_reg_session_destroy(reg->registry, reg->domain);
free(reg);
buffer_reg_session_destroy(reg->registry, reg->domain);
free(reg);
@@
-642,9
+641,9
@@
static void rcu_free_buffer_reg_uid(struct rcu_head *head)
static void rcu_free_buffer_reg_pid(struct rcu_head *head)
{
struct lttng_ht_node_u64 *node =
static void rcu_free_buffer_reg_pid(struct rcu_head *head)
{
struct lttng_ht_node_u64 *node =
-
caa_container_of(head, struct lttng_ht_node_u64,
head);
+
lttng::utils::container_of(head, <tng_ht_node_u64::
head);
struct buffer_reg_pid *reg =
struct buffer_reg_pid *reg =
-
caa_container_of(node, struct buffer_reg_pid,
node);
+
lttng::utils::container_of(node, &buffer_reg_pid::
node);
buffer_reg_session_destroy(reg->registry, LTTNG_DOMAIN_UST);
free(reg);
buffer_reg_session_destroy(reg->registry, LTTNG_DOMAIN_UST);
free(reg);
@@
-681,10
+680,10
@@
void buffer_reg_uid_destroy(struct buffer_reg_uid *regp,
switch (regp->domain) {
case LTTNG_DOMAIN_UST:
switch (regp->domain) {
case LTTNG_DOMAIN_UST:
- if (regp->registry->reg.ust->metadata_key) {
+ if (regp->registry->reg.ust->
_
metadata_key) {
/* Return value does not matter. This call will print errors. */
(void) consumer_close_metadata(socket,
/* Return value does not matter. This call will print errors. */
(void) consumer_close_metadata(socket,
- regp->registry->reg.ust->metadata_key);
+ regp->registry->reg.ust->
_
metadata_key);
}
break;
default:
}
break;
default:
This page took
0.026081 seconds
and
4
git commands to generate.