X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fltt-probes.c;h=8ccb6fab9d2f32c37e2c14fa945adbcb38a9b54e;hb=da6eed2597e16cf3291e1c0f0f9dcc2323d298cf;hp=3d6b1414b97c6baf2a0615592288cb9e67bb0225;hpb=06d4f27ebd73d4335d4365468798fc72904b30c6;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-probes.c b/liblttng-ust/ltt-probes.c
index 3d6b1414..8ccb6fab 100644
--- a/liblttng-ust/ltt-probes.c
+++ b/liblttng-ust/ltt-probes.c
@@ -261,6 +261,36 @@ int ltt_probes_get_field_list(struct lttng_ust_field_list *list)
 					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 {
@@ -342,8 +372,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;
@@ -353,5 +382,6 @@ void ltt_probes_create_wildcard_events(struct wildcard_entry *entry,
 			}
 		}
 	}
+	lttng_filter_wildcard_link_bytecode(wildcard);
 }