X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=4d1e7f155abd0af1474b32eeb9fdc49905127f4c;hp=fe7445b7f133818353fb96b1df10ed0171db88bf;hb=beb5945802e0598b04d41b4ad41fb49d701fa0f5;hpb=93ec662e687dc15a3601704a1e0c96c51ad228c9

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index fe7445b7f..4d1e7f155 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -1692,7 +1692,8 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	}
 	case LTTNG_CONSUMER_DISCARDED_EVENTS:
 	{
-		uint64_t ret;
+		int ret = 0;
+		uint64_t discarded_events;
 		struct lttng_ht_iter iter;
 		struct lttng_ht *ht;
 		struct lttng_consumer_stream *stream;
@@ -1713,13 +1714,13 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		 * found (no events are dropped if the channel is not yet in
 		 * use).
 		 */
-		ret = 0;
+		discarded_events = 0;
 		cds_lfht_for_each_entry_duplicate(ht->ht,
 				ht->hash_fct(&id, lttng_ht_seed),
 				ht->match_fct, &id,
 				&iter.iter, stream, node_session_id.node) {
 			if (stream->chan->key == key) {
-				ret = stream->chan->discarded_events;
+				discarded_events = stream->chan->discarded_events;
 				break;
 			}
 		}
@@ -1732,7 +1733,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		health_code_update();
 
 		/* Send back returned value to session daemon */
-		ret = lttcomm_send_unix_sock(sock, &ret, sizeof(ret));
+		ret = lttcomm_send_unix_sock(sock, &discarded_events, sizeof(discarded_events));
 		if (ret < 0) {
 			PERROR("send discarded events");
 			goto error_fatal;
@@ -1985,11 +1986,6 @@ void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan)
 			}
 		}
 	}
-	/* Try to rmdir all directories under shm_path root. */
-	if (chan->root_shm_path[0]) {
-		(void) run_as_recursive_rmdir(chan->root_shm_path,
-				chan->uid, chan->gid);
-	}
 }
 
 void lttng_ustconsumer_free_channel(struct lttng_consumer_channel *chan)
@@ -1999,6 +1995,11 @@ void lttng_ustconsumer_free_channel(struct lttng_consumer_channel *chan)
 
 	consumer_metadata_cache_destroy(chan);
 	ustctl_destroy_channel(chan->uchan);
+	/* Try to rmdir all directories under shm_path root. */
+	if (chan->root_shm_path[0]) {
+		(void) run_as_recursive_rmdir(chan->root_shm_path,
+				chan->uid, chan->gid);
+	}
 	free(chan->stream_fds);
 }