X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-probes.c;h=9b3bacc41f7c5559789f1501e7b47724dc8ae19e;hb=218deb69baab57ee2f6728eef18e84697f21197b;hp=862b19e7c47e3c7c5b5e262e5b1bc02edf3c090f;hpb=2c05c691a10f3130f9339a15369140ad6ca70f85;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-probes.c b/liblttng-ust/lttng-probes.c
index 862b19e7..9b3bacc4 100644
--- a/liblttng-ust/lttng-probes.c
+++ b/liblttng-ust/lttng-probes.c
@@ -385,15 +385,29 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
 					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)
+					if (event_field->type.u.legacy.array.elem_type.atype != atype_integer
+						|| event_field->type.u.legacy.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_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)
 						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)
+					if (event_field->type.u.legacy.sequence.elem_type.atype != atype_integer
+						|| event_field->type.u.legacy.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_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)
 						list_entry->field.type = LTTNG_UST_FIELD_OTHER;
 					else
 						list_entry->field.type = LTTNG_UST_FIELD_STRING;
@@ -401,7 +415,8 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list)
 				case atype_float:
 					list_entry->field.type = LTTNG_UST_FIELD_FLOAT;
 					break;
-				case atype_enum:
+				case atype_enum:	/* Fall-through */
+				case atype_enum_nestable:
 					list_entry->field.type = LTTNG_UST_FIELD_ENUM;
 					break;
 				default: