X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-probes.c;h=e7dab9fce49c2603392a9362311aff3a88ee39d3;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=a09497f87ba444adc58a1765d0757a04fda7a809;hpb=0fdd0b8989a06910521827f82058f7100d9b6b8e;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-probes.c b/liblttng-ust/lttng-probes.c
index a09497f8..e7dab9fc 100644
--- a/liblttng-ust/lttng-probes.c
+++ b/liblttng-ust/lttng-probes.c
@@ -1,23 +1,9 @@
 /*
- * lttng-probes.c
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * Holds LTTng probes registry.
- *
- * Copyright 2010-2012 (c) - 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.
+ * Copyright 2010-2012 (C) Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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
+ * Holds LTTng probes registry.
  */
 
 #define _LGPL_SOURCE
@@ -35,6 +21,7 @@
 #include "lttng-tracer-core.h"
 #include "jhash.h"
 #include "error.h"
+#include "ust-events-internal.h"
 
 /*
  * probe list is protected by ust_lock()/ust_unlock().
@@ -204,16 +191,12 @@ int lttng_probe_register(struct lttng_probe_desc *desc)
 	if (lttng_session_active())
 		fixup_lazy_probes();
 
+	lttng_fix_pending_event_notifiers();
+
 	ust_unlock();
 	return ret;
 }
 
-/* Backward compatibility with UST 2.0 */
-int ltt_probe_register(struct lttng_probe_desc *desc)
-{
-	return lttng_probe_register(desc);
-}
-
 void lttng_probe_unregister(struct lttng_probe_desc *desc)
 {
 	lttng_ust_fixup_tls();
@@ -226,14 +209,11 @@ void lttng_probe_unregister(struct lttng_probe_desc *desc)
 		cds_list_del(&desc->head);
 	else
 		cds_list_del(&desc->lazy_init_head);
-	DBG("just unregistered probe %s", desc->provider);
-	ust_unlock();
-}
 
-/* Backward compatibility with UST 2.0 */
-void ltt_probe_unregister(struct lttng_probe_desc *desc)
-{
-	lttng_probe_unregister(desc);
+	lttng_probe_provider_unregister_events(desc);
+	DBG("just unregistered probes of provider %s", desc->provider);
+
+	ust_unlock();
 }
 
 void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list)
@@ -382,15 +362,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;
@@ -398,7 +392,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: