X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=2c1b845adf56bc35ef2ec1875599e2c2113904ae;hp=2a810aba15fd2db25f4c47bf5d98bf3a70b0d607;hb=5b951542a175819b62269e6904641f1a26149c96;hpb=92816cc33a1add3c8276839bd6335e17423577dd

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 2a810aba1..2c1b845ad 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -487,9 +487,11 @@ void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan,
 		registry = get_session_registry(ua_chan->session);
 		if (registry) {
 			ust_registry_channel_del_free(registry, ua_chan->key,
-				true);
+				sock >= 0);
+		}
+		if (sock >= 0) {
+			save_per_pid_lost_discarded_counters(ua_chan);
 		}
-		save_per_pid_lost_discarded_counters(ua_chan);
 	}
 
 	if (ua_chan->obj != NULL) {
@@ -3017,7 +3019,7 @@ static int create_channel_per_pid(struct ust_app *app,
 	if (ret < 0) {
 		ERR("Error creating UST channel \"%s\" on the consumer daemon",
 			ua_chan->name);
-		goto error;
+		goto error_remove_from_registry;
 	}
 
 	ret = send_channel_pid_to_ust(app, ua_sess, ua_chan);
@@ -3025,7 +3027,7 @@ static int create_channel_per_pid(struct ust_app *app,
 		if (ret != -ENOTCONN) {
 			ERR("Error sending channel to application");
 		}
-		goto error;
+		goto error_remove_from_registry;
 	}
 
 	chan_reg_key = ua_chan->key;
@@ -3045,9 +3047,13 @@ static int create_channel_per_pid(struct ust_app *app,
 	if (cmd_ret != LTTNG_OK) {
 		ret = - (int) cmd_ret;
 		ERR("Failed to add channel to notification thread");
-		goto error;
+		goto error_remove_from_registry;
 	}
 
+error_remove_from_registry:
+	if (ret) {
+		ust_registry_channel_del_free(registry, ua_chan->key, false);
+	}
 error:
 	rcu_read_unlock();
 	return ret;
@@ -5429,7 +5435,7 @@ static int reply_ust_register_channel(int sock, int cobjd,
 		size_t nr_fields, struct ustctl_field *fields)
 {
 	int ret, ret_code = 0;
-	uint32_t chan_id, reg_count;
+	uint32_t chan_id;
 	uint64_t chan_reg_key;
 	enum ustctl_channel_header type;
 	struct ust_app *app;
@@ -5481,13 +5487,12 @@ static int reply_ust_register_channel(int sock, int cobjd,
 	assert(chan_reg);
 
 	if (!chan_reg->register_done) {
-		reg_count = ust_registry_get_event_count(chan_reg);
-		if (reg_count < 31) {
-			type = USTCTL_CHANNEL_HEADER_COMPACT;
-		} else {
-			type = USTCTL_CHANNEL_HEADER_LARGE;
-		}
-
+		/*
+		 * TODO: eventually use the registry event count for
+		 * this channel to better guess header type for per-pid
+		 * buffers.
+		 */
+		type = USTCTL_CHANNEL_HEADER_LARGE;
 		chan_reg->nr_ctx_fields = nr_fields;
 		chan_reg->ctx_fields = fields;
 		fields = NULL;
@@ -6425,7 +6430,7 @@ int ust_app_rotate_session(struct ltt_session *session)
 
 			registry = get_session_registry(ua_sess);
 			if (!registry) {
-				DBG("Application session is being torn down. Abort snapshot record.");
+				DBG("Application session is being torn down. Abort session rotation.");
 				ret = -1;
 				goto error;
 			}