X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=c80ecbfdadc92a94be63e0c541d38e02d1a330e2;hb=809b929460a19e790b0d4281753b3dd3fdd073a3;hp=66ec7b2ca7862715ca3295a179462266eaad4493;hpb=d37ecb3fc622dee6f80f84c21f38d32eef407262;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 66ec7b2c..c80ecbfd 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -34,9 +34,9 @@
 #include <time.h>
 #include <stdbool.h>
 #include <unistd.h>
+#include <dlfcn.h>
 #include <lttng/ust-endian.h>
 
-#include <urcu-bp.h>
 #include <urcu/arch.h>
 #include <urcu/compiler.h>
 #include <urcu/hlist.h>
@@ -67,6 +67,7 @@
 #include "ust-events-internal.h"
 #include "wait.h"
 #include "../libringbuffer/shm.h"
+#include "../libcounter/counter.h"
 #include "jhash.h"
 #include <lttng/ust-abi.h>
 
@@ -142,11 +143,6 @@ int lttng_loglevel_match(int loglevel,
 	}
 }
 
-void synchronize_trace(void)
-{
-	synchronize_rcu();
-}
-
 struct lttng_session *lttng_session_create(void)
 {
 	struct lttng_session *session;
@@ -171,6 +167,46 @@ struct lttng_session *lttng_session_create(void)
 	return session;
 }
 
+struct lttng_counter *lttng_ust_counter_create(
+		const char *counter_transport_name,
+		size_t number_dimensions, const struct lttng_counter_dimension *dimensions)
+{
+	struct lttng_counter_transport *counter_transport = NULL;
+	struct lttng_counter *counter = NULL;
+
+	counter_transport = lttng_counter_transport_find(counter_transport_name);
+	if (!counter_transport)
+		goto notransport;
+	counter = zmalloc(sizeof(struct lttng_counter));
+	if (!counter)
+		goto nomem;
+
+	counter->ops = &counter_transport->ops;
+	counter->transport = counter_transport;
+
+	counter->counter = counter->ops->counter_create(
+			number_dimensions, dimensions, 0,
+			-1, 0, NULL, false);
+	if (!counter->counter) {
+		goto create_error;
+	}
+
+	return counter;
+
+create_error:
+	free(counter);
+nomem:
+notransport:
+	return NULL;
+}
+
+static
+void lttng_ust_counter_destroy(struct lttng_counter *counter)
+{
+	counter->ops->counter_destroy(counter->counter);
+	free(counter);
+}
+
 struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
 {
 	struct lttng_event_notifier_group *event_notifier_group;
@@ -309,7 +345,7 @@ void lttng_session_destroy(struct lttng_session *session)
 	cds_list_for_each_entry(event, &session->events_head, node) {
 		_lttng_event_unregister(event);
 	}
-	synchronize_trace();	/* Wait for in-flight events to complete */
+	lttng_ust_synchronize_trace();	/* Wait for in-flight events to complete */
 	__tracepoint_probe_prune_release_queue();
 	cds_list_for_each_entry_safe(event_enabler, event_tmpenabler,
 			&session->enablers_head, node)
@@ -342,7 +378,7 @@ void lttng_event_notifier_group_destroy(
 			&event_notifier_group->event_notifiers_head, node)
 		_lttng_event_notifier_unregister(notifier);
 
-	synchronize_trace();
+	lttng_ust_synchronize_trace();
 
 	cds_list_for_each_entry_safe(notifier_enabler, tmpnotifier_enabler,
 			&event_notifier_group->enablers_head, node)
@@ -352,7 +388,10 @@ void lttng_event_notifier_group_destroy(
 			&event_notifier_group->event_notifiers_head, node)
 		_lttng_event_notifier_destroy(notifier);
 
-	/* Close the notification fd to the listener of event notifiers. */
+	if (event_notifier_group->error_counter)
+		lttng_ust_counter_destroy(event_notifier_group->error_counter);
+
+	/* Close the notification fd to the listener of event_notifiers. */
 
 	lttng_ust_lock_fd_tracker();
 	close_ret = close(event_notifier_group->notification_fd);
@@ -797,7 +836,7 @@ socket_error:
 
 static
 int lttng_event_notifier_create(const struct lttng_event_desc *desc,
-		uint64_t token,
+		uint64_t token, uint64_t error_counter_index,
 		struct lttng_event_notifier_group *event_notifier_group)
 {
 	struct lttng_event_notifier *event_notifier;
@@ -820,6 +859,7 @@ int lttng_event_notifier_create(const struct lttng_event_desc *desc,
 
 	event_notifier->group = event_notifier_group;
 	event_notifier->user_token = token;
+	event_notifier->error_counter_index = error_counter_index;
 
 	/* Event notifier will be enabled by enabler sync. */
 	event_notifier->enabled = 0;
@@ -1174,7 +1214,7 @@ void lttng_probe_provider_unregister_events(
 		_lttng_event_notifier_unregister);
 
 	/* Wait for grace period. */
-	synchronize_trace();
+	lttng_ust_synchronize_trace();
 	/* Prune the unregistration queue. */
 	__tracepoint_probe_prune_release_queue();
 
@@ -1373,6 +1413,7 @@ struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
 	CDS_INIT_LIST_HEAD(&event_notifier_enabler->base.excluder_head);
 
 	event_notifier_enabler->user_token = event_notifier_param->event.token;
+	event_notifier_enabler->error_counter_index = event_notifier_param->error_counter_index;
 	event_notifier_enabler->num_captures = 0;
 
 	memcpy(&event_notifier_enabler->base.event_param.name,
@@ -1722,6 +1763,7 @@ void lttng_create_event_notifier_if_missing(
 			 */
 			ret = lttng_event_notifier_create(desc,
 				event_notifier_enabler->user_token,
+				event_notifier_enabler->error_counter_index,
 				event_notifier_group);
 			if (ret) {
 				DBG("Unable to create event_notifier %s, error %d\n",