projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fix: missing stdio.h include in signal-helper.hpp
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
connection.cpp
diff --git
a/src/bin/lttng-relayd/connection.cpp
b/src/bin/lttng-relayd/connection.cpp
index c1e58aba3430f0fbbbedb89cb42261731cc94b3d..711de3a5cff81a76a2ae3bd9fb8e1ca4cc6311bf 100644
(file)
--- a/
src/bin/lttng-relayd/connection.cpp
+++ b/
src/bin/lttng-relayd/connection.cpp
@@
-37,7
+37,7
@@
struct relay_connection *connection_get_by_sock(struct lttng_ht *relay_connectio
DBG2("Relay connection by sock %d not found", sock);
goto end;
}
DBG2("Relay connection by sock %d not found", sock);
goto end;
}
- conn =
caa_container_of(node, struct relay_connection,
sock_n);
+ conn =
lttng::utils::container_of(node, &relay_connection::
sock_n);
if (!connection_get(conn)) {
conn = NULL;
}
if (!connection_get(conn)) {
conn = NULL;
}
@@
-90,7
+90,7
@@
struct relay_connection *connection_create(struct lttcomm_sock *sock,
{
struct relay_connection *conn;
{
struct relay_connection *conn;
- conn =
(relay_connection *) zmalloc(sizeof(*conn)
);
+ conn =
zmalloc<relay_connection>(
);
if (!conn) {
PERROR("zmalloc relay connection");
goto end;
if (!conn) {
PERROR("zmalloc relay connection");
goto end;
@@
-110,7
+110,7
@@
end:
static void rcu_free_connection(struct rcu_head *head)
{
struct relay_connection *conn =
static void rcu_free_connection(struct rcu_head *head)
{
struct relay_connection *conn =
-
caa_container_of(head, struct relay_connection,
rcu_node);
+
lttng::utils::container_of(head, &relay_connection::
rcu_node);
lttcomm_destroy_sock(conn->sock);
if (conn->viewer_session) {
lttcomm_destroy_sock(conn->sock);
if (conn->viewer_session) {
@@
-132,7
+132,7
@@
static void destroy_connection(struct relay_connection *conn)
static void connection_release(struct urcu_ref *ref)
{
struct relay_connection *conn =
static void connection_release(struct urcu_ref *ref)
{
struct relay_connection *conn =
-
caa_container_of(ref, struct relay_connection,
ref);
+
lttng::utils::container_of(ref, &relay_connection::
ref);
if (conn->in_socket_ht) {
struct lttng_ht_iter iter;
if (conn->in_socket_ht) {
struct lttng_ht_iter iter;
This page took
0.024151 seconds
and
4
git commands to generate.