X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Flttng-ust-abi.c;h=e125ac6d0eec37dc4151e3d178faef04a26d8fec;hb=c1ef86f0812ff62354175f4c7136930814b8f850;hp=16566c876664df8ae6a9e812ea126d2aa652ed77;hpb=824f40b81426c6ac82685251018dae00947786a9;p=lttng-ust.git

diff --git a/libust/lttng-ust-abi.c b/libust/lttng-ust-abi.c
index 16566c87..e125ac6d 100644
--- a/libust/lttng-ust-abi.c
+++ b/libust/lttng-ust-abi.c
@@ -177,11 +177,8 @@ void objd_table_destroy(void)
 {
 	int i;
 
-	for (i = 0; i < objd_table.allocated_len; i++) {
-		struct obj *obj = _objd_get(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;
@@ -211,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;
 }
 
@@ -276,8 +272,12 @@ 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);
+	case LTTNG_UST_CONTEXT_VPID:
+		return lttng_add_vpid_to_ctx(ctx);
 	default:
 		return -EINVAL;
 	}
@@ -730,7 +730,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: