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

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index cfd4ddf6..e02aaeb6 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -37,16 +37,16 @@
 
 static
 ssize_t count_fields_recursive(size_t nr_fields,
-		const struct lttng_event_field *lttng_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_event_field *lf);
+		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_event_field *lttng_fields);
+		const struct lttng_ust_event_field **lttng_fields);
 
 /*
  * Human readable error message.
@@ -884,7 +884,7 @@ ssize_t count_one_type(const struct lttng_type *lt)
 
 	case atype_dynamic:
 	{
-		const struct lttng_event_field *choices;
+		const struct lttng_ust_event_field **choices;
 		size_t nr_choices;
 		int ret;
 
@@ -907,15 +907,15 @@ ssize_t count_one_type(const struct lttng_type *lt)
 
 static
 ssize_t count_fields_recursive(size_t nr_fields,
-		const struct lttng_event_field *lttng_fields)
+		const struct lttng_ust_event_field **lttng_fields)
 {
 	int i;
 	ssize_t ret, count = 0;
 
 	for (i = 0; i < nr_fields; i++) {
-		const struct lttng_event_field *lf;
+		const struct lttng_ust_event_field *lf;
 
-		lf = &lttng_fields[i];
+		lf = lttng_fields[i];
 		/* skip 'nowrite' fields */
 		if (lf->nowrite)
 			continue;
@@ -929,15 +929,15 @@ 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;
 
 	for (i = 0; i < nr_fields; i++) {
-		const struct lttng_event_field *lf;
+		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,15 +987,15 @@ 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)
 {
-	const struct lttng_event_field *choices;
+	const struct lttng_ust_event_field **choices;
 	char tag_field_name[LTTNG_UST_ABI_SYM_NAME_LEN];
 	const struct lttng_type *tag_type;
-	const struct lttng_event_field *tag_field_generic;
-	struct lttng_event_field tag_field = {
+	const struct lttng_ust_event_field *tag_field_generic;
+	struct lttng_ust_event_field tag_field = {
 		.name = tag_field_name,
 		.nowrite = 0,
 	};
@@ -1038,7 +1038,7 @@ int serialize_dynamic_type(struct lttng_session *session,
 	/* Serialize choice fields after variant. */
 	for (i = 0; i < nr_choices; i++) {
 		ret = serialize_one_field(session, fields,
-			iter_output, &choices[i]);
+			iter_output, choices[i]);
 		if (ret)
 			return ret;
 	}
@@ -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,9 +1236,9 @@ 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_event_field *lf)
+		const struct lttng_ust_event_field *lf)
 {
 	/* skip 'nowrite' fields */
 	if (lf->nowrite)
@@ -1248,17 +1248,17 @@ 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_event_field *lttng_fields)
+		const struct lttng_ust_event_field **lttng_fields)
 {
 	int ret;
 	size_t i;
 
 	for (i = 0; i < nr_lttng_fields; i++) {
 		ret = serialize_one_field(session, ustctl_fields,
-				iter_output, &lttng_fields[i]);
+				iter_output, lttng_fields[i]);
 		if (ret)
 			return ret;
 	}
@@ -1266,11 +1266,11 @@ 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,
-		const struct lttng_event_field *lttng_fields)
+		const struct lttng_ust_event_field **lttng_fields)
 {
 	struct ustctl_field *fields;
 	int ret;
@@ -1303,7 +1303,7 @@ error_type:
 static
 int serialize_entries(struct ustctl_enum_entry **_entries,
 		size_t nr_entries,
-		const struct lttng_enum_entry *lttng_entries)
+		const struct lttng_ust_enum_entry **lttng_entries)
 {
 	struct ustctl_enum_entry *entries;
 	int i;
@@ -1314,10 +1314,10 @@ int serialize_entries(struct ustctl_enum_entry **_entries,
 		return -ENOMEM;
 	for (i = 0; i < nr_entries; i++) {
 		struct ustctl_enum_entry *uentry;
-		const struct lttng_enum_entry *lentry;
+		const struct lttng_ust_enum_entry *lentry;
 
 		uentry = &entries[i];
-		lentry = &lttng_entries[i];
+		lentry = lttng_entries[i];
 
 		uentry->start.value = lentry->start.value;
 		uentry->start.signedness = lentry->start.signedness;
@@ -1326,7 +1326,7 @@ int serialize_entries(struct ustctl_enum_entry **_entries,
 		strncpy(uentry->string, lentry->string, LTTNG_UST_ABI_SYM_NAME_LEN);
 		uentry->string[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0';
 
-		if (lentry->u.extra.options & LTTNG_ENUM_ENTRY_OPTION_IS_AUTO) {
+		if (lentry->options & LTTNG_ENUM_ENTRY_OPTION_IS_AUTO) {
 			uentry->u.extra.options |=
 				USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO;
 		}
@@ -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,14 +1377,14 @@ 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) */
 	int loglevel,
 	const char *signature,		/* event signature (input) */
 	size_t nr_fields,		/* fields */
-	const struct lttng_event_field *lttng_fields,
+	const struct lttng_ust_event_field **lttng_fields,
 	const char *model_emf_uri,
 	uint32_t *id)			/* event id (output) */
 {
@@ -1523,7 +1523,7 @@ int ustcomm_register_enum(int sock,
 	int session_objd,		/* session descriptor */
 	const char *enum_name,		/* enum name (input) */
 	size_t nr_entries,		/* entries */
-	const struct lttng_enum_entry *lttng_entries,
+	const struct lttng_ust_enum_entry **lttng_entries,
 	uint64_t *id)
 {
 	ssize_t len;
@@ -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) */
 {