X-Git-Url: http://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=libustcomm%2Fustcomm.c;fp=libustcomm%2Fustcomm.c;h=bbdbd7ee643a7b4c887aced587f9e001a34ac8b5;hp=7d0fe000155525669e28afaff4931d2597c2ecc8;hb=d89b81916428a3e7e5dfe1612e87218502a40a3b;hpb=10f2b72421cdb8844440ddc49a836fb73ce1b495

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 7d0fe00..bbdbd7e 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -656,10 +656,20 @@ int ustcomm_unpack_trace_info(struct ustcomm_trace_info *trace_inf)
 
 int ustcomm_pack_channel_info(struct ustcomm_header *header,
 			      struct ustcomm_channel_info *ch_inf,
+			      const char *trace,
 			      const char *channel)
 {
 	int offset = 0;
 
+	ch_inf->trace = ustcomm_print_data(ch_inf->data,
+					   sizeof(ch_inf->data),
+					   &offset,
+					   trace);
+
+	if (ch_inf->trace == USTCOMM_POISON_PTR) {
+		return -ENOMEM;
+	}
+
 	ch_inf->channel = ustcomm_print_data(ch_inf->data,
 					     sizeof(ch_inf->data),
 					     &offset,
@@ -677,6 +687,13 @@ int ustcomm_pack_channel_info(struct ustcomm_header *header,
 
 int ustcomm_unpack_channel_info(struct ustcomm_channel_info *ch_inf)
 {
+	ch_inf->trace = ustcomm_restore_ptr(ch_inf->trace,
+					    ch_inf->data,
+					    sizeof(ch_inf->data));
+	if (!ch_inf->trace) {
+		return -EINVAL;
+	}
+
 	ch_inf->channel = ustcomm_restore_ptr(ch_inf->channel,
 					      ch_inf->data,
 					      sizeof(ch_inf->data));
@@ -689,11 +706,21 @@ int ustcomm_unpack_channel_info(struct ustcomm_channel_info *ch_inf)
 
 int ustcomm_pack_buffer_info(struct ustcomm_header *header,
 			     struct ustcomm_buffer_info *buf_inf,
+			     const char *trace,
 			     const char *channel,
 			     int channel_cpu)
 {
 	int offset = 0;
 
+	buf_inf->trace = ustcomm_print_data(buf_inf->data,
+					    sizeof(buf_inf->data),
+					    &offset,
+					    trace);
+
+	if (buf_inf->trace == USTCOMM_POISON_PTR) {
+		return -ENOMEM;
+	}
+
 	buf_inf->channel = ustcomm_print_data(buf_inf->data,
 					      sizeof(buf_inf->data),
 					      &offset,
@@ -713,6 +740,13 @@ int ustcomm_pack_buffer_info(struct ustcomm_header *header,
 
 int ustcomm_unpack_buffer_info(struct ustcomm_buffer_info *buf_inf)
 {
+	buf_inf->trace = ustcomm_restore_ptr(buf_inf->trace,
+					     buf_inf->data,
+					     sizeof(buf_inf->data));
+	if (!buf_inf->trace) {
+		return -EINVAL;
+	}
+
 	buf_inf->channel = ustcomm_restore_ptr(buf_inf->channel,
 					       buf_inf->data,
 					       sizeof(buf_inf->data));
@@ -725,11 +759,22 @@ int ustcomm_unpack_buffer_info(struct ustcomm_buffer_info *buf_inf)
 
 int ustcomm_pack_marker_info(struct ustcomm_header *header,
 			     struct ustcomm_marker_info *marker_inf,
+			     const char *trace,
 			     const char *channel,
 			     const char *marker)
 {
 	int offset = 0;
 
+	marker_inf->trace = ustcomm_print_data(marker_inf->data,
+					       sizeof(marker_inf->data),
+					       &offset,
+					       trace);
+
+	if (marker_inf->trace == USTCOMM_POISON_PTR) {
+		return -ENOMEM;
+	}
+
+
 	marker_inf->channel = ustcomm_print_data(marker_inf->data,
 						 sizeof(marker_inf->data),
 						 &offset,
@@ -756,6 +801,13 @@ int ustcomm_pack_marker_info(struct ustcomm_header *header,
 
 int ustcomm_unpack_marker_info(struct ustcomm_marker_info *marker_inf)
 {
+	marker_inf->trace = ustcomm_restore_ptr(marker_inf->trace,
+						marker_inf->data,
+						sizeof(marker_inf->data));
+	if (!marker_inf->trace) {
+		return -EINVAL;
+	}
+
 	marker_inf->channel = ustcomm_restore_ptr(marker_inf->channel,
 						  marker_inf->data,
 						  sizeof(marker_inf->data));