Cleanup: Remove whiteline

[lttng-ust.git] / liblttng-ust / lttng-probes.c

diff --git a/liblttng-ust/lttng-probes.c b/liblttng-ust/lttng-probes.c
index 3d3e60e7193369fb0a1562e8dee21be33c269d91..00ce54cb36a9117338cecf4cc1bc3496f0b94227 100644 (file)
--- a/liblttng-ust/lttng-probes.c
+++ b/liblttng-ust/lttng-probes.c
@@ -44,7 +44,7 @@ static int lazy_nesting;
  * Called under ust lock.
  */
 static
-int check_event_provider(struct lttng_probe_desc *desc)
+int check_event_provider(struct lttng_ust_probe_desc *desc)
 {
        int i;
        size_t provider_name_len;
@@ -64,9 +64,9 @@ int check_event_provider(struct lttng_probe_desc *desc)
  * Called under ust lock.
  */
 static
-void lttng_lazy_probe_register(struct lttng_probe_desc *desc)
+void lttng_lazy_probe_register(struct lttng_ust_probe_desc *desc)
 {
-       struct lttng_probe_desc *iter;
+       struct lttng_ust_probe_desc *iter;
        struct cds_list_head *probe_list;
 
        /*
@@ -84,7 +84,7 @@ void lttng_lazy_probe_register(struct lttng_probe_desc *desc)
         */
 
        /*
-        * We sort the providers by struct lttng_probe_desc pointer
+        * We sort the providers by struct lttng_ust_probe_desc pointer
         * address.
         */
        probe_list = &_probe_list;
@@ -109,7 +109,7 @@ desc_added:
 static
 void fixup_lazy_probes(void)
 {
-       struct lttng_probe_desc *iter, *tmp;
+       struct lttng_ust_probe_desc *iter, *tmp;
        int ret;
 
        lazy_nesting++;
@@ -135,7 +135,7 @@ struct cds_list_head *lttng_get_probe_list_head(void)
 }
 
 static
-int check_provider_version(struct lttng_probe_desc *desc)
+int check_provider_version(struct lttng_ust_probe_desc *desc)
 {
        /*
         * Check tracepoint provider version compatibility.
@@ -164,7 +164,7 @@ int check_provider_version(struct lttng_probe_desc *desc)
 }
 
 
-int lttng_probe_register(struct lttng_probe_desc *desc)
+int lttng_ust_probe_register(struct lttng_ust_probe_desc *desc)
 {
        int ret = 0;
 
@@ -197,7 +197,7 @@ int lttng_probe_register(struct lttng_probe_desc *desc)
        return ret;
 }
 
-void lttng_probe_unregister(struct lttng_probe_desc *desc)
+void lttng_ust_probe_unregister(struct lttng_ust_probe_desc *desc)
 {
        lttng_ust_fixup_tls();
 
@@ -231,7 +231,7 @@ void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list)
  */
 int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list)
 {
-       struct lttng_probe_desc *probe_desc;
+       struct lttng_ust_probe_desc *probe_desc;
        int i;
        struct cds_list_head *probe_list;
 
@@ -303,7 +303,7 @@ void lttng_probes_prune_field_list(struct lttng_ust_field_list *list)
  */
 int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
 {
-       struct lttng_probe_desc *probe_desc;
+       struct lttng_ust_probe_desc *probe_desc;
        int i;
        struct cds_list_head *probe_list;
 
@@ -311,7 +311,7 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
        CDS_INIT_LIST_HEAD(&list->head);
        cds_list_for_each_entry(probe_desc, probe_list, head) {
                for (i = 0; i < probe_desc->nr_events; i++) {
-                       const struct lttng_event_desc *event_desc =
+                       const struct lttng_ust_event_desc *event_desc =
                                probe_desc->event_desc[i];
                        int j;
 
@@ -338,8 +338,8 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
                        }
 
                        for (j = 0; j < event_desc->nr_fields; j++) {
-                               const struct lttng_event_field *event_field =
-                                       &event_desc->fields[j];
+                               const struct lttng_ust_event_field *event_field =
+                                       event_desc->fields[j];
                                struct tp_field_list_entry *list_entry;
 
                                list_entry = zmalloc(sizeof(*list_entry));
@@ -354,31 +354,29 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
                                        event_field->name,
                                        LTTNG_UST_ABI_SYM_NAME_LEN);
                                list_entry->field.field_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0';
-                               switch (event_field->type.atype) {
-                               case atype_integer:
+                               switch (event_field->type->type) {
+                               case lttng_ust_type_integer:
                                        list_entry->field.type = LTTNG_UST_ABI_FIELD_INTEGER;
                                        break;
-                               case atype_string:
+                               case lttng_ust_type_string:
                                        list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING;
                                        break;
-                               case atype_array_nestable:
-                                       if (event_field->type.u.array_nestable.elem_type->atype != atype_integer
-                                               || event_field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode_none)
+                               case lttng_ust_type_array:
+                                       if (lttng_ust_get_type_array(event_field->type)->encoding == lttng_ust_string_encoding_none)
                                                list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER;
                                        else
                                                list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING;
                                        break;
-                               case atype_sequence_nestable:
-                                       if (event_field->type.u.sequence_nestable.elem_type->atype != atype_integer
-                                               || event_field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none)
+                               case lttng_ust_type_sequence:
+                                       if (lttng_ust_get_type_sequence(event_field->type)->encoding == lttng_ust_string_encoding_none)
                                                list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER;
                                        else
                                                list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING;
                                        break;
-                               case atype_float:
+                               case lttng_ust_type_float:
                                        list_entry->field.type = LTTNG_UST_ABI_FIELD_FLOAT;
                                        break;
-                               case atype_enum_nestable:
+                               case lttng_ust_type_enum:
                                        list_entry->field.type = LTTNG_UST_ABI_FIELD_ENUM;
                                        break;
                                default: