fix: relayd: unaligned access in trace_chunk_registry_ht_key_hash

[lttng-tools.git] / src / bin / lttng-sessiond / trace-kernel.hpp

diff --git a/src/bin/lttng-sessiond/trace-kernel.hpp b/src/bin/lttng-sessiond/trace-kernel.hpp
index febdf2e412e1be0dc98723c3b1fe77c6628f178a..265613ba81292caabcd59cc051a8764e15ebb459 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.hpp
+++ b/src/bin/lttng-sessiond/trace-kernel.hpp
@@ -8,15 +8,16 @@
 #ifndef _LTT_TRACE_KERNEL_H
 #define _LTT_TRACE_KERNEL_H
 
-#include <urcu/list.h>
+#include "consumer.hpp"
+#include "tracker.hpp"
 
-#include <lttng/lttng.h>
-#include <common/lttng-kernel.hpp>
-#include <common/lttng-kernel-old.hpp>
 #include <common/defaults.hpp>
+#include <common/lttng-kernel-old.hpp>
+#include <common/lttng-kernel.hpp>
 
-#include "consumer.hpp"
-#include "tracker.hpp"
+#include <lttng/lttng.h>
+
+#include <urcu/list.h>
 
 /* Kernel event list */
 struct ltt_kernel_event_list {
@@ -43,7 +44,7 @@ struct ltt_kernel_context {
 /* Kernel event */
 struct ltt_kernel_event {
        int fd;
-       int enabled;
+       bool enabled;
        enum lttng_event_type type;
        struct lttng_kernel_abi_event *event;
        struct cds_list_head list;
@@ -56,7 +57,7 @@ struct ltt_kernel_event {
 struct ltt_kernel_event_notifier_rule {
        int fd;
        uint64_t error_counter_index;
-       int enabled;
+       bool enabled;
        enum lttng_event_type type;
        struct lttng_trigger *trigger;
        uint64_t token;
@@ -71,7 +72,7 @@ struct ltt_kernel_event_notifier_rule {
 struct ltt_kernel_channel {
        int fd;
        uint64_t key; /* Key to reference this channel with the consumer. */
-       int enabled;
+       bool enabled;
        unsigned int stream_count;
        unsigned int event_count;
        bool published_to_notification_thread;
@@ -121,7 +122,7 @@ struct ltt_kernel_session {
        /* Tracing session id */
        uint64_t id;
        /* Session is active or not meaning it has been started or stopped. */
-       unsigned int active:1;
+       bool active;
        /* Tell or not if the session has to output the traces. */
        unsigned int output_traces;
        unsigned int snapshot_mode;
@@ -141,41 +142,38 @@ struct ltt_kernel_session {
 /*
  * Lookup functions. NULL is returned if not found.
  */
-struct ltt_kernel_event *trace_kernel_get_event_by_name(
-               char *name, struct ltt_kernel_channel *channel,
-               enum lttng_event_type type);
-struct ltt_kernel_event *trace_kernel_find_event(
-               char *name, struct ltt_kernel_channel *channel,
-               enum lttng_event_type type,
-               struct lttng_bytecode *filter);
-struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
-               const char *name, struct ltt_kernel_session *session);
+struct ltt_kernel_event *trace_kernel_get_event_by_name(char *name,
+                                                       struct ltt_kernel_channel *channel,
+                                                       enum lttng_event_type type);
+struct ltt_kernel_event *trace_kernel_find_event(char *name,
+                                                struct ltt_kernel_channel *channel,
+                                                enum lttng_event_type type,
+                                                struct lttng_bytecode *filter);
+struct ltt_kernel_channel *trace_kernel_get_channel_by_name(const char *name,
+                                                           struct ltt_kernel_session *session);
 
 /*
  * Create functions malloc() the data structure.
  */
 struct ltt_kernel_session *trace_kernel_create_session();
-struct ltt_kernel_channel *trace_kernel_create_channel(
-               struct lttng_channel *chan);
+struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *chan);
 enum lttng_error_code trace_kernel_create_event(struct lttng_event *ev,
-               char *filter_expression, struct lttng_bytecode *filter,
-               struct ltt_kernel_event **kernel_event);
+                                               char *filter_expression,
+                                               struct lttng_bytecode *filter,
+                                               struct ltt_kernel_event **kernel_event);
 struct ltt_kernel_metadata *trace_kernel_create_metadata();
-struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
-               unsigned int count);
-struct ltt_kernel_context *trace_kernel_create_context(
-               struct lttng_kernel_abi_context *ctx);
+struct ltt_kernel_stream *trace_kernel_create_stream(const char *name, unsigned int count);
+struct ltt_kernel_context *trace_kernel_create_context(struct lttng_kernel_abi_context *ctx);
 /* Trigger is only non-const to acquire a reference. */
 enum lttng_error_code trace_kernel_create_event_notifier_rule(
-               struct lttng_trigger *trigger,
-               uint64_t token,
-               uint64_t error_counter_index,
-               struct ltt_kernel_event_notifier_rule **event_notifier_rule);
-struct ltt_kernel_context *trace_kernel_copy_context(
-               struct ltt_kernel_context *ctx);
+       struct lttng_trigger *trigger,
+       uint64_t token,
+       uint64_t error_counter_index,
+       struct ltt_kernel_event_notifier_rule **event_notifier_rule);
+struct ltt_kernel_context *trace_kernel_copy_context(struct ltt_kernel_context *ctx);
 enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
-               const struct lttng_event_rule *rule,
-               struct lttng_kernel_abi_event_notifier *kernel_event_notifier);
+       const struct lttng_event_rule *rule,
+       struct lttng_kernel_abi_event_notifier *kernel_event_notifier);
 
 /*
  * Destroy functions free() the data structure and remove from linked list if