Rename C++ header files to .hpp

[lttng-tools.git] / src / bin / lttng-sessiond / event-notifier-error-accounting.cpp

diff --git a/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp b/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp
index c99c39338fbe1fbcf6c5237d75fd28fb1fde4b16..10d69493bbc5a9ecfd42a87b87252d3b7faf3d22 100644 (file)
--- a/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp
+++ b/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp
@@ -12,16 +12,16 @@
 #include <urcu/compiler.h>
 #include <pthread.h>
 
-#include <common/error.h>
-#include <common/hashtable/hashtable.h>
-#include <common/index-allocator.h>
-#include <common/kernel-ctl/kernel-ctl.h>
-#include <common/shm.h>
-#include <lttng/trigger/trigger-internal.h>
+#include <common/error.hpp>
+#include <common/hashtable/hashtable.hpp>
+#include <common/index-allocator.hpp>
+#include <common/kernel-ctl/kernel-ctl.hpp>
+#include <common/shm.hpp>
+#include <lttng/trigger/trigger-internal.hpp>
 
-#include "event-notifier-error-accounting.h"
-#include "lttng-ust-error.h"
-#include "ust-app.h"
+#include "event-notifier-error-accounting.hpp"
+#include "lttng-ust-error.hpp"
+#include "ust-app.hpp"
 
 #define ERROR_COUNTER_INDEX_HT_INITIAL_SIZE 16
 
@@ -369,7 +369,7 @@ struct ust_error_accounting_entry *ust_error_accounting_entry_find(
  */
 static
 struct ust_error_accounting_entry *ust_error_accounting_entry_create(
-               struct lttng_ht *uid_ht, const struct ust_app *app)
+               const struct ust_app *app)
 {
        int i, ret, *cpu_counter_fds = NULL;
        struct lttng_ust_ctl_daemon_counter *daemon_counter;
@@ -611,8 +611,7 @@ event_notifier_error_accounting_register_app(struct ust_app *app)
                 */
                pthread_mutex_lock(&the_event_notifier_counter.lock);
 
-               entry = ust_error_accounting_entry_create(error_counter_uid_ht,
-                               app);
+               entry = ust_error_accounting_entry_create(app);
                if (!entry) {
                        status = EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_ERR;
                        pthread_mutex_unlock(&the_event_notifier_counter.lock);
@@ -982,6 +981,9 @@ event_notifier_error_accounting_register_kernel(
                                LTTNG_KERNEL_ABI_COUNTER_BITNESS_64,
                .number_dimensions = 1,
                .global_sum_step = 0,
+               .dimensions = {},
+               .coalesce_hits = 0,
+               .padding = {},
        };
        error_counter_conf.dimensions[0].size = kernel_state.number_indices;
        error_counter_conf.dimensions[0].has_underflow = false;
@@ -1119,8 +1121,8 @@ event_notifier_error_accounting_register_event_notifier(
                                        trigger_name, trigger_owner_uid);
                        goto end;
                }
-               /* fall-through. */
        }
+       /* fall-through. */
        case EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK:
                *error_counter_index = local_error_counter_index;
                status = EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK;