X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.cpp;h=872bc1abf8f89c322e217b365138e88c5341d7f8;hb=45110cdd99bd9ecc13a12d29afde3fffa48b4641;hp=431bb98f6cd25ce1da5315ffd177b37960525d04;hpb=a00932c89ecca1b8ff133df17cc6737322247f4b;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.cpp b/src/common/ust-consumer/ust-consumer.cpp
index 431bb98f6..872bc1abf 100644
--- a/src/common/ust-consumer/ust-consumer.cpp
+++ b/src/common/ust-consumer/ust-consumer.cpp
@@ -702,6 +702,14 @@ static int flush_channel(uint64_t chan_key)
 next:
 		pthread_mutex_unlock(&stream->lock);
 	}
+
+	/*
+	 * Send one last buffer statistics update to the session daemon. This
+	 * ensures that the session daemon gets at least one statistics update
+	 * per channel even in the case of short-lived channels, such as when a
+	 * short-lived app is traced in per-pid mode.
+	 */
+	sample_and_send_channel_buffer_stats(channel);
 error:
 	rcu_read_unlock();
 	return ret;
@@ -1081,13 +1089,13 @@ static int snapshot_channel(struct lttng_consumer_channel *channel,
 		if (use_relayd) {
 			ret = consumer_send_relayd_stream(stream, path);
 			if (ret < 0) {
-				goto error_unlock;
+				goto error_close_stream;
 			}
 		} else {
 			ret = consumer_stream_create_output_files(stream,
 					false);
 			if (ret < 0) {
-				goto error_unlock;
+				goto error_close_stream;
 			}
 			DBG("UST consumer snapshot stream (%" PRIu64 ")",
 					stream->key);
@@ -1109,19 +1117,19 @@ static int snapshot_channel(struct lttng_consumer_channel *channel,
 		ret = lttng_ustconsumer_take_snapshot(stream);
 		if (ret < 0) {
 			ERR("Taking UST snapshot");
-			goto error_unlock;
+			goto error_close_stream;
 		}
 
 		ret = lttng_ustconsumer_get_produced_snapshot(stream, &produced_pos);
 		if (ret < 0) {
 			ERR("Produced UST snapshot position");
-			goto error_unlock;
+			goto error_close_stream;
 		}
 
 		ret = lttng_ustconsumer_get_consumed_snapshot(stream, &consumed_pos);
 		if (ret < 0) {
 			ERR("Consumerd UST snapshot position");
-			goto error_unlock;
+			goto error_close_stream;
 		}
 
 		/*
@@ -1198,7 +1206,7 @@ static int snapshot_channel(struct lttng_consumer_channel *channel,
 		}
 
 		/* Simply close the stream so we can use it on the next snapshot. */
-		consumer_stream_close(stream);
+		consumer_stream_close_output(stream);
 		pthread_mutex_unlock(&stream->lock);
 	}
 
@@ -1210,7 +1218,7 @@ error_put_subbuf:
 		ERR("Snapshot lttng_ust_ctl_put_subbuf");
 	}
 error_close_stream:
-	consumer_stream_close(stream);
+	consumer_stream_close_output(stream);
 error_unlock:
 	pthread_mutex_unlock(&stream->lock);
 	rcu_read_unlock();
@@ -2093,9 +2101,11 @@ end_rotate_channel_nosignal:
 	case LTTNG_CONSUMER_INIT:
 	{
 		int ret_send_status;
+		lttng_uuid sessiond_uuid;
 
-		ret_code = lttng_consumer_init_command(ctx,
-				msg.u.init.sessiond_uuid);
+		std::copy(std::begin(msg.u.init.sessiond_uuid), std::end(msg.u.init.sessiond_uuid),
+				sessiond_uuid.begin());
+		ret_code = lttng_consumer_init_command(ctx, sessiond_uuid);
 		health_code_update();
 		ret_send_status = consumer_send_status_msg(sock, ret_code);
 		if (ret_send_status < 0) {
@@ -2421,8 +2431,9 @@ void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream)
 			stream->quiescent = true;
 		}
 	}
-	pthread_mutex_unlock(&stream->lock);
+
 	stream->hangup_flush_done = 1;
+	pthread_mutex_unlock(&stream->lock);
 }
 
 void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan)