Rename data_available to data_pending

[lttng-tools.git] / src / common / ust-consumer / ust-consumer.c

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 4d3671a34bbcbe027ae9520f44aca94a51b92af0..5a716859a386236fd480fbf1bb133b96a52012e7 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -310,19 +310,19 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                rcu_read_unlock();
                return -ENOSYS;
        }
-       case LTTNG_CONSUMER_DATA_AVAILABLE:
+       case LTTNG_CONSUMER_DATA_PENDING:
        {
                int32_t ret;
-               uint64_t id = msg.u.data_available.session_id;
+               uint64_t id = msg.u.data_pending.session_id;
 
-               DBG("UST consumer data available command for id %" PRIu64, id);
+               DBG("UST consumer data pending command for id %" PRIu64, id);
 
-               ret = consumer_data_available(id);
+               ret = consumer_data_pending(id);
 
                /* Send back returned value to session daemon */
                ret = lttcomm_send_unix_sock(sock, &ret, sizeof(ret));
                if (ret < 0) {
-                       PERROR("send data available ret code");
+                       PERROR("send data pending ret code");
                }
                break;
        }
@@ -529,27 +529,28 @@ error:
  * stream. Consumer data lock MUST be acquired before calling this function
  * and the stream lock.
  *
- * Return 0 if the traced data are still getting read else 1 meaning that the
+ * Return 1 if the traced data are still getting read else 0 meaning that the
  * data is available for trace viewer reading.
  */
-int lttng_ustconsumer_data_available(struct lttng_consumer_stream *stream)
+int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream)
 {
        int ret;
 
        assert(stream);
 
-       DBG("UST consumer checking data availability");
+       DBG("UST consumer checking data pending");
 
        ret = ustctl_get_next_subbuf(stream->chan->handle, stream->buf);
        if (ret == 0) {
                /* There is still data so let's put back this subbuffer. */
                ret = ustctl_put_subbuf(stream->chan->handle, stream->buf);
                assert(ret == 0);
+               ret = 1;  /* Data is pending */
                goto end;
        }
 
-       /* Data is available to be read for this stream. */
-       ret = 1;
+       /* Data is NOT pending so ready to be read. */
+       ret = 0;
 
 end:
        return ret;