X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-events.c;h=e3a842526dba6af21c5b7d696e7e6424fdb26db8;hb=0ca42eb7127913b7f35bcacc3bccc8ebedb429c5;hp=a3030533d1e62d1c01f4cc8b0db9fed4cffa7425;hpb=a344f64bd188272ee3d0a6055aaa6a3eabd0669d;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index a3030533..e3a84252 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -40,7 +40,6 @@
 #include <lttng-abi-old.h>
 #include <lttng-endian.h>
 #include <lttng-string-utils.h>
-#include <wrapper/vzalloc.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
 
@@ -130,7 +129,7 @@ struct lttng_session *lttng_session_create(void)
 			GFP_KERNEL);
 	if (!metadata_cache)
 		goto err_free_session;
-	metadata_cache->data = lttng_vzalloc(METADATA_CACHE_DEFAULT_SIZE);
+	metadata_cache->data = vzalloc(METADATA_CACHE_DEFAULT_SIZE);
 	if (!metadata_cache->data)
 		goto err_free_cache;
 	metadata_cache->cache_alloc = METADATA_CACHE_DEFAULT_SIZE;
@@ -226,6 +225,9 @@ int lttng_session_enable(struct lttng_session *session)
 	/* Set transient enabler state to "enabled" */
 	session->tstate = 1;
 
+	/* We need to sync enablers with session before activation. */
+	lttng_session_sync_enablers(session);
+
 	/*
 	 * Snapshot the number of events per channel to know the type of header
 	 * we need to use.
@@ -239,9 +241,6 @@ int lttng_session_enable(struct lttng_session *session)
 			chan->header_type = 2;	/* large */
 	}
 
-	/* We need to sync enablers with session before activation. */
-	lttng_session_sync_enablers(session);
-
 	/* Clear each stream's quiescent state. */
 	list_for_each_entry(chan, &session->chan, list) {
 		if (chan->channel_type != METADATA_CHANNEL)
@@ -749,6 +748,7 @@ struct lttng_event *_lttng_event_create(struct lttng_channel *chan,
 		 */
 		event->enabled = 0;
 		event->registered = 1;
+
 		/*
 		 * Populate lttng_event structure before event
 		 * registration.
@@ -756,8 +756,7 @@ struct lttng_event *_lttng_event_create(struct lttng_channel *chan,
 		smp_wmb();
 
 		ret = lttng_uprobes_register(event_param->name,
-				event_param->u.uprobe.path,
-				event_param->u.uprobe.offset,
+				event_param->u.uprobe.fd,
 				event);
 		if (ret)
 			goto register_error;
@@ -1466,6 +1465,18 @@ error_free:
 	return ret;
 }
 
+int lttng_event_add_callsite(struct lttng_event *event,
+		struct lttng_kernel_event_callsite __user *callsite)
+{
+
+	switch (event->instrumentation) {
+	case LTTNG_KERNEL_UPROBE:
+		return lttng_uprobes_add_callsite(event, callsite);
+	default:
+		return -EINVAL;
+	}
+}
+
 int lttng_enabler_attach_context(struct lttng_enabler *enabler,
 		struct lttng_kernel_context *context_param)
 {
@@ -1680,7 +1691,7 @@ int lttng_metadata_printf(struct lttng_session *session,
 		tmp_cache_alloc_size = max_t(unsigned int,
 				session->metadata_cache->cache_alloc + len,
 				session->metadata_cache->cache_alloc << 1);
-		tmp_cache_realloc = lttng_vzalloc(tmp_cache_alloc_size);
+		tmp_cache_realloc = vzalloc(tmp_cache_alloc_size);
 		if (!tmp_cache_realloc)
 			goto err;
 		if (session->metadata_cache->data) {