X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Fltt-probes.c;h=d04ce2215a4e2db6b1765d328910565b30341ed7;hb=6ddc916dfa930b6b9018ffd53a76faeb61b81ebd;hp=02df21b2f61c847e3ba082866577daa4c40c79bc;hpb=e92f3e285939848f248af08f11a39a04a7fcf852;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-probes.c b/liblttng-ust/ltt-probes.c
index 02df21b2..d04ce221 100644
--- a/liblttng-ust/ltt-probes.c
+++ b/liblttng-ust/ltt-probes.c
@@ -219,6 +219,142 @@ struct lttng_ust_tracepoint_iter *
 	return &entry->tp;
 }
 
+void ltt_probes_prune_field_list(struct lttng_ust_field_list *list)
+{
+	struct tp_field_list_entry *list_entry, *tmp;
+
+	cds_list_for_each_entry_safe(list_entry, tmp, &list->head, head) {
+		cds_list_del(&list_entry->head);
+		free(list_entry);
+	}
+}
+
+/*
+ * called with UST lock held.
+ */
+int ltt_probes_get_field_list(struct lttng_ust_field_list *list)
+{
+	struct lttng_probe_desc *probe_desc;
+	int i;
+
+	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 =
+				probe_desc->event_desc[i];
+			int j;
+
+			if (event_desc->nr_fields == 0) {
+				/* Events without fields. */
+				struct tp_field_list_entry *list_entry;
+
+				list_entry = zmalloc(sizeof(*list_entry));
+				if (!list_entry)
+					goto err_nomem;
+				cds_list_add(&list_entry->head, &list->head);
+				strncpy(list_entry->field.event_name,
+					event_desc->name,
+					LTTNG_UST_SYM_NAME_LEN);
+				list_entry->field.event_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+				list_entry->field.field_name[0] = '\0';
+				list_entry->field.type = LTTNG_UST_FIELD_OTHER;
+				if (!event_desc->loglevel) {
+					list_entry->field.loglevel = TRACE_DEFAULT;
+				} else {
+					list_entry->field.loglevel = *(*event_desc->loglevel);
+				}
+				list_entry->field.nowrite = 1;
+			}
+
+			for (j = 0; j < event_desc->nr_fields; j++) {
+				const struct lttng_event_field *event_field =
+					&event_desc->fields[j];
+				struct tp_field_list_entry *list_entry;
+
+				list_entry = zmalloc(sizeof(*list_entry));
+				if (!list_entry)
+					goto err_nomem;
+				cds_list_add(&list_entry->head, &list->head);
+				strncpy(list_entry->field.event_name,
+					event_desc->name,
+					LTTNG_UST_SYM_NAME_LEN);
+				list_entry->field.event_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+				strncpy(list_entry->field.field_name,
+					event_field->name,
+					LTTNG_UST_SYM_NAME_LEN);
+				list_entry->field.field_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+				switch (event_field->type.atype) {
+				case atype_integer:
+					list_entry->field.type = LTTNG_UST_FIELD_INTEGER;
+					break;
+				case atype_string:
+					list_entry->field.type = LTTNG_UST_FIELD_STRING;
+					break;
+				case atype_array:
+					if (event_field->type.u.array.elem_type.atype != atype_integer
+						|| event_field->type.u.array.elem_type.u.basic.integer.encoding == lttng_encode_none)
+						list_entry->field.type = LTTNG_UST_FIELD_OTHER;
+					else
+						list_entry->field.type = LTTNG_UST_FIELD_STRING;
+					break;
+				case atype_sequence:
+					if (event_field->type.u.sequence.elem_type.atype != atype_integer
+						|| event_field->type.u.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none)
+						list_entry->field.type = LTTNG_UST_FIELD_OTHER;
+					else
+						list_entry->field.type = LTTNG_UST_FIELD_STRING;
+					break;
+				case atype_float:
+					list_entry->field.type = LTTNG_UST_FIELD_FLOAT;
+					break;
+				case atype_enum:
+					list_entry->field.type = LTTNG_UST_FIELD_ENUM;
+					break;
+				default:
+					list_entry->field.type = LTTNG_UST_FIELD_OTHER;
+				}
+				if (!event_desc->loglevel) {
+					list_entry->field.loglevel = TRACE_DEFAULT;
+				} else {
+					list_entry->field.loglevel = *(*event_desc->loglevel);
+				}
+				list_entry->field.nowrite = event_field->nowrite;
+			}
+		}
+	}
+	if (cds_list_empty(&list->head))
+		list->iter = NULL;
+	else
+		list->iter =
+			cds_list_first_entry(&list->head,
+				struct tp_field_list_entry, head);
+	return 0;
+
+err_nomem:
+	ltt_probes_prune_field_list(list);
+	return -ENOMEM;
+}
+
+/*
+ * Return current iteration position, advance internal iterator to next.
+ * Return NULL if end of list.
+ */
+struct lttng_ust_field_iter *
+	lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list)
+{
+	struct tp_field_list_entry *entry;
+
+	if (!list->iter)
+		return NULL;
+	entry = list->iter;
+	if (entry->head.next == &list->head)
+		list->iter = NULL;
+	else
+		list->iter = cds_list_entry(entry->head.next,
+				struct tp_field_list_entry, head);
+	return &entry->field;
+}
+
 /*
  * marshall all probes/all events and create those that fit the
  * wildcard. Add them to the events list as created.
@@ -259,8 +395,7 @@ void ltt_probes_create_wildcard_events(struct wildcard_entry *entry,
 					sizeof(event_param.name));
 				/* create event */
 				ret = ltt_event_create(wildcard->chan,
-					&event_param, NULL,
-					&ev);
+					&event_param, &ev);
 				if (ret) {
 					DBG("Error creating event");
 					continue;
@@ -270,5 +405,6 @@ void ltt_probes_create_wildcard_events(struct wildcard_entry *entry,
 			}
 		}
 	}
+	lttng_filter_wildcard_link_bytecode(wildcard);
 }