projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relay: use urcu_ref_get_unless_zero
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
index.c
diff --git
a/src/bin/lttng-relayd/index.c
b/src/bin/lttng-relayd/index.c
index b15bbcd7702954e675a98c06e02ab31058ff7499..1b14e3e078e1d96fb0d88f93301fac8e0c3e2d13 100644
(file)
--- a/
src/bin/lttng-relayd/index.c
+++ b/
src/bin/lttng-relayd/index.c
@@
-58,7
+58,6
@@
static struct relay_index *relay_index_create(struct relay_stream *stream,
lttng_ht_node_init_u64(&index->index_n, net_seq_num);
pthread_mutex_init(&index->lock, NULL);
lttng_ht_node_init_u64(&index->index_n, net_seq_num);
pthread_mutex_init(&index->lock, NULL);
- pthread_mutex_init(&index->reflock, NULL);
urcu_ref_init(&index->ref);
end:
urcu_ref_init(&index->ref);
end:
@@
-98,21
+97,11
@@
static struct relay_index *relay_index_add_unique(struct relay_stream *stream,
*/
static bool relay_index_get(struct relay_index *index)
{
*/
static bool relay_index_get(struct relay_index *index)
{
- bool has_ref = false;
-
DBG2("index get for stream id %" PRIu64 " and seqnum %" PRIu64 " refcount %d",
index->stream->stream_handle, index->index_n.key,
(int) index->ref.refcount);
DBG2("index get for stream id %" PRIu64 " and seqnum %" PRIu64 " refcount %d",
index->stream->stream_handle, index->index_n.key,
(int) index->ref.refcount);
- /* Confirm that the index refcount has not reached 0. */
- pthread_mutex_lock(&index->reflock);
- if (index->ref.refcount != 0) {
- has_ref = true;
- urcu_ref_get(&index->ref);
- }
- pthread_mutex_unlock(&index->reflock);
-
- return has_ref;
+ return urcu_ref_get_unless_zero(&index->ref);
}
/*
}
/*
@@
-265,10
+254,8
@@
void relay_index_put(struct relay_index *index)
* Index lock ensures that concurrent test and update of stream
* ref is atomic.
*/
* Index lock ensures that concurrent test and update of stream
* ref is atomic.
*/
- pthread_mutex_lock(&index->reflock);
assert(index->ref.refcount != 0);
urcu_ref_put(&index->ref, index_release);
assert(index->ref.refcount != 0);
urcu_ref_put(&index->ref, index_release);
- pthread_mutex_unlock(&index->reflock);
rcu_read_unlock();
}
rcu_read_unlock();
}
This page took
0.024787 seconds
and
4
git commands to generate.