X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=e02aaeb63c99d34a85985aca15702969da1d8067;hb=a880bae51b3d8e927f68ceae2804636976bd62d8;hp=656e170b100a8f0694b1ff3c37d2b324079204f2;hpb=891d6b550bf16672b0c3a7b35362f231d6e10fc1;p=lttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 656e170b..e02aaeb6 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -39,11 +39,11 @@ static
 ssize_t count_fields_recursive(size_t nr_fields,
 		const struct lttng_ust_event_field **lttng_fields);
 static
-int serialize_one_field(struct lttng_session *session,
+int serialize_one_field(struct lttng_ust_session *session,
 		struct ustctl_field *fields, size_t *iter_output,
 		const struct lttng_ust_event_field *lf);
 static
-int serialize_fields(struct lttng_session *session,
+int serialize_fields(struct lttng_ust_session *session,
 		struct ustctl_field *ustctl_fields,
 		size_t *iter_output, size_t nr_lttng_fields,
 		const struct lttng_ust_event_field **lttng_fields);
@@ -929,7 +929,7 @@ ssize_t count_fields_recursive(size_t nr_fields,
 
 static
 ssize_t count_ctx_fields_recursive(size_t nr_fields,
-		const struct lttng_ctx_field *lttng_fields)
+		struct lttng_ust_ctx_field **lttng_fields)
 {
 	int i;
 	ssize_t ret, count = 0;
@@ -937,7 +937,7 @@ ssize_t count_ctx_fields_recursive(size_t nr_fields,
 	for (i = 0; i < nr_fields; i++) {
 		const struct lttng_ust_event_field *lf;
 
-		lf = &lttng_fields[i].event_field;
+		lf = lttng_fields[i]->event_field;
 		/* skip 'nowrite' fields */
 		if (lf->nowrite)
 			continue;
@@ -987,7 +987,7 @@ int serialize_integer_type(struct ustctl_integer_type *uit,
 }
 
 static
-int serialize_dynamic_type(struct lttng_session *session,
+int serialize_dynamic_type(struct lttng_ust_session *session,
 		struct ustctl_field *fields, size_t *iter_output,
 		const char *field_name)
 {
@@ -1046,7 +1046,7 @@ int serialize_dynamic_type(struct lttng_session *session,
 }
 
 static
-int serialize_one_type(struct lttng_session *session,
+int serialize_one_type(struct lttng_ust_session *session,
 		struct ustctl_field *fields, size_t *iter_output,
 		const char *field_name, const struct lttng_type *lt)
 {
@@ -1236,7 +1236,7 @@ int serialize_one_type(struct lttng_session *session,
 }
 
 static
-int serialize_one_field(struct lttng_session *session,
+int serialize_one_field(struct lttng_ust_session *session,
 		struct ustctl_field *fields, size_t *iter_output,
 		const struct lttng_ust_event_field *lf)
 {
@@ -1248,7 +1248,7 @@ int serialize_one_field(struct lttng_session *session,
 }
 
 static
-int serialize_fields(struct lttng_session *session,
+int serialize_fields(struct lttng_ust_session *session,
 		struct ustctl_field *ustctl_fields,
 		size_t *iter_output, size_t nr_lttng_fields,
 		const struct lttng_ust_event_field **lttng_fields)
@@ -1266,7 +1266,7 @@ int serialize_fields(struct lttng_session *session,
 }
 
 static
-int alloc_serialize_fields(struct lttng_session *session,
+int alloc_serialize_fields(struct lttng_ust_session *session,
 		size_t *_nr_write_fields,
 		struct ustctl_field **ustctl_fields,
 		size_t nr_fields,
@@ -1336,11 +1336,11 @@ int serialize_entries(struct ustctl_enum_entry **_entries,
 }
 
 static
-int serialize_ctx_fields(struct lttng_session *session,
+int serialize_ctx_fields(struct lttng_ust_session *session,
 		size_t *_nr_write_fields,
 		struct ustctl_field **ustctl_fields,
 		size_t nr_fields,
-		const struct lttng_ctx_field *lttng_fields)
+		struct lttng_ust_ctx_field **lttng_fields)
 {
 	struct ustctl_field *fields;
 	int ret;
@@ -1359,7 +1359,7 @@ int serialize_ctx_fields(struct lttng_session *session,
 
 	for (i = 0; i < nr_fields; i++) {
 		ret = serialize_one_field(session, fields, &iter_output,
-				&lttng_fields[i].event_field);
+				lttng_fields[i]->event_field);
 		if (ret)
 			goto error_type;
 	}
@@ -1377,7 +1377,7 @@ error_type:
  * Returns 0 on success, negative error value on error.
  */
 int ustcomm_register_event(int sock,
-	struct lttng_session *session,
+	struct lttng_ust_session *session,
 	int session_objd,		/* session descriptor */
 	int channel_objd,		/* channel descriptor */
 	const char *event_name,		/* event name (input) */
@@ -1624,11 +1624,11 @@ error_entries:
  * Returns -EPIPE or -ECONNRESET if other end has hung up.
  */
 int ustcomm_register_channel(int sock,
-	struct lttng_session *session,
+	struct lttng_ust_session *session,
 	int session_objd,		/* session descriptor */
 	int channel_objd,		/* channel descriptor */
 	size_t nr_ctx_fields,
-	const struct lttng_ctx_field *ctx_fields,
+	struct lttng_ust_ctx_field **ctx_fields,
 	uint32_t *chan_id,		/* channel id (output) */
 	int *header_type) 		/* header type (output) */
 {