X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=17e33a1087dc837593520a2eeb3249267a5096f1;hb=0f6fd3631d4ef411b09f3136ca6929b31014d27e;hp=9a766e4ab68e628cbdec4d9f0432ec0b83dea547;hpb=93ec662e687dc15a3601704a1e0c96c51ad228c9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 9a766e4ab..17e33a108 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2821,9 +2821,6 @@ static int send_channel_uid_to_ust(struct buffer_reg_channel *reg_chan,
 			(void) release_ust_app_stream(-1, &stream, app);
 			if (ret == -EPIPE || ret == -LTTNG_UST_ERR_EXITING) {
 				ret = -ENOTCONN; /* Caused by app exiting. */
-				goto error_stream_unlock;
-			} else if (ret < 0) {
-				goto error_stream_unlock;
 			}
 			goto error_stream_unlock;
 		}
@@ -5726,7 +5723,6 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 		uint64_t nb_packets_per_stream)
 {
 	int ret = 0;
-	unsigned int snapshot_done = 0;
 	struct lttng_ht_iter iter;
 	struct ust_app *app;
 	char pathname[PATH_MAX];
@@ -5778,7 +5774,6 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 			if (ret < 0) {
 				goto error;
 			}
-			snapshot_done = 1;
 		}
 		break;
 	}
@@ -5831,7 +5826,6 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 			if (ret < 0) {
 				goto error;
 			}
-			snapshot_done = 1;
 		}
 		break;
 	}
@@ -5840,15 +5834,6 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 		break;
 	}
 
-	if (!snapshot_done) {
-		/*
-		 * If no snapshot was made and we are not in the error path, this means
-		 * that there are no buffers thus no (prior) application to snapshot
-		 * data from so we have simply NO data.
-		 */
-		ret = -ENODATA;
-	}
-
 error:
 	rcu_read_unlock();
 	return ret;
@@ -5945,9 +5930,11 @@ int ust_app_uid_get_channel_runtime_stats(uint64_t ust_session_id,
 	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:
@@ -5990,10 +5977,12 @@ int ust_app_pid_get_channel_runtime_stats(struct ltt_ust_session *usess,
 		if (overwrite) {
 			ret = consumer_get_lost_packets(usess->id, ua_chan->key,
 					consumer, lost);
+			*discarded = 0;
 			goto end;
 		} else {
 			ret = consumer_get_discarded_events(usess->id,
 					ua_chan->key, consumer, discarded);
+			*lost = 0;
 			goto end;
 		}
 	}