X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fltt-events.c;h=06d2f89714feeeaa3771361efd15bff5a003f2ad;hb=8fce9e2bd2103f4b413db52e7a6d970a7b057843;hp=2595ea89b11fd89e8cbfa375a00588eb15b98c86;hpb=44c72f10aa3cace72ffe40a0f9bb7aadb9c82dc8;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index 2595ea89..06d2f897 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -350,25 +350,33 @@ void _ltt_channel_destroy(struct ltt_channel *chan)
 /*
  * Supports event creation while tracing session is active.
  */
-struct ltt_event *ltt_event_create(struct ltt_channel *chan,
-				   struct lttng_ust_event *event_param,
-				   void *filter)
+int ltt_event_create(struct ltt_channel *chan,
+		struct lttng_ust_event *event_param,
+		void *filter,
+		struct ltt_event **_event)
 {
 	struct ltt_event *event;
-	int ret;
+	int ret = 0;
 
-	if (chan->used_event_id == -1UL)
+	if (chan->used_event_id == -1UL) {
+		ret = -ENOMEM;
 		goto full;
+	}
 	/*
 	 * This is O(n^2) (for each event, the loop is called at event
 	 * creation). Might require a hash if we have lots of events.
 	 */
-	cds_list_for_each_entry(event, &chan->session->events, list)
-		if (event->desc && !strcmp(event->desc->name, event_param->name))
+	cds_list_for_each_entry(event, &chan->session->events, list) {
+		if (event->desc && !strcmp(event->desc->name, event_param->name)) {
+			ret = -EEXIST;
 			goto exist;
+		}
+	}
 	event = zmalloc(sizeof(struct ltt_event));
-	if (!event)
+	if (!event) {
+		ret = -ENOMEM;
 		goto cache_error;
+	}
 	event->chan = chan;
 	event->filter = filter;
 	/*
@@ -401,6 +409,13 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan,
 				goto add_pending_error;
 		}
 		break;
+	case LTTNG_UST_TRACEPOINT_LOGLEVEL:
+		/*
+		 * TODO: add tracepoint loglevel to hash table, with
+		 * event info. Enable all events corresponding to
+		 * loglevel.
+		 */
+		break;
 	default:
 		WARN_ON_ONCE(1);
 	}
@@ -410,7 +425,8 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan,
 			goto statedump_error;
 	}
 	cds_list_add(&event->list, &chan->session->events);
-	return event;
+	*_event = event;
+	return 0;
 
 statedump_error:
 	if (event->desc) {
@@ -425,7 +441,7 @@ register_error:
 cache_error:
 exist:
 full:
-	return NULL;
+	return ret;
 }
 
 /*