X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Flttng-ust-abi.c;h=35c93c91b5e1b64bb088e3f601853b3353896170;hb=3b402b40d669bb6d65eebb91588a2edb8214b7ce;hp=cea8c30bffe8d29e39d4792bbfd6032b62c21d4c;hpb=193183fb924aef705f30358e54e7386a3a64c78d;p=lttng-ust.git

diff --git a/libust/lttng-ust-abi.c b/libust/lttng-ust-abi.c
index cea8c30b..35c93c91 100644
--- a/libust/lttng-ust-abi.c
+++ b/libust/lttng-ust-abi.c
@@ -177,16 +177,8 @@ void objd_table_destroy(void)
 {
 	int i;
 
-	for (i = 0; i < objd_table.allocated_len; i++) {
-		struct obj *obj = _objd_get(i);
-		const struct objd_ops *ops;
-
-		if (!obj)
-			continue;
-		ops = obj->u.s.ops;
-		if (ops->release)
-			ops->release(i);
-	}
+	for (i = 0; i < objd_table.allocated_len; i++)
+		(void) objd_unref(i);
 	free(objd_table.array);
 	objd_table.array = NULL;
 	objd_table.len = 0;
@@ -216,7 +208,6 @@ int lttng_abi_create_root_handle(void)
 	int root_handle;
 
 	root_handle = objd_alloc(NULL, &lttng_ops);
-	assert(root_handle == 0);
 	return root_handle;
 }
 
@@ -281,8 +272,10 @@ long lttng_abi_add_context(int objd,
 		return -EPERM;
 
 	switch (context_param->ctx) {
+	case LTTNG_UST_CONTEXT_PTHREAD_ID:
+		return lttng_add_pthread_id_to_ctx(ctx);
 	case LTTNG_UST_CONTEXT_VTID:
-		//TODO return lttng_add_vtid_to_ctx(ctx);
+		return lttng_add_vtid_to_ctx(ctx);
 	default:
 		return -EINVAL;
 	}
@@ -735,7 +728,7 @@ static const struct objd_ops lttng_metadata_ops = {
 static
 long lttng_rb_cmd(int objd, unsigned int cmd, unsigned long arg)
 {
-	struct stream_priv_data *priv = objd_private(objd);
+	//struct stream_priv_data *priv = objd_private(objd);
 
 	switch (cmd) {
 	default:
@@ -754,6 +747,7 @@ int lttng_rb_release(int objd)
 		buf = priv->buf;
 		channel = priv->ltt_chan;
 		free(priv);
+		channel->ops->buffer_read_close(buf, channel->handle);
 
 		return objd_unref(channel->objd);
 	}