X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=b2c454deb54302362806dd80180f9b235f29e33a;hb=f3a1fc7b3ab62e498d07546c7ada8e9a381125f5;hp=0d61b866f46d426c120694d9138f57a83be26a5d;hpb=bbc4768c20f1c552222e1746f9475d145d7bf04e;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 0d61b866f..b2c454deb 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -519,7 +519,8 @@ error_open:
 	if (channel->root_shm_path[0]) {
 		(void) run_as_rmdir_recursive(channel->root_shm_path,
 				channel->buffer_credentials.value.uid,
-				channel->buffer_credentials.value.gid);
+				channel->buffer_credentials.value.gid,
+				LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG);
 	}
 	free(stream_fds);
 error_alloc:
@@ -1590,7 +1591,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		if (!channel) {
 			ERR("UST consumer get channel key %" PRIu64 " not found", key);
 			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
-			goto end_msg_sessiond;
+			goto end_get_channel;
 		}
 
 		health_code_update();
@@ -1606,13 +1607,13 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				 * and the consumer can continue its work. The above call
 				 * has sent the error status message to the sessiond.
 				 */
-				goto end_nosignal;
+				goto end_get_channel_nosignal;
 			}
 			/*
 			 * The communicaton was broken hence there is a bad state between
 			 * the consumer and sessiond so stop everything.
 			 */
-			goto error_fatal;
+			goto error_get_channel_fatal;
 		}
 
 		health_code_update();
@@ -1622,7 +1623,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		 * so don't send them to the data thread.
 		 */
 		if (!channel->monitor) {
-			goto end_msg_sessiond;
+			goto end_get_channel;
 		}
 
 		ret = send_streams_to_thread(channel, ctx);
@@ -1631,11 +1632,16 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			 * If we are unable to send the stream to the thread, there is
 			 * a big problem so just stop everything.
 			 */
-			goto error_fatal;
+			goto error_get_channel_fatal;
 		}
 		/* List MUST be empty after or else it could be reused. */
 		assert(cds_list_empty(&channel->streams.head));
+end_get_channel:
 		goto end_msg_sessiond;
+error_get_channel_fatal:
+		goto error_fatal;
+end_get_channel_nosignal:
+		goto end_nosignal;
 	}
 	case LTTNG_CONSUMER_DESTROY_CHANNEL:
 	{
@@ -2114,15 +2120,12 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	}
 
 end_nosignal:
-	rcu_read_unlock();
-
-	health_code_update();
-
 	/*
 	 * Return 1 to indicate success since the 0 value can be a socket
 	 * shutdown during the recv() or send() call.
 	 */
-	return 1;
+	ret = 1;
+	goto end;
 
 end_msg_sessiond:
 	/*
@@ -2134,11 +2137,9 @@ end_msg_sessiond:
 	if (ret < 0) {
 		goto error_fatal;
 	}
-	rcu_read_unlock();
-
-	health_code_update();
+	ret = 1;
+	goto end;
 
-	return 1;
 end_channel_error:
 	if (channel) {
 		pthread_mutex_unlock(&channel->lock);
@@ -2154,15 +2155,18 @@ end_channel_error:
 		/* Stop everything if session daemon can not be notified. */
 		goto error_fatal;
 	}
-	rcu_read_unlock();
-
-	health_code_update();
+	ret = 1;
+	goto end;
 
-	return 1;
 error_fatal:
-	rcu_read_unlock();
 	/* This will issue a consumer stop. */
-	return -1;
+	ret = -1;
+	goto end;
+
+end:
+	rcu_read_unlock();
+	health_code_update();
+	return ret;
 }
 
 /*
@@ -2349,7 +2353,8 @@ void lttng_ustconsumer_free_channel(struct lttng_consumer_channel *chan)
 	if (chan->root_shm_path[0]) {
 		(void) run_as_rmdir_recursive(chan->root_shm_path,
 				chan->buffer_credentials.value.uid,
-				chan->buffer_credentials.value.gid);
+				chan->buffer_credentials.value.gid,
+				LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG);
 	}
 	free(chan->stream_fds);
 }