X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=eb0f837160edf5b533bbc822ef0e8ddd768962f4;hb=4149ace8fa7c7a8da39272f03923df46039c5ff6;hp=a9dff558cbb22940bd6bc75c2041c3e6952c858a;hpb=fad1ed2fbb21d3158caa70c35b7b8373d158af11;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index a9dff558c..eb0f83716 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -92,6 +92,7 @@ static void copy_channel_attr_to_ustctl(
 	attr->switch_timer_interval = uattr->switch_timer_interval;
 	attr->read_timer_interval = uattr->read_timer_interval;
 	attr->output = uattr->output;
+	attr->blocking_timeout = uattr->u.s.blocking_timeout;
 }
 
 /*
@@ -1040,6 +1041,7 @@ struct ust_app_channel *alloc_ust_app_channel(char *name,
 		ua_chan->attr.switch_timer_interval = attr->switch_timer_interval;
 		ua_chan->attr.read_timer_interval = attr->read_timer_interval;
 		ua_chan->attr.output = attr->output;
+		ua_chan->attr.blocking_timeout = attr->u.s.blocking_timeout;
 	}
 	/* By default, the channel is a per cpu channel. */
 	ua_chan->attr.type = LTTNG_UST_CHAN_PER_CPU;
@@ -1803,6 +1805,8 @@ static void shadow_copy_channel(struct ust_app_channel *ua_chan,
 	ua_chan->attr.read_timer_interval = uchan->attr.read_timer_interval;
 	ua_chan->monitor_timer_interval = uchan->monitor_timer_interval;
 	ua_chan->attr.output = uchan->attr.output;
+	ua_chan->attr.blocking_timeout = uchan->attr.u.s.blocking_timeout;
+
 	/*
 	 * Note that the attribute channel type is not set since the channel on the
 	 * tracing registry side does not have this information.
@@ -6111,21 +6115,24 @@ int ust_app_uid_get_channel_runtime_stats(uint64_t ust_session_id,
 	int ret;
 	uint64_t consumer_chan_key;
 
+	*discarded = 0;
+	*lost = 0;
+
 	ret = buffer_reg_uid_consumer_channel_key(
 			buffer_reg_uid_list, ust_session_id,
 			uchan_id, &consumer_chan_key);
 	if (ret < 0) {
+		/* Not found */
+		ret = 0;
 		goto end;
 	}
 
 	if (overwrite) {
 		ret = consumer_get_lost_packets(ust_session_id,
 				consumer_chan_key, consumer, lost);
-		*discarded = 0;
 	} else {
 		ret = consumer_get_discarded_events(ust_session_id,
 				consumer_chan_key, consumer, discarded);
-		*lost = 0;
 	}
 
 end:
@@ -6144,10 +6151,13 @@ int ust_app_pid_get_channel_runtime_stats(struct ltt_ust_session *usess,
 	struct ust_app_session *ua_sess;
 	struct ust_app_channel *ua_chan;
 
+	*discarded = 0;
+	*lost = 0;
+
 	rcu_read_lock();
 	/*
-	 * Iterate over every registered applications, return when we
-	 * found one in the right session and channel.
+	 * Iterate over every registered applications. Sum counters for
+	 * all applications containing requested session and channel.
 	 */
 	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
 		struct lttng_ht_iter uiter;
@@ -6166,19 +6176,26 @@ int ust_app_pid_get_channel_runtime_stats(struct ltt_ust_session *usess,
 		ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
 
 		if (overwrite) {
+			uint64_t _lost;
+
 			ret = consumer_get_lost_packets(usess->id, ua_chan->key,
-					consumer, lost);
-			*discarded = 0;
-			goto end;
+					consumer, &_lost);
+			if (ret < 0) {
+				break;
+			}
+			(*lost) += _lost;
 		} else {
+			uint64_t _discarded;
+
 			ret = consumer_get_discarded_events(usess->id,
-					ua_chan->key, consumer, discarded);
-			*lost = 0;
-			goto end;
+					ua_chan->key, consumer, &_discarded);
+			if (ret < 0) {
+				break;
+			}
+			(*discarded) += _discarded;
 		}
 	}
 
-end:
 	rcu_read_unlock();
 	return ret;
 }