X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=0459d7a3f29bf22fcef79f12605834b877feeb10;hb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;hp=9085b04049fc48f6467785348120485bf1551479;hpb=ac6b4ac62c8cd22eede4b0fd49706e8f838bf208;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 9085b040..0459d7a3 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -37,19 +37,25 @@
  *     - Takes instrumentation source specific arguments.
  */
 
-#include <lttng/ust-abi.h>
-#include <lttng/ust-error.h>
+#define _LGPL_SOURCE
+#include <stdint.h>
+
 #include <urcu/compiler.h>
 #include <urcu/list.h>
+
+#include <helper.h>
+#include <lttng/tracepoint.h>
+#include <lttng/ust-abi.h>
+#include <lttng/ust-error.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-version.h>
-#include <lttng/tracepoint.h>
-#include "tracepoint-internal.h"
+#include <ust-fd.h>
 #include <usterr-signal-safe.h>
-#include <helper.h>
-#include "lttng-tracer.h"
-#include "../libringbuffer/shm.h"
+
 #include "../libringbuffer/frontend_types.h"
+#include "../libringbuffer/shm.h"
+#include "lttng-tracer.h"
+#include "string-utils.h"
 
 #define OBJ_NAME_LEN	16
 
@@ -71,6 +77,7 @@ struct lttng_ust_obj {
 			void *private_data;
 			const struct lttng_ust_objd_ops *ops;
 			int f_count;
+			int owner_ref;	/* has ref from owner */
 			void *owner;
 			char name[OBJ_NAME_LEN];
 		} s;
@@ -126,6 +133,7 @@ end:
 	obj->u.s.ops = ops;
 	obj->u.s.f_count = 2;	/* count == 1 : object is allocated */
 				/* count == 2 : allocated + hold ref */
+	obj->u.s.owner_ref = 1;	/* One owner reference */
 	obj->u.s.owner = owner;
 	strncpy(obj->u.s.name, name, OBJ_NAME_LEN);
 	obj->u.s.name[OBJ_NAME_LEN - 1] = '\0';
@@ -183,10 +191,11 @@ static
 void objd_ref(int id)
 {
 	struct lttng_ust_obj *obj = _objd_get(id);
+	assert(obj != NULL);
 	obj->u.s.f_count++;
 }
 
-int lttng_ust_objd_unref(int id)
+int lttng_ust_objd_unref(int id, int is_owner)
 {
 	struct lttng_ust_obj *obj = _objd_get(id);
 
@@ -196,9 +205,16 @@ int lttng_ust_objd_unref(int id)
 		ERR("Reference counting error\n");
 		return -EINVAL;
 	}
+	if (is_owner) {
+		if (!obj->u.s.owner_ref) {
+			ERR("Error decrementing owner reference");
+			return -EINVAL;
+		}
+		obj->u.s.owner_ref--;
+	}
 	if ((--obj->u.s.f_count) == 1) {
 		const struct lttng_ust_objd_ops *ops = objd_ops(id);
-		
+
 		if (ops->release)
 			ops->release(id);
 		objd_free(id);
@@ -211,8 +227,16 @@ void objd_table_destroy(void)
 {
 	int i;
 
-	for (i = 0; i < objd_table.allocated_len; i++)
-		(void) lttng_ust_objd_unref(i);
+	for (i = 0; i < objd_table.allocated_len; i++) {
+		struct lttng_ust_obj *obj;
+
+		obj = _objd_get(i);
+		if (!obj)
+			continue;
+		if (!obj->u.s.owner_ref)
+			continue;	/* only unref owner ref. */
+		(void) lttng_ust_objd_unref(i, 1);
+	}
 	free(objd_table.array);
 	objd_table.array = NULL;
 	objd_table.len = 0;
@@ -241,8 +265,10 @@ void lttng_ust_objd_table_owner_cleanup(void *owner)
 			continue;
 		if (!obj->u.s.owner)
 			continue;	/* skip root handles */
+		if (!obj->u.s.owner_ref)
+			continue;	/* only unref owner ref. */
 		if (obj->u.s.owner == owner)
-			(void) lttng_ust_objd_unref(i);
+			(void) lttng_ust_objd_unref(i, 1);
 	}
 }
 
@@ -315,9 +341,10 @@ long lttng_abi_tracer_version(int objd,
 static
 long lttng_abi_add_context(int objd,
 	struct lttng_ust_context *context_param,
+	union ust_args *uargs,
 	struct lttng_ctx **ctx, struct lttng_session *session)
 {
-	return lttng_attach_context(context_param, ctx, session);
+	return lttng_attach_context(context_param, uargs, ctx, session);
 }
 
 /**
@@ -384,11 +411,13 @@ int lttng_abi_map_channel(int session_objd,
 	struct channel *chan;
 	struct lttng_ust_lib_ring_buffer_config *config;
 	void *chan_data;
+	int wakeup_fd;
 	uint64_t len;
 	int ret;
 	enum lttng_ust_chan_type type;
 
 	chan_data = uargs->channel.chan_data;
+	wakeup_fd = uargs->channel.wakeup_fd;
 	len = ust_chan->len;
 	type = ust_chan->type;
 
@@ -396,7 +425,8 @@ int lttng_abi_map_channel(int session_objd,
 	case LTTNG_UST_CHAN_PER_CPU:
 		break;
 	default:
-		return -EINVAL;
+		ret = -EINVAL;
+		goto invalid;
 	}
 
 	if (session->been_active) {
@@ -404,7 +434,7 @@ int lttng_abi_map_channel(int session_objd,
 		goto active;	/* Refuse to add channel to active session */
 	}
 
-	channel_handle = channel_handle_create(chan_data, len);
+	channel_handle = channel_handle_create(chan_data, len, wakeup_fd);
 	if (!channel_handle) {
 		ret = -EINVAL;
 		goto handle_error;
@@ -412,6 +442,7 @@ int lttng_abi_map_channel(int session_objd,
 
 	chan = shmp(channel_handle, channel_handle->chan);
 	assert(chan);
+	chan->handle = channel_handle;
 	config = &chan->backend.config;
 	lttng_chan = channel_get_private(chan);
 	if (!lttng_chan) {
@@ -423,8 +454,19 @@ int lttng_abi_map_channel(int session_objd,
 	switch (type) {
 	case LTTNG_UST_CHAN_PER_CPU:
 		if (config->output == RING_BUFFER_MMAP) {
-			transport_name = config->mode == RING_BUFFER_OVERWRITE ?
-				"relay-overwrite-mmap" : "relay-discard-mmap";
+			if (config->mode == RING_BUFFER_OVERWRITE) {
+				if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER) {
+					transport_name = "relay-overwrite-mmap";
+				} else {
+					transport_name = "relay-overwrite-rt-mmap";
+				}
+			} else {
+				if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER) {
+					transport_name = "relay-discard-mmap";
+				} else {
+					transport_name = "relay-discard-rt-mmap";
+				}
+			}
 		} else {
 			ret = -EINVAL;
 			goto notransport;
@@ -432,8 +474,6 @@ int lttng_abi_map_channel(int session_objd,
 		chan_name = "channel";
 		break;
 	default:
-		transport_name = "<unknown>";
-		chan_name = "<unknown>";
 		ret = -EINVAL;
 		goto notransport;
 	}
@@ -476,13 +516,31 @@ int lttng_abi_map_channel(int session_objd,
 	objd_ref(session_objd);
 	return chan_objd;
 
+	/* error path after channel was created */
 objd_error:
 notransport:
-	free(lttng_chan);
 alloc_error:
 	channel_destroy(chan, channel_handle, 0);
+	return ret;
+
+	/*
+	 * error path before channel creation (owning chan_data and
+	 * wakeup_fd).
+	 */
 handle_error:
 active:
+invalid:
+	{
+		int close_ret;
+
+		lttng_ust_lock_fd_tracker();
+		close_ret = close(wakeup_fd);
+		lttng_ust_unlock_fd_tracker();
+		if (close_ret) {
+			PERROR("close");
+		}
+	}
+	free(chan_data);
 	return ret;
 }
 
@@ -522,6 +580,8 @@ long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
 	case LTTNG_UST_SESSION_STOP:
 	case LTTNG_UST_DISABLE:
 		return lttng_session_disable(session);
+	case LTTNG_UST_SESSION_STATEDUMP:
+		return lttng_session_statedump(session);
 	default:
 		return -EINVAL;
 	}
@@ -607,7 +667,7 @@ alloc_error:
 	{
 		int err;
 
-		err = lttng_ust_objd_unref(list_objd);
+		err = lttng_ust_objd_unref(list_objd, 1);
 		assert(!err);
 	}
 objd_error:
@@ -687,7 +747,7 @@ alloc_error:
 	{
 		int err;
 
-		err = lttng_ust_objd_unref(list_objd);
+		err = lttng_ust_objd_unref(list_objd, 1);
 		assert(!err);
 	}
 objd_error:
@@ -766,7 +826,7 @@ event_error:
 	{
 		int err;
 
-		err = lttng_ust_objd_unref(event_objd);
+		err = lttng_ust_objd_unref(event_objd, 1);
 		assert(!err);
 	}
 objd_error:
@@ -824,10 +884,14 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
 	{
 		struct lttng_ust_event *event_param =
 			(struct lttng_ust_event *) arg;
-		if (event_param->name[strlen(event_param->name) - 1] == '*') {
-			/* If ends with wildcard, create wildcard. */
+
+		if (strutils_is_star_glob_pattern(event_param->name)) {
+			/*
+			 * If the event name is a star globbing pattern,
+			 * we create the special star globbing enabler.
+			 */
 			return lttng_abi_create_enabler(objd, event_param,
-					owner, LTTNG_ENABLER_WILDCARD);
+					owner, LTTNG_ENABLER_STAR_GLOB);
 		} else {
 			return lttng_abi_create_enabler(objd, event_param,
 					owner, LTTNG_ENABLER_EVENT);
@@ -835,7 +899,7 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
 	}
 	case LTTNG_UST_CONTEXT:
 		return lttng_abi_add_context(objd,
-				(struct lttng_ust_context *) arg,
+				(struct lttng_ust_context *) arg, uargs,
 				&channel->ctx, channel->session);
 	case LTTNG_UST_ENABLE:
 		return lttng_channel_enable(channel);
@@ -854,7 +918,7 @@ int lttng_channel_release(int objd)
 	struct lttng_channel *channel = objd_private(objd);
 
 	if (channel)
-		return lttng_ust_objd_unref(channel->session->objd);
+		return lttng_ust_objd_unref(channel->session->objd, 0);
 	return 0;
 }
 
@@ -882,6 +946,8 @@ static const struct lttng_ust_objd_ops lttng_channel_ops = {
  *		Disable recording for this enabler
  *	LTTNG_UST_FILTER
  *		Attach a filter to an enabler.
+ *	LTTNG_UST_EXCLUSION
+ *		Attach exclusions to an enabler.
  */
 static
 long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
@@ -907,6 +973,11 @@ long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
 			return ret;
 		return 0;
 	}
+	case LTTNG_UST_EXCLUSION:
+	{
+		return lttng_enabler_attach_exclusion(enabler,
+				(struct lttng_ust_excluder_node *) arg);
+	}
 	default:
 		return -EINVAL;
 	}
@@ -918,7 +989,7 @@ int lttng_enabler_release(int objd)
 	struct lttng_enabler *enabler = objd_private(objd);
 
 	if (enabler)
-		return lttng_ust_objd_unref(enabler->chan->objd);
+		return lttng_ust_objd_unref(enabler->chan->objd, 0);
 	return 0;
 }
 
@@ -930,6 +1001,8 @@ static const struct lttng_ust_objd_ops lttng_enabler_ops = {
 void lttng_ust_abi_exit(void)
 {
 	lttng_ust_abi_close_in_progress = 1;
+	ust_lock_nocheck();
 	objd_table_destroy();
+	ust_unlock();
 	lttng_ust_abi_close_in_progress = 0;
 }