X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fpayload.c;h=5567806d2df3647bcecf7396a5a33ae7dc55868e;hp=592964a519b13ce6996e178df222b50e3cd81e5a;hb=3b13cbcca15abc7ddb64731ba047cfdad75d97a0;hpb=9e620ea7b016fc3fd4e08b5d094ffa40b36b50f6

diff --git a/src/common/payload.c b/src/common/payload.c
index 592964a51..5567806d2 100644
--- a/src/common/payload.c
+++ b/src/common/payload.c
@@ -6,13 +6,64 @@
  */
 
 #include "payload.h"
+#include <common/dynamic-array.h>
+#include <common/dynamic-buffer.h>
+#include <common/error.h>
+
+static
+void release_fd_handle_ref(void *ptr)
+{
+	struct fd_handle *fd_handle = ptr;
+
+	fd_handle_put(fd_handle);
+}
 
 LTTNG_HIDDEN
 void lttng_payload_init(struct lttng_payload *payload)
 {
 	assert(payload);
 	lttng_dynamic_buffer_init(&payload->buffer);
-	lttng_dynamic_array_init(&payload->_fds, sizeof(int), NULL);
+	lttng_dynamic_pointer_array_init(&payload->_fd_handles,
+			release_fd_handle_ref);
+}
+
+LTTNG_HIDDEN
+int lttng_payload_copy(const struct lttng_payload *src_payload,
+		       struct lttng_payload *dst_payload)
+{
+	int ret;
+	size_t i;
+
+	ret = lttng_dynamic_buffer_append_buffer(
+			&dst_payload->buffer, &src_payload->buffer);
+	if (ret) {
+		goto end;
+	}
+
+	for (i = 0; i < lttng_dynamic_pointer_array_get_count(
+					&src_payload->_fd_handles);
+			i++) {
+		struct fd_handle *new_fd_handle;
+		const struct fd_handle *src_fd_handle =
+				lttng_dynamic_pointer_array_get_pointer(
+						&src_payload->_fd_handles, i);
+
+		new_fd_handle = fd_handle_copy(src_fd_handle);
+		if (!new_fd_handle) {
+			PERROR("Failed to copy fd_handle while copying a payload");
+			ret = -1;
+			goto end;
+		}
+
+		ret = lttng_payload_push_fd_handle(dst_payload, new_fd_handle);
+		fd_handle_put(new_fd_handle);
+		if (ret) {
+			goto end;
+		}
+	}
+
+end:
+	return ret;
 }
 
 LTTNG_HIDDEN
@@ -23,11 +74,19 @@ void lttng_payload_reset(struct lttng_payload *payload)
 	}
 
 	lttng_dynamic_buffer_reset(&payload->buffer);
-	lttng_dynamic_array_reset(&payload->_fds);
+	lttng_dynamic_pointer_array_reset(&payload->_fd_handles);
 }
 
 LTTNG_HIDDEN
-int lttng_payload_push_fd(struct lttng_payload *payload, int fd)
+void lttng_payload_clear(struct lttng_payload *payload)
+{
+	(void) lttng_dynamic_buffer_set_size(&payload->buffer, 0);
+	lttng_dynamic_pointer_array_clear(&payload->_fd_handles);
+}
+
+LTTNG_HIDDEN
+int lttng_payload_push_fd_handle(struct lttng_payload *payload,
+		struct fd_handle *fd_handle)
 {
 	int ret;
 
@@ -36,7 +95,13 @@ int lttng_payload_push_fd(struct lttng_payload *payload, int fd)
 		goto end;
 	}
 
-	ret = lttng_dynamic_array_add_element(&payload->_fds, &fd);
+	ret = lttng_dynamic_pointer_array_add_pointer(
+			&payload->_fd_handles, fd_handle);
+	if (ret) {
+		goto end;
+	}
+
+	fd_handle_get(fd_handle);
 end:
 	return ret;
 }