X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=d8150b6b15627cb2cee21adfabfd315e0a70bc63;hb=710b8ee36eec50c00e72cb61e146357130e1d94c;hp=61245a88dfcc2cd18b2163e8016b199e6a26d2d5;hpb=0bfb5cbd86f8dfe42c2f00f524e63de93133b2c9;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 61245a88..d8150b6b 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -185,6 +185,7 @@ static
 void objd_ref(int id)
 {
 	struct lttng_ust_obj *obj = _objd_get(id);
+	assert(obj != NULL);
 	obj->u.s.f_count++;
 }
 
@@ -334,9 +335,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);
 }
 
 /**
@@ -466,8 +468,6 @@ int lttng_abi_map_channel(int session_objd,
 		chan_name = "channel";
 		break;
 	default:
-		transport_name = "<unknown>";
-		chan_name = "<unknown>";
 		ret = -EINVAL;
 		goto notransport;
 	}
@@ -573,6 +573,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;
 	}
@@ -886,7 +888,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);
@@ -988,6 +990,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;
 }