payload-view: mark lttng_payload_view_get_fd_handle_count as const

[lttng-tools.git] / src / common / payload-view.c

diff --git a/src/common/payload-view.c b/src/common/payload-view.c
index fdfef6150e4a00d98b6cba9e23c9ea8471d8c28f..4a4edea146385ae0e2198ebfbd5a41a32d7c1c04 100644 (file)
--- a/src/common/payload-view.c
+++ b/src/common/payload-view.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <common/dynamic-array.h>
 #include <common/buffer-view.h>
 #include "payload-view.h"
 #include "payload.h"
@@ -18,7 +19,7 @@ struct lttng_payload_view lttng_payload_view_from_payload(
        return (struct lttng_payload_view) {
                .buffer = lttng_buffer_view_from_dynamic_buffer(
                        &payload->buffer, offset, len),
-               ._fds = payload->_fds,
+               ._fd_handles = payload->_fd_handles,
        };
 }
 
@@ -29,9 +30,10 @@ struct lttng_payload_view lttng_payload_view_from_view(
 {
        return (struct lttng_payload_view) {
                .buffer = lttng_buffer_view_from_view(
-                       &view->buffer, offset, len),
-               ._fds = view->_fds,
-               ._iterator.p_fds_position = &view->_iterator.fds_position,
+                               &view->buffer, offset, len),
+               ._fd_handles = view->_fd_handles,
+               ._iterator.p_fd_handles_position = view->_iterator.p_fd_handles_position ?:
+                               &view->_iterator.fd_handles_position,
        };
 }
 
@@ -47,29 +49,75 @@ struct lttng_payload_view lttng_payload_view_from_dynamic_buffer(
 }
 
 LTTNG_HIDDEN
-int lttng_payload_view_pop_fd(struct lttng_payload_view *view)
+struct lttng_payload_view lttng_payload_view_from_buffer_view(
+               const struct lttng_buffer_view *view, size_t offset,
+               ptrdiff_t len)
 {
-       int ret = 0;
-       size_t fd_count;
-       size_t *pos;
+       return (struct lttng_payload_view) {
+               .buffer = lttng_buffer_view_from_view(
+                       view, offset, len)
+       };
+}
 
-       if (!view) {
+LTTNG_HIDDEN
+struct lttng_payload_view lttng_payload_view_init_from_buffer(
+       const char *src, size_t offset, ptrdiff_t len)
+{
+       return (struct lttng_payload_view) {
+               .buffer = lttng_buffer_view_init(
+                       src, offset, len)
+       };
+}
+
+LTTNG_HIDDEN
+int lttng_payload_view_get_fd_handle_count(
+               const struct lttng_payload_view *payload_view)
+{
+       int ret;
+       size_t position;
+
+       if (!payload_view) {
                ret = -1;
                goto end;
        }
 
-       fd_count = lttng_dynamic_array_get_count(&view->_fds);
-       pos = view->_iterator.p_fds_position ? view->_iterator.p_fds_position :
-               &view->_iterator.fds_position;
+       ret = lttng_dynamic_pointer_array_get_count(&payload_view->_fd_handles);
+       if (ret < 0) {
+               goto end;
+       }
 
-       if (*pos >= fd_count) {
-               ret = -1;
+       position = payload_view->_iterator.p_fd_handles_position ?
+                       *payload_view->_iterator.p_fd_handles_position :
+                       payload_view->_iterator.fd_handles_position;
+       ret = ret - (int) position;
+end:
+       return ret;
+}
+
+LTTNG_HIDDEN
+struct fd_handle *lttng_payload_view_pop_fd_handle(
+               struct lttng_payload_view *view)
+{
+       struct fd_handle *handle = NULL;
+       size_t fd_handle_count;
+       size_t *pos;
+
+       if (!view) {
                goto end;
        }
 
-       ret = *((int *) lttng_dynamic_array_get_element(
-                       &view->_fds, *pos));
+       fd_handle_count = lttng_payload_view_get_fd_handle_count(view);
+       if (fd_handle_count == 0) {
+               goto end;
+       }
+
+       pos = view->_iterator.p_fd_handles_position ?
+                       view->_iterator.p_fd_handles_position :
+                       &view->_iterator.fd_handles_position;
+       handle = lttng_dynamic_pointer_array_get_pointer(&view->_fd_handles,
+                       *pos);
        (*pos)++;
+       fd_handle_get(handle);
 end:
-       return ret;
+       return handle;
 }