projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import CStringView from the Babeltrace tree
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-registry.cpp
diff --git
a/src/bin/lttng-sessiond/ust-registry.cpp
b/src/bin/lttng-sessiond/ust-registry.cpp
index 323fdd6a757b82a0a6938adec9bb41cb1d520e25..57aa2236fcbe08d7a26710462c038000dc462c98 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-registry.cpp
+++ b/
src/bin/lttng-sessiond/ust-registry.cpp
@@
-7,12
+7,12
@@
#define _LGPL_SOURCE
#define _LGPL_SOURCE
-#include "ust-registry.hpp"
#include "lttng-sessiond.hpp"
#include "notification-thread-commands.hpp"
#include "ust-app.hpp"
#include "ust-registry-session-pid.hpp"
#include "ust-registry-session-uid.hpp"
#include "lttng-sessiond.hpp"
#include "notification-thread-commands.hpp"
#include "ust-app.hpp"
#include "ust-registry-session-pid.hpp"
#include "ust-registry-session-uid.hpp"
+#include "ust-registry.hpp"
#include "utils.hpp"
#include <common/common.hpp>
#include "utils.hpp"
#include <common/common.hpp>
@@
-20,6
+20,7
@@
#include <common/format.hpp>
#include <common/hashtable/utils.hpp>
#include <common/make-unique-wrapper.hpp>
#include <common/format.hpp>
#include <common/hashtable/utils.hpp>
#include <common/make-unique-wrapper.hpp>
+
#include <lttng/lttng.h>
#include <inttypes.h>
#include <lttng/lttng.h>
#include <inttypes.h>
@@
-33,11
+34,10
@@
namespace lsu = lttng::sessiond::ust;
*/
static void ust_registry_event_destroy_rcu(struct rcu_head *head)
{
*/
static void ust_registry_event_destroy_rcu(struct rcu_head *head)
{
- struct lttng_ht_node_u64 *node = caa_container_of(head, struct lttng_ht_node_u64, head);
DIAGNOSTIC_PUSH
DIAGNOSTIC_IGNORE_INVALID_OFFSETOF
lttng::sessiond::ust::registry_event *event =
DIAGNOSTIC_PUSH
DIAGNOSTIC_IGNORE_INVALID_OFFSETOF
lttng::sessiond::ust::registry_event *event =
-
caa_container_of(node, lttng::sessiond::ust::registry_event, _node
);
+
lttng::utils::container_of(head, <tng::sessiond::ust::registry_event::_head
);
DIAGNOSTIC_POP
lttng::sessiond::ust::registry_event_destroy(event);
DIAGNOSTIC_POP
lttng::sessiond::ust::registry_event_destroy(event);
@@
-48,7
+48,7
@@
static void ust_registry_event_destroy_rcu(struct rcu_head *head)
* This MUST be called within a RCU read side lock section.
*/
void ust_registry_channel_destroy_event(lsu::registry_channel *chan,
* This MUST be called within a RCU read side lock section.
*/
void ust_registry_channel_destroy_event(lsu::registry_channel *chan,
- lttng::sessiond::ust::registry_event *event)
+
lttng::sessiond::ust::registry_event *event)
{
int ret;
struct lttng_ht_iter iter;
{
int ret;
struct lttng_ht_iter iter;
@@
-58,28
+58,35
@@
void ust_registry_channel_destroy_event(lsu::registry_channel *chan,
ASSERT_RCU_READ_LOCKED();
/* Delete the node first. */
ASSERT_RCU_READ_LOCKED();
/* Delete the node first. */
- iter.iter.node = &event->_node
.node
;
+ iter.iter.node = &event->_node;
ret = lttng_ht_del(chan->_events, &iter);
LTTNG_ASSERT(!ret);
ret = lttng_ht_del(chan->_events, &iter);
LTTNG_ASSERT(!ret);
- call_rcu(&event->_
node.
head, ust_registry_event_destroy_rcu);
+ call_rcu(&event->_head, ust_registry_event_destroy_rcu);
return;
}
lsu::registry_session *ust_registry_session_per_uid_create(const lttng::sessiond::trace::abi& abi,
return;
}
lsu::registry_session *ust_registry_session_per_uid_create(const lttng::sessiond::trace::abi& abi,
- uint32_t major,
- uint32_t minor,
- const char *root_shm_path,
- const char *shm_path,
- uid_t euid,
- gid_t egid,
- uint64_t tracing_id,
- uid_t tracing_uid)
+
uint32_t major,
+
uint32_t minor,
+
const char *root_shm_path,
+
const char *shm_path,
+
uid_t euid,
+
gid_t egid,
+
uint64_t tracing_id,
+
uid_t tracing_uid)
{
try {
{
try {
- return new lsu::registry_session_per_uid(abi, major, minor, root_shm_path, shm_path,
- euid, egid, tracing_id, tracing_uid);
+ return new lsu::registry_session_per_uid(abi,
+ major,
+ minor,
+ root_shm_path,
+ shm_path,
+ euid,
+ egid,
+ tracing_id,
+ tracing_uid);
} catch (const std::exception& ex) {
ERR("Failed to create per-uid registry session: %s", ex.what());
return nullptr;
} catch (const std::exception& ex) {
ERR("Failed to create per-uid registry session: %s", ex.what());
return nullptr;
@@
-87,18
+94,18
@@
lsu::registry_session *ust_registry_session_per_uid_create(const lttng::sessiond
}
lsu::registry_session *ust_registry_session_per_pid_create(struct ust_app *app,
}
lsu::registry_session *ust_registry_session_per_pid_create(struct ust_app *app,
- const lttng::sessiond::trace::abi& abi,
- uint32_t major,
- uint32_t minor,
- const char *root_shm_path,
- const char *shm_path,
- uid_t euid,
- gid_t egid,
- uint64_t tracing_id)
+
const lttng::sessiond::trace::abi& abi,
+
uint32_t major,
+
uint32_t minor,
+
const char *root_shm_path,
+
const char *shm_path,
+
uid_t euid,
+
gid_t egid,
+
uint64_t tracing_id)
{
try {
{
try {
- return new lsu::registry_session_per_pid(
*app, abi, major, minor, root_shm_path,
-
shm_path, euid, egid, tracing_id);
+ return new lsu::registry_session_per_pid(
+
*app, abi, major, minor, root_shm_path,
shm_path, euid, egid, tracing_id);
} catch (const std::exception& ex) {
ERR("Failed to create per-pid registry session: %s", ex.what());
return nullptr;
} catch (const std::exception& ex) {
ERR("Failed to create per-pid registry session: %s", ex.what());
return nullptr;
@@
-114,9
+121,9
@@
void ust_registry_session_destroy(lsu::registry_session *reg)
delete reg;
}
delete reg;
}
-lsu::registry_enum::registry_enum(
-
std::string in_name,
enum lst::integer_type::signedness in_signedness) :
- name{
std::move(in_name)}, signedness{in_signedness
}
+lsu::registry_enum::registry_enum(
std::string in_name,
+
enum lst::integer_type::signedness in_signedness) :
+ name{
std::move(in_name) }, signedness{ in_signedness
}
{
cds_lfht_node_init(&this->node.node);
this->rcu_head = {};
{
cds_lfht_node_init(&this->node.node);
this->rcu_head = {};
This page took
0.026558 seconds
and
4
git commands to generate.