projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: nonsensical message printed by lttng track/untrack
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
connection.c
diff --git
a/src/bin/lttng-relayd/connection.c
b/src/bin/lttng-relayd/connection.c
index f3d7e642ef2aa0139bce4a1f927d8a3ee56f1f77..e8c3d4bea5a50f2a28d69d88a94fb7b4744c168d 100644
(file)
--- a/
src/bin/lttng-relayd/connection.c
+++ b/
src/bin/lttng-relayd/connection.c
@@
-27,16
+27,7
@@
bool connection_get(struct relay_connection *conn)
{
bool connection_get(struct relay_connection *conn)
{
- bool has_ref = false;
-
- pthread_mutex_lock(&conn->reflock);
- if (conn->ref.refcount != 0) {
- has_ref = true;
- urcu_ref_get(&conn->ref);
- }
- pthread_mutex_unlock(&conn->reflock);
-
- return has_ref;
+ return urcu_ref_get_unless_zero(&conn->ref);
}
struct relay_connection *connection_get_by_sock(struct lttng_ht *relay_connections_ht,
}
struct relay_connection *connection_get_by_sock(struct lttng_ht *relay_connections_ht,
@@
-75,7
+66,6
@@
struct relay_connection *connection_create(struct lttcomm_sock *sock,
PERROR("zmalloc relay connection");
goto end;
}
PERROR("zmalloc relay connection");
goto end;
}
- pthread_mutex_init(&conn->reflock, NULL);
urcu_ref_init(&conn->ref);
conn->type = type;
conn->sock = sock;
urcu_ref_init(&conn->ref);
conn->type = type;
conn->sock = sock;
@@
-131,9
+121,7
@@
static void connection_release(struct urcu_ref *ref)
void connection_put(struct relay_connection *conn)
{
rcu_read_lock();
void connection_put(struct relay_connection *conn)
{
rcu_read_lock();
- pthread_mutex_lock(&conn->reflock);
urcu_ref_put(&conn->ref, connection_release);
urcu_ref_put(&conn->ref, connection_release);
- pthread_mutex_unlock(&conn->reflock);
rcu_read_unlock();
}
rcu_read_unlock();
}
This page took
0.024451 seconds
and
4
git commands to generate.