X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-perf-counters.c;h=74e07dc57a0c5e0eb01c2f7acdbe28f033a63ff8;hb=fc80554e0cd4c7739c64fe8bc8b87a77d3c19d07;hp=a6ff55b678d472d29fb157f7b0527918432121e2;hpb=20142124a2e34c287a277bbd7ef5b28697735d10;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-perf-counters.c b/liblttng-ust/lttng-context-perf-counters.c
index a6ff55b6..74e07dc5 100644
--- a/liblttng-ust/lttng-context-perf-counters.c
+++ b/liblttng-ust/lttng-context-perf-counters.c
@@ -1,23 +1,9 @@
 /*
- * lttng-context-perf-counters.c
- *
- * LTTng UST performance monitoring counters (perf-counters) integration.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2009-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * LTTng UST performance monitoring counters (perf-counters) integration.
  */
 
 #define _LGPL_SOURCE
@@ -27,6 +13,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/mman.h>
 #include <sys/syscall.h>
 #include <lttng/ust-events.h>
@@ -35,13 +23,16 @@
 #include <urcu/system.h>
 #include <urcu/arch.h>
 #include <urcu/rculist.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <urcu/ref.h>
 #include <usterr-signal-safe.h>
 #include <signal.h>
 #include <urcu/tls-compat.h>
 #include "perf_event.h"
+
+#include "context-internal.h"
 #include "lttng-tracer-core.h"
+#include "ust-events-internal.h"
 
 /*
  * We use a global perf counter key and iterate on per-thread RCU lists
@@ -566,15 +557,15 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 
 	field->event_field.name = name_alloc;
 	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size =
+	field->event_field.type.u.integer.size =
 			sizeof(uint64_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment =
+	field->event_field.type.u.integer.alignment =
 			lttng_alignof(uint64_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness =
+	field->event_field.type.u.integer.signedness =
 			lttng_is_signed_type(uint64_t);
-	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.basic.integer.base = 10;
-	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+	field->event_field.type.u.integer.reverse_byte_order = 0;
+	field->event_field.type.u.integer.base = 10;
+	field->event_field.type.u.integer.encoding = lttng_encode_none;
 	field->get_size = perf_counter_get_size;
 	field->record = perf_counter_record;
 	field->get_value = perf_counter_get_value;