projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace explicit rcu_read_lock/unlock with lttng::urcu::read_lock_guard
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel-consumer.cpp
diff --git
a/src/bin/lttng-sessiond/kernel-consumer.cpp
b/src/bin/lttng-sessiond/kernel-consumer.cpp
index 15558f207c219d9294d318c40261c86d882dc7ec..b5ccd47dd27ac2947e40b944c3f1ea778fe8f61f 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel-consumer.cpp
+++ b/
src/bin/lttng-sessiond/kernel-consumer.cpp
@@
-16,6
+16,7
@@
#include <common/common.hpp>
#include <common/compat/string.hpp>
#include <common/defaults.hpp>
#include <common/common.hpp>
#include <common/compat/string.hpp>
#include <common/defaults.hpp>
+#include <common/urcu.hpp>
#include <inttypes.h>
#include <stdio.h>
#include <inttypes.h>
#include <stdio.h>
@@
-27,7
+28,7
@@
static char *create_channel_path(struct consumer_output *consumer, size_t *consu
{
int ret;
char tmp_path[PATH_MAX];
{
int ret;
char tmp_path[PATH_MAX];
- char *pathname =
NULL
;
+ char *pathname =
nullptr
;
LTTNG_ASSERT(consumer);
LTTNG_ASSERT(consumer);
@@
-75,7
+76,7
@@
static char *create_channel_path(struct consumer_output *consumer, size_t *consu
error:
free(pathname);
error:
free(pathname);
- return
NULL
;
+ return
nullptr
;
}
/*
}
/*
@@
-87,14
+88,15
@@
static int kernel_consumer_add_channel(struct consumer_socket *sock,
unsigned int monitor)
{
int ret;
unsigned int monitor)
{
int ret;
- char *pathname =
NULL
;
+ char *pathname =
nullptr
;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
enum lttng_error_code status;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
enum lttng_error_code status;
- struct ltt_session *session =
NULL
;
+ struct ltt_session *session =
nullptr
;
struct lttng_channel_extended *channel_attr_extended;
bool is_local_trace;
size_t consumer_path_offset = 0;
struct lttng_channel_extended *channel_attr_extended;
bool is_local_trace;
size_t consumer_path_offset = 0;
+ lttng::urcu::read_lock_guard read_lock;
/* Safety net */
LTTNG_ASSERT(channel);
/* Safety net */
LTTNG_ASSERT(channel);
@@
-164,7
+166,6
@@
static int kernel_consumer_add_channel(struct consumer_socket *sock,
}
health_code_update();
}
health_code_update();
- rcu_read_lock();
session = session_find_by_id(ksession->id);
LTTNG_ASSERT(session);
ASSERT_LOCKED(session->lock);
session = session_find_by_id(ksession->id);
LTTNG_ASSERT(session);
ASSERT_LOCKED(session->lock);
@@
-177,7
+178,6
@@
static int kernel_consumer_add_channel(struct consumer_socket *sock,
LTTNG_DOMAIN_KERNEL,
channel->channel->attr.subbuf_size *
channel->channel->attr.num_subbuf);
LTTNG_DOMAIN_KERNEL,
channel->channel->attr.subbuf_size *
channel->channel->attr.num_subbuf);
- rcu_read_unlock();
if (status != LTTNG_OK) {
ret = -1;
goto error;
if (status != LTTNG_OK) {
ret = -1;
goto error;
@@
-206,7
+206,7
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
-
rcu_read_lock()
;
+
lttng::urcu::read_lock_guard read_lock
;
/* Safety net */
LTTNG_ASSERT(ksession);
/* Safety net */
LTTNG_ASSERT(ksession);
@@
-262,7
+262,6
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
health_code_update();
error:
health_code_update();
error:
- rcu_read_unlock();
return ret;
}
return ret;
}
@@
-361,7
+360,7
@@
int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
LTTNG_ASSERT(ksession->consumer);
LTTNG_ASSERT(sock);
LTTNG_ASSERT(ksession->consumer);
LTTNG_ASSERT(sock);
-
rcu_read_lock()
;
+
lttng::urcu::read_lock_guard read_lock
;
/* Bail out if consumer is disabled */
if (!ksession->consumer->enabled) {
/* Bail out if consumer is disabled */
if (!ksession->consumer->enabled) {
@@
-394,7
+393,6
@@
int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
}
error:
}
error:
- rcu_read_unlock();
return ret;
}
return ret;
}
This page took
0.02543 seconds
and
4
git commands to generate.