projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: replace container_of with a C++ safe implementation
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
ctf-trace.cpp
diff --git
a/src/bin/lttng-relayd/ctf-trace.cpp
b/src/bin/lttng-relayd/ctf-trace.cpp
index cad67b78e2517296f06e3610b2d7b3d7e25d2ce2..ba4a29092ca537f28e68153027823840f3882fdc 100644
(file)
--- a/
src/bin/lttng-relayd/ctf-trace.cpp
+++ b/
src/bin/lttng-relayd/ctf-trace.cpp
@@
-23,7
+23,7
@@
static pthread_mutex_t last_relay_ctf_trace_id_lock = PTHREAD_MUTEX_INITIALIZER;
static void rcu_destroy_ctf_trace(struct rcu_head *rcu_head)
{
struct ctf_trace *trace =
static void rcu_destroy_ctf_trace(struct rcu_head *rcu_head)
{
struct ctf_trace *trace =
-
caa_container_of(rcu_head, struct ctf_trace,
rcu_node);
+
lttng::utils::container_of(rcu_head, &ctf_trace::
rcu_node);
free(trace);
}
free(trace);
}
@@
-53,7
+53,7
@@
static void ctf_trace_destroy(struct ctf_trace *trace)
static void ctf_trace_release(struct urcu_ref *ref)
{
struct ctf_trace *trace =
static void ctf_trace_release(struct urcu_ref *ref)
{
struct ctf_trace *trace =
-
caa_container_of(ref, struct ctf_trace,
ref);
+
lttng::utils::container_of(ref, &ctf_trace::
ref);
int ret;
struct lttng_ht_iter iter;
int ret;
struct lttng_ht_iter iter;
@@
-156,7
+156,7
@@
struct ctf_trace *ctf_trace_get_by_path_or_create(struct relay_session *session,
DBG("CTF Trace path %s not found", subpath);
goto end;
}
DBG("CTF Trace path %s not found", subpath);
goto end;
}
- trace =
caa_container_of(node, struct ctf_trace,
node);
+ trace =
lttng::utils::container_of(node, &ctf_trace::
node);
if (!ctf_trace_get(trace)) {
trace = NULL;
}
if (!ctf_trace_get(trace)) {
trace = NULL;
}
This page took
0.023296 seconds
and
4
git commands to generate.