X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2Flttng-types.c;h=c88d4735d968d482faa63e420feba1f4229662b1;hb=d0dd2ecbe2f2e614e0469addd1bd962db3cf047b;hp=e1a41374b6cc0af8609fbb2ed88c4a2f135e4ff7;hpb=40652b65bb2b500ea04eaa61c3dfcfaa719073be;p=lttng-modules.git

diff --git a/probes/lttng-types.c b/probes/lttng-types.c
index e1a41374..c88d4735 100644
--- a/probes/lttng-types.c
+++ b/probes/lttng-types.c
@@ -15,12 +15,23 @@
 
 struct dentry *lttng_types_dentry;
 
-#define ATYPE_ENTRY(name)	[atype_##name] = #name
+#undef ENTRY
+#define ENTRY(name)	[atype_##name] = #name
 
 const char * const astract_types[NR_ABSTRACT_TYPES] = {
-	ATYPE_ENTRY(integer),
-	ATYPE_ENTRY(enum),
-	ATYPE_ENTRY(array),
+	ENTRY(integer),
+	ENTRY(enum),
+	ENTRY(array),
+	ENTRY(sequence),
+	ENTRY(string),
+};
+
+#undef ENTRY
+#define ENTRY(name)	[lttng_encode_##name] = #name
+
+const char * const string_encodings[NR_STRING_ENCODINGS] = {
+	ENTRY(UTF8),
+	ENTRY(ASCII),
 };
 
 #define STAGE_EXPORT_ENUMS
@@ -35,66 +46,89 @@ struct lttng_type lttng_types[] = {
 #undef STAGE_EXPORT_TYPES
 };
 
-static void print_enum(struct seq_file *m, const struct lttng_enum *lttng_enum)
+static void print_indent(struct seq_file *m, unsigned int indent)
+{
+	int i;
+
+	for (i = 0; i < indent; i++)
+		seq_printf(m, "\t");
+}
+
+static void print_enum(struct seq_file *m, unsigned int indent,
+		       const struct lttng_enum *lttng_enum)
 {
 	int i;
 
 	for (i = 0; i < lttng_enum->len; i++) {
+		print_indent(m, indent);
 		if (lttng_enum->entries[i].start == lttng_enum->entries[i].end)
-			seq_printf(m,	"\t\t{ %llu, %s },\n",
+			seq_printf(m,	"{ %llu, %s },\n",
 					lttng_enum->entries[i].start,
 					lttng_enum->entries[i].string);
 		else
-			seq_printf(m,	"\t\t{ { %llu, %llu }, %s },\n",
+			seq_printf(m,	"{ { %llu, %llu }, %s },\n",
 					lttng_enum->entries[i].start,
 					lttng_enum->entries[i].end,
 					lttng_enum->entries[i].string);
 	}
 }
 
-static void print_event_type(struct seq_file *m, const struct lttng_type *type)
+void lttng_print_event_type(struct seq_file *m, unsigned int indent,
+			    const struct lttng_type *type)
 {
+	print_indent(m, indent);
 	switch(type->atype) {
 	case atype_integer:
-		seq_printf(m,	"type %s {\n"
-				"\tparent = %s;\n"
-				"\tsize = %u;\n"
-				"\tsigned = %u;\n"
-				"\talign = %u;\n"
-				"};\n", type->name,
+		seq_printf(m,	"type %s%s{ parent = %s; size = %u; signed = %u; align = %u;",
+				type->name ? : "", type->name ? " " : "",
 				astract_types[type->atype],
 				type->u.integer.size,
 				type->u.integer.signedness,
 				type->u.integer.alignment);
+		if (type->u.integer.reverse_byte_order)
+			seq_printf(m, 	" byte_order = %s;",
+					(__BYTE_ORDER == __LITTLE_ENDIAN) ?
+					"be" : "le");
+		seq_printf(m, 	" }");
 		break;
 	case atype_enum:
-		seq_printf(m,	"type %s {\n"
-				"\tparent = %s;\n"
-				"\tparent.parent = %s;\n"
-				"\tmap = {\n",
-				type->name,
+		seq_printf(m,	"type %s%s{ parent = %s; parent.parent = %s; map = {\n",
+				type->name ? : "", type->name ? " " : "",
 				astract_types[type->atype],
 				type->u.enumeration.parent_type);
-		print_enum(m, &type->u.enumeration.def);
-		seq_printf(m,	"\t};\n"
-				"};\n");
+		print_enum(m, indent + 2, &type->u.enumeration.def);
+		print_indent(m, indent + 1);
+		seq_printf(m,	"};\n");
+		print_indent(m, indent);
+		seq_printf(m,	"}");
 		break;
 	case atype_array:
-		seq_printf(m,	"type %s {\n"
-				"\tparent = %s;\n"
-				"\telem_type = %s;\n"
-				"\tlength = %u;\n"
-				"};\n", type->name,
+		seq_printf(m,	"type %s%s{ parent = %s; elem_type = %s; length = %u; }",
+				type->name ? : "", type->name ? " " : "",
 				astract_types[type->atype],
 				type->u.array.elem_type,
 				type->u.array.length);
 		break;
+	case atype_sequence:
+		seq_printf(m,	"type %s%s{ parent = %s; elem_type = %s; length_type = %s; }",
+				type->name ? : "", type->name ? " " : "",
+				astract_types[type->atype],
+				type->u.sequence.elem_type,
+				type->u.sequence.length_type);
+		break;
+	case atype_string:
+		seq_printf(m,	"type %s%s{ parent = %s; encoding = %s; }",
+				type->name ? : "", type->name ? " " : "",
+				astract_types[type->atype],
+				string_encodings[type->u.string.encoding]);
+		break;
 	default:
-		seq_printf(m,	"<<< unknown abstract type %s for type %s >>>\n",
+		seq_printf(m,	"<<< unknown abstract type %s for type %s%s>>>",
 				astract_types[type->atype],
-				type->name);
+				type->name ? : "", type->name ? " " : "");
 	}
 }
+EXPORT_SYMBOL_GPL(lttng_print_event_type);
 
 static void *lttng_seq_start(struct seq_file *m, loff_t *pos)
 {
@@ -122,7 +156,8 @@ static int lttng_seq_show(struct seq_file *m, void *v)
 {
 	struct lttng_type *type = v;
 
-	print_event_type(m, type);
+	lttng_print_event_type(m, 0, type);
+	seq_printf(m, ";\n");
 	return 0;
 }