X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=bf477933515502510c284c58762b56d2b4399f75;hp=aa050eceb56a48622ddfbf04b02c87d5f88ee9f6;hb=6d805429e9cb049eb0c9205fcf742a53e3166caf;hpb=9449cc7574c27419ac4424b4653a6f4428d01b4d

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index aa050eceb..bf4779335 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -701,28 +701,28 @@ error:
 }
 
 /*
- * Ask the consumer if the data is ready to bread (available) for the specific
+ * Ask the consumer if the data is ready to read (NOT pending) for the specific
  * session id.
  *
  * This function has a different behavior with the consumer i.e. that it waits
- * for a reply from the consumer if yes or no the data is available.
+ * for a reply from the consumer if yes or no the data is pending.
  */
-int consumer_is_data_available(unsigned int id,
+int consumer_is_data_pending(unsigned int id,
 		struct consumer_output *consumer)
 {
 	int ret;
-	int32_t ret_code = 1;  /* Default is that the data is available */
+	int32_t ret_code = 0;  /* Default is that the data is NOT pending */
 	struct consumer_socket *socket;
 	struct lttng_ht_iter iter;
 	struct lttcomm_consumer_msg msg;
 
 	assert(consumer);
 
-	msg.cmd_type = LTTNG_CONSUMER_DATA_AVAILABLE;
+	msg.cmd_type = LTTNG_CONSUMER_DATA_PENDING;
 
-	msg.u.data_available.session_id = (uint64_t) id;
+	msg.u.data_pending.session_id = (uint64_t) id;
 
-	DBG3("Consumer data available for id %u", id);
+	DBG3("Consumer data pending for id %u", id);
 
 	/* Send command for each consumer */
 	cds_lfht_for_each_entry(consumer->socks->ht, &iter.iter, socket,
@@ -734,30 +734,26 @@ int consumer_is_data_available(unsigned int id,
 
 		ret = lttcomm_send_unix_sock(socket->fd, &msg, sizeof(msg));
 		if (ret < 0) {
-			PERROR("send consumer data available command");
+			PERROR("send consumer data pending command");
 			pthread_mutex_unlock(socket->lock);
 			goto error;
 		}
 
-		/*
-		 * Waiting for the reply code where 0 the data is not available and 1
-		 * it is for trace reading.
-		 */
 		ret = lttcomm_recv_unix_sock(socket->fd, &ret_code, sizeof(ret_code));
 		if (ret < 0) {
-			PERROR("recv consumer data available status");
+			PERROR("recv consumer data pending status");
 			pthread_mutex_unlock(socket->lock);
 			goto error;
 		}
 
 		pthread_mutex_unlock(socket->lock);
 
-		if (ret_code == 0) {
+		if (ret_code == 1) {
 			break;
 		}
 	}
 
-	DBG("Consumer data available ret %d", ret_code);
+	DBG("Consumer data pending ret %d", ret_code);
 	return ret_code;
 
 error: