Fix: sessiond: size-based rotation threshold exceeded in per-pid tracing (1/2)

[lttng-tools.git] / src / bin / lttng-sessiond / condition-internal.cpp

diff --git a/src/bin/lttng-sessiond/condition-internal.cpp b/src/bin/lttng-sessiond/condition-internal.cpp
index dd9c244b3253ac68694799348066bc048daa1274..d932fac13bd139c723c3b1ef4aca1a3866245045 100644 (file)
--- a/src/bin/lttng-sessiond/condition-internal.cpp
+++ b/src/bin/lttng-sessiond/condition-internal.cpp
@@ -5,19 +5,19 @@
  *
  */
 
-#include <common/hashtable/utils.h>
-#include <common/hashtable/hashtable.h>
+#include <common/hashtable/utils.hpp>
+#include <common/hashtable/hashtable.hpp>
 
 #include <lttng/condition/condition.h>
-#include <lttng/condition/condition-internal.h>
-#include <lttng/condition/buffer-usage-internal.h>
-#include <lttng/condition/session-consumed-size-internal.h>
-#include <lttng/condition/session-rotation-internal.h>
-#include <lttng/condition/event-rule-matches-internal.h>
+#include <lttng/condition/condition-internal.hpp>
+#include <lttng/condition/buffer-usage-internal.hpp>
+#include <lttng/condition/session-consumed-size-internal.hpp>
+#include <lttng/condition/session-rotation-internal.hpp>
+#include <lttng/condition/event-rule-matches-internal.hpp>
 #include <lttng/condition/event-rule-matches.h>
-#include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/condition/event-rule-matches-internal.h>
-#include "condition-internal.h"
+#include <lttng/event-rule/event-rule-internal.hpp>
+#include <lttng/condition/event-rule-matches-internal.hpp>
+#include "condition-internal.hpp"
 
 static
 unsigned long lttng_condition_buffer_usage_hash(
@@ -27,8 +27,8 @@ unsigned long lttng_condition_buffer_usage_hash(
        unsigned long condition_type;
        struct lttng_condition_buffer_usage *condition;
 
-       condition = container_of(_condition,
-                       struct lttng_condition_buffer_usage, parent);
+       condition = lttng::utils::container_of(_condition,
+                       &lttng_condition_buffer_usage::parent);
 
        condition_type = (unsigned long) condition->parent.type;
        hash = hash_key_ulong((void *) condition_type, lttng_ht_seed);
@@ -64,8 +64,8 @@ unsigned long lttng_condition_session_consumed_size_hash(
        struct lttng_condition_session_consumed_size *condition;
        uint64_t val;
 
-       condition = container_of(_condition,
-                       struct lttng_condition_session_consumed_size, parent);
+       condition = lttng::utils::container_of(_condition,
+                       &lttng_condition_session_consumed_size::parent);
 
        hash = hash_key_ulong((void *) condition_type, lttng_ht_seed);
        if (condition->session_name) {
@@ -83,8 +83,8 @@ unsigned long lttng_condition_session_rotation_hash(
        unsigned long hash, condition_type;
        struct lttng_condition_session_rotation *condition;
 
-       condition = container_of(_condition,
-                       struct lttng_condition_session_rotation, parent);
+       condition = lttng::utils::container_of(_condition,
+                       &lttng_condition_session_rotation::parent);
        condition_type = (unsigned long) condition->parent.type;
        hash = hash_key_ulong((void *) condition_type, lttng_ht_seed);
        LTTNG_ASSERT(condition->session_name);