X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=d1beac3a6d027154e5d40acd696a0d1cfcb6cf14;hb=fb54defd7e47e106bdf3b7eb07d53f0aba0525ec;hp=9ee91ae355e442f7b06bcac54d82018ac1d637db;hpb=3140bffe7c33b7600c6aa34180599144423eb981;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 9ee91ae3..d1beac3a 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
 #include <urcu/list.h>
@@ -318,7 +317,20 @@ int lttng_create_enum_check(const struct lttng_type *type,
 		const struct lttng_enum_desc *enum_desc;
 		int ret;
 
-		enum_desc = type->u.basic.enumeration.desc;
+		enum_desc = type->u.legacy.basic.enumeration.desc;
+		ret = lttng_enum_create(enum_desc, session);
+		if (ret && ret != -EEXIST) {
+			DBG("Unable to create enum error: (%d)", ret);
+			return ret;
+		}
+		break;
+	}
+	case atype_enum_nestable:
+	{
+		const struct lttng_enum_desc *enum_desc;
+		int ret;
+
+		enum_desc = type->u.enum_nestable.desc;
 		ret = lttng_enum_create(enum_desc, session);
 		if (ret && ret != -EEXIST) {
 			DBG("Unable to create enum error: (%d)", ret);
@@ -333,7 +345,7 @@ int lttng_create_enum_check(const struct lttng_type *type,
 		int ret;
 
 		tag_field_generic = lttng_ust_dynamic_type_tag_field();
-		enum_desc = tag_field_generic->type.u.basic.enumeration.desc;
+		enum_desc = tag_field_generic->type.u.enum_nestable.desc;
 		ret = lttng_enum_create(enum_desc, session);
 		if (ret && ret != -EEXIST) {
 			DBG("Unable to create enum error: (%d)", ret);
@@ -744,7 +756,8 @@ void lttng_create_event_if_missing(struct lttng_enabler *enabler)
 	 */
 	cds_list_for_each_entry(probe_desc, probe_list, head) {
 		for (i = 0; i < probe_desc->nr_events; i++) {
-			int found = 0, ret;
+			int ret;
+			bool found = false;
 			struct cds_hlist_head *head;
 			struct cds_hlist_node *node;
 			const char *event_name;
@@ -765,7 +778,7 @@ void lttng_create_event_if_missing(struct lttng_enabler *enabler)
 			cds_hlist_for_each_entry(event, node, head, hlist) {
 				if (event->desc == desc
 						&& event->chan == enabler->chan) {
-					found = 1;
+					found = true;
 					break;
 				}
 			}
@@ -871,11 +884,16 @@ void lttng_probe_provider_unregister_events(struct lttng_probe_desc *provider_de
 						struct lttng_enum *curr_enum;
 
 						field = &(event->desc->fields[j]);
-						if (field->type.atype != atype_enum) {
+						switch (field->type.atype) {
+						case atype_enum:
+							enum_desc = field->type.u.legacy.basic.enumeration.desc;
+							break;
+						case atype_enum_nestable:
+							enum_desc = field->type.u.enum_nestable.desc;
+							break;
+						default:
 							continue;
 						}
-
-						enum_desc = field->type.u.basic.enumeration.desc;
 						curr_enum = lttng_ust_enum_get_from_desc(session, enum_desc);
 						if (curr_enum) {
 							_lttng_enum_destroy(curr_enum);
@@ -901,6 +919,9 @@ int lttng_enabler_ref_events(struct lttng_enabler *enabler)
 	struct lttng_session *session = enabler->chan->session;
 	struct lttng_event *event;
 
+	if (!enabler->enabled)
+		goto end;
+
 	/* First ensure that probe events are created for this enabler. */
 	lttng_create_event_if_missing(enabler);
 
@@ -932,6 +953,7 @@ int lttng_enabler_ref_events(struct lttng_enabler *enabler)
 
 		/* TODO: merge event context. */
 	}
+end:
 	return 0;
 }
 
@@ -1122,6 +1144,8 @@ int lttng_attach_context(struct lttng_ust_context *context_param,
 		return lttng_add_net_ns_to_ctx(ctx);
 	case LTTNG_UST_CONTEXT_PID_NS:
 		return lttng_add_pid_ns_to_ctx(ctx);
+	case LTTNG_UST_CONTEXT_TIME_NS:
+		return lttng_add_time_ns_to_ctx(ctx);
 	case LTTNG_UST_CONTEXT_USER_NS:
 		return lttng_add_user_ns_to_ctx(ctx);
 	case LTTNG_UST_CONTEXT_UTS_NS: