X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=a852aaef99752789ee66cb6a017485c8604e43b6;hb=refs%2Fheads%2Fstable-2.2;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..a852aaef 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -71,6 +71,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 +127,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';
@@ -186,7 +188,7 @@ void objd_ref(int id)
 	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,6 +198,13 @@ 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);
 		
@@ -211,8 +220,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 +258,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);
 	}
 }
 
@@ -384,11 +403,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 +417,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 +426,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 +434,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 +446,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;
@@ -476,13 +510,30 @@ 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;
+
+		close_ret = close(wakeup_fd);
+		if (close_ret) {
+			PERROR("close");
+		}
+	}
+	free(chan_data);
 	return ret;
 }
 
@@ -607,7 +658,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 +738,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 +817,7 @@ event_error:
 	{
 		int err;
 
-		err = lttng_ust_objd_unref(event_objd);
+		err = lttng_ust_objd_unref(event_objd, 1);
 		assert(!err);
 	}
 objd_error:
@@ -854,7 +905,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;
 }
 
@@ -918,7 +969,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;
 }