X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent-new%2Fgenevent.c;h=006c902fe721157a91bcc755497afbdd42efbe16;hb=6e27ba8896d0424d7e7a51710fa69d39a64d386d;hp=c1b1363e6d2ba83d8cc384dc7b6f4082df341a64;hpb=7e97b039693a48c696e96d735e65cd41cccf9995;p=lttv.git

diff --git a/genevent-new/genevent.c b/genevent-new/genevent.c
index c1b1363e..006c902f 100644
--- a/genevent-new/genevent.c
+++ b/genevent-new/genevent.c
@@ -86,7 +86,6 @@
 #define dprintf(...)
 #endif
 
-
 /* Code printing */
 
 void print_tabs(unsigned int tabs, FILE *fd)
@@ -95,11 +94,6 @@ void print_tabs(unsigned int tabs, FILE *fd)
 		fprintf(fd, "\t");
 }
 
-/* Type size checking */
-/* Uses #error in the generated code to signal error and stop the compiler */
-int print_check(int fd);
-
-
 /* print type.
  *
  * Copied from construct_types_and_fields in LTTV facility.c */
@@ -321,6 +315,67 @@ int print_arg(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 }
 
 
+/* Does the type has a fixed size ? (as know from the compiler)
+ *
+ * 1 : fixed size
+ * 0 : variable length
+ */
+int has_type_fixed_size(type_descriptor_t *td)
+{
+	switch(td->type) {
+		case INT_FIXED:
+		case UINT_FIXED:
+		case CHAR:
+		case UCHAR:
+		case SHORT:
+		case USHORT:
+		case INT:
+		case UINT:
+		case FLOAT:
+		case POINTER:
+		case LONG:
+		case ULONG:
+		case SIZE_T:
+		case SSIZE_T:
+		case OFF_T:
+		case ENUM:
+		case UNION: /* The union must have fixed size children. Must be checked by
+									 the parser */
+			return 1;
+			break;
+		case STRING:
+		case SEQUENCE:
+			return 0;
+			break;
+		case STRUCT:
+			{
+				int has_type_fixed = 0;
+				for(unsigned int i=0;i<td->fields.position;i++){
+					field_t *field = (field_t*)(td->fields.array[i]);
+					type_descriptor_t *type = field->type;
+					
+					has_type_fixed = has_type_fixed_size(type);
+					if(!has_type_fixed) return 0;
+				}
+				return 1;
+			}
+			break;
+		case ARRAY:
+			assert(td->size >= 0);
+			return has_type_fixed_size(((field_t*)td->fields.array[0])->type);
+			break;
+		case NONE:
+			printf("There is a type defined to NONE : bad.\n");
+			assert(0);
+			break;
+	}
+	return 0; //make gcc happy.
+}
+
+
+
+
+
 /* print type declaration.
  *
  * Copied from construct_types_and_fields in LTTV facility.c */
@@ -366,23 +421,26 @@ int print_type_declaration(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 		case ARRAY:
 			dprintf("%s\n", basename);
 			assert(td->size >= 0);
-			if(td->nested_type->type_name == NULL) {
+			if(((field_t*)td->fields.array[0])->type->type_name == NULL) {
 				/* Not a named nested type : we must print its declaration first */
-				if(print_type_declaration(td->nested_type,
+				if(print_type_declaration(((field_t*)td->fields.array[0])->type,
 																	fd,	0, basename, "")) return 1;
 			}
-			fprintf(fd, "#define LTTNG_ARRAY_SIZE_%s %llu\n", basename,
+			fprintf(fd, "#define LTTNG_ARRAY_SIZE_%s %zu\n", basename,
 					td->size);
 			fprintf(fd, "typedef ");
-			if(print_type(td->nested_type, fd, tabs, basename, "")) return 1;
+			if(print_type(((field_t*)td->fields.array[0])->type,
+						fd, tabs, basename, "")) return 1;
 			fprintf(fd, " lttng_array_%s[LTTNG_ARRAY_SIZE_%s];\n", basename,
 					basename);
 			fprintf(fd, "\n");
 			break;
 		case SEQUENCE:
-			if(td->nested_type->type_name == NULL) {
+			/* We assume that the sequence length type does not need to be declared.
+			 */
+			if(((field_t*)td->fields.array[1])->type->type_name == NULL) {
 				/* Not a named nested type : we must print its declaration first */
-				if(print_type_declaration(td->nested_type,
+				if(print_type_declaration(((field_t*)td->fields.array[1])->type,
 																	fd,	0, basename, "")) return 1;
 			}
 			fprintf(fd, "typedef struct lttng_sequence_%s lttng_sequence_%s;\n",
@@ -391,9 +449,12 @@ int print_type_declaration(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 			fprintf(fd, "struct lttng_sequence_%s", basename);
 			fprintf(fd, " {\n");
 			print_tabs(1, fd);
-			fprintf(fd, "unsigned int len;\n");
+			if(print_type(((field_t*)td->fields.array[0])->type,
+						fd, tabs, basename, "")) return 1;
+			fprintf(fd, "len;\n");
 			print_tabs(1, fd);
-			if(print_type(td->nested_type, fd, tabs, basename, "")) return 1;
+			if(print_type(((field_t*)td->fields.array[1])->type,
+						fd, tabs, basename, "")) return 1;
 			fprintf(fd, " *array;\n");
 			fprintf(fd, "};\n");
 			fprintf(fd, "\n");
@@ -456,8 +517,624 @@ int print_type_declaration(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 	return 0;
 }
 
+
+/* print type alignment.
+ *
+ * Copied from construct_types_and_fields in LTTV facility.c
+ *
+ * basename is the name which identifies the type (along with a prefix
+ * (possibly)). */
+
+int print_type_alignment(type_descriptor_t * td, FILE *fd, unsigned int tabs,
+		char *nest_name, char *field_name)
+{
+	char basename[PATH_MAX];
+	unsigned int basename_len = 0;
+	
+	strncpy(basename, nest_name, PATH_MAX);
+	basename_len = strlen(basename);
+	
+	/* For a named type, we use the type_name directly */
+	if(td->type_name != NULL) {
+		strncpy(basename, td->type_name, PATH_MAX);
+		basename_len = strlen(basename);
+	} else {
+		/* For a unnamed type, there must be a field name, except for
+		 * the array. */
+		if((basename_len != 0)
+				&& (basename[basename_len-1] != '_'
+				&& field_name != NULL
+				&& (field_name[0] != '\0'))) {
+			strncat(basename, "_", PATH_MAX - basename_len);
+			basename_len = strlen(basename);
+		}
+		if(field_name != NULL)
+			strncat(basename, field_name, PATH_MAX - basename_len);
+	}
+	
+	switch(td->type) {
+		case INT_FIXED:
+		case UINT_FIXED:
+		case CHAR:
+		case UCHAR:
+		case SHORT:
+		case USHORT:
+		case INT:
+		case UINT:
+		case FLOAT:
+		case POINTER:
+		case LONG:
+		case ULONG:
+		case SIZE_T:
+		case SSIZE_T:
+		case OFF_T:
+		case ENUM:
+			fprintf(fd, "sizeof(");
+			if(print_type(td, fd, 0, basename, "")) return 1;
+			fprintf(fd, ")");
+			break;
+		case STRING:
+			fprintf(fd, "sizeof(char)");
+			break;
+		case SEQUENCE:
+			fprintf(fd, "lttng_get_alignment_sequence_%s(&obj->%s)", basename,
+					field_name);
+			break;
+		case STRUCT:
+			fprintf(fd, "lttng_get_alignment_struct_%s(&obj->%s)", basename,
+					field_name);
+			break;
+		case UNION:
+			fprintf(fd, "lttng_get_alignment_union_%s(&obj->%s)", basename,
+					field_name);
+			break;
+		case ARRAY:
+			fprintf(fd, "lttng_get_alignment_array_%s(obj->%s)", basename,
+					field_name);
+			break;
+		case NONE:
+			printf("error : type NONE unexpected\n");
+			return 1;
+			break;
+	}
+
+	return 0;
+}
+
+/* print type write.
+ *
+ * Copied from construct_types_and_fields in LTTV facility.c
+ *
+ * basename is the name which identifies the type (along with a prefix
+ * (possibly)). */
+
+int print_type_write(type_descriptor_t * td, FILE *fd, unsigned int tabs,
+		char *nest_name, char *field_name)
+{
+	char basename[PATH_MAX];
+	unsigned int basename_len = 0;
+	
+	strncpy(basename, nest_name, PATH_MAX);
+	basename_len = strlen(basename);
+	
+	/* For a named type, we use the type_name directly */
+	if(td->type_name != NULL) {
+		strncpy(basename, td->type_name, PATH_MAX);
+		basename_len = strlen(basename);
+	} else {
+		/* For a unnamed type, there must be a field name, except for
+		 * the array. */
+		if((basename_len != 0)
+				&& (basename[basename_len-1] != '_'
+				&& (field_name[0] != '\0'))) {
+			strncat(basename, "_", PATH_MAX - basename_len);
+			basename_len = strlen(basename);
+		}
+		strncat(basename, field_name, PATH_MAX - basename_len);
+	}
+	
+	switch(td->type) {
+		case INT_FIXED:
+		case UINT_FIXED:
+		case CHAR:
+		case UCHAR:
+		case SHORT:
+		case USHORT:
+		case INT:
+		case UINT:
+		case FLOAT:
+		case POINTER:
+		case LONG:
+		case ULONG:
+		case SIZE_T:
+		case SSIZE_T:
+		case OFF_T:
+		case ENUM:
+			print_tabs(tabs, fd);
+			fprintf(fd, "size = ");
+			fprintf(fd, "sizeof(");
+			if(print_type(td, fd, 0, basename, "")) return 1;
+			fprintf(fd, ");\n");
+			print_tabs(tabs, fd);
+			fprintf(fd, "size += ltt_align(*to+*len, size) + size;\n");
+			print_tabs(tabs, fd);
+			fprintf(fd, "*len += size;");
+			break;
+		case STRING:
+			print_tabs(tabs, fd);
+			fprintf(fd, "lttng_write_string_%s(buffer, to_base, to, from, len, obj->%s);\n", basename, field_name);
+			break;
+		case SEQUENCE:
+			print_tabs(tabs, fd);
+			fprintf(fd, "lttng_write_%s(buffer, to_base, to, from, len, &obj->%s)", basename,
+					field_name);
+			break;
+		case STRUCT:
+			print_tabs(tabs, fd);
+			fprintf(fd, "lttng_write_struct_%s(buffer, to_base, to, from, len, &obj->%s)", basename,
+					field_name);
+			break;
+		case UNION:
+			print_tabs(tabs, fd);
+			fprintf(fd, "lttng_write_union_%s(buffer, to_base, to, from, len, &obj->%s)", basename,
+					field_name);
+			break;
+		case ARRAY:
+			print_tabs(tabs, fd);
+			fprintf(fd, "lttng_write_array_%s(buffer, to_base, to, from, len, obj->%s)", basename,
+					field_name);
+			break;
+		case NONE:
+			printf("Error : type NONE unexpected\n");
+			return 1;
+			break;
+	}
+
+	return 0;
+}
+
+
+
+/* print type alignment function.
+ *
+ * Copied from construct_types_and_fields in LTTV facility.c
+ *
+ * basename is the name which identifies the type (along with a prefix
+ * (possibly)). */
+
+int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
+		unsigned int tabs,
+		char *nest_name, char *field_name)
+{
+	char basename[PATH_MAX];
+	unsigned int basename_len = 0;
+	
+	strncpy(basename, nest_name, PATH_MAX);
+	basename_len = strlen(basename);
+	
+	/* For a named type, we use the type_name directly */
+	if(td->type_name != NULL) {
+		strncpy(basename, td->type_name, PATH_MAX);
+		basename_len = strlen(basename);
+	} else {
+		/* For a unnamed type, there must be a field name, except for
+		 * the array. */
+		if((basename_len != 0)
+				&& (basename[basename_len-1] != '_'
+				&& (field_name[0] != '\0'))) {
+			strncat(basename, "_", PATH_MAX - basename_len);
+			basename_len = strlen(basename);
+		}
+		strncat(basename, field_name, PATH_MAX - basename_len);
+	}
+	
+	switch(td->type) {
+		case SEQUENCE:
+			/* Function header */
+			fprintf(fd, "static inline size_t lttng_get_alignment_sequence_%s(\n",
+					basename);
+			print_tabs(2, fd);
+			if(print_type(td,	fd, 0, basename, "")) return 1;
+			fprintf(fd, " *obj)\n");
+			fprintf(fd, "{\n");
+			print_tabs(1, fd);
+			fprintf(fd, "size_t align=0, localign;");
+			fprintf(fd, "\n");
+			print_tabs(1, fd);
+			fprintf(fd, "localign = ");
+			if(print_type_alignment(((field_t*)td->fields.array[0])->type,
+						fd, 0, basename, ((field_t*)td->fields.array[0])->name)) return 1;
+			fprintf(fd, ";\n");
+			print_tabs(1, fd);
+			fprintf(fd, "align = max(align, localign);\n");
+			fprintf(fd, "\n");
+			print_tabs(1, fd);
+			fprintf(fd, "localign = ");
+			if(print_type_alignment(((field_t*)td->fields.array[1])->type,
+						fd, 0, basename, ((field_t*)td->fields.array[1])->name)) return 1;
+			fprintf(fd, ";\n");
+			print_tabs(1, fd);
+			fprintf(fd, "align = max(align, localign);\n");
+			fprintf(fd, "\n");
+			print_tabs(1, fd);
+			fprintf(fd, "return align;\n");
+			break;
+		case STRUCT:
+			/* Function header */
+			fprintf(fd, "static inline size_t lttng_get_alignment_struct_%s(\n",
+					basename);
+			print_tabs(2, fd);
+			if(print_type(td,	fd, 0, basename, "")) return 1;
+			fprintf(fd, " *obj)\n");
+			fprintf(fd, "{\n");
+			print_tabs(1, fd);
+			fprintf(fd, "size_t align=0, localign;");
+			fprintf(fd, "\n");
+			for(unsigned int i=0;i<td->fields.position;i++){
+				field_t *field = (field_t*)(td->fields.array[i]);
+				type_descriptor_t *type = field->type;
+				print_tabs(1, fd);
+				fprintf(fd, "localign = ");
+				if(print_type_alignment(type, fd, 0, basename, field->name)) return 1;
+				fprintf(fd, ";\n");
+				print_tabs(1, fd);
+				fprintf(fd, "align = max(align, localign);\n");
+				fprintf(fd, "\n");
+			}
+			print_tabs(1, fd);
+			fprintf(fd, "return align;\n");
+
+			break;
+		case UNION:
+			/* Function header */
+			fprintf(fd, "static inline size_t lttng_get_alignment_union_%s(\n",
+					basename);
+			print_tabs(2, fd);
+			if(print_type(td,	fd, 0, basename, "")) return 1;
+			fprintf(fd, " *obj)\n");
+			fprintf(fd, "{\n");
+			print_tabs(1, fd);
+			fprintf(fd, "size_t align=0, localign;");
+			fprintf(fd, "\n");
+			for(unsigned int i=0;i<td->fields.position;i++){
+				field_t *field = (field_t*)(td->fields.array[i]);
+				type_descriptor_t *type = field->type;
+				print_tabs(1, fd);
+				fprintf(fd, "localign = ");
+				if(print_type_alignment(type, fd, 0, basename, field->name)) return 1;
+				fprintf(fd, ";\n");
+				print_tabs(1, fd);
+				fprintf(fd, "align = max(align, localign);\n");
+				fprintf(fd, "\n");
+			}
+			print_tabs(1, fd);
+			fprintf(fd, "return align;\n");
+
+			break;
+		case ARRAY:
+			/* Function header */
+			fprintf(fd, "static inline size_t lttng_get_alignment_array_%s(\n",
+					basename);
+			print_tabs(2, fd);
+			if(print_type(td,	fd, 0, basename, "")) return 1;
+			fprintf(fd, " obj)\n");
+			fprintf(fd, "{\n");
+			print_tabs(1, fd);
+			fprintf(fd, "return \n");
+			if(print_type_alignment(((field_t*)td->fields.array[0])->type,
+						fd, 0, basename, ((field_t*)td->fields.array[0])->name)) return 1;
+			fprintf(fd, ";\n");
+			break;
+		default:
+			printf("print_type_alignment_fct : type has no alignment function.\n");
+			return 0;
+			break;
+	}
+
+
+	/* Function footer */
+	fprintf(fd, "}\n");
+	fprintf(fd, "\n");
+
+	return 0;
+}
+
+/* print type write function.
+ *
+ * Copied from construct_types_and_fields in LTTV facility.c
+ *
+ * basename is the name which identifies the type (along with a prefix
+ * (possibly)). */
+
+int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
+		char *nest_name, char *field_name)
+{
+	char basename[PATH_MAX];
+	unsigned int basename_len = 0;
+	
+	strncpy(basename, nest_name, PATH_MAX);
+	basename_len = strlen(basename);
+	
+	/* For a named type, we use the type_name directly */
+	if(td->type_name != NULL) {
+		strncpy(basename, td->type_name, PATH_MAX);
+		basename_len = strlen(basename);
+	} else {
+		/* For a unnamed type, there must be a field name, except for
+		 * the array. */
+		if((basename_len != 0)
+				&& (basename[basename_len-1] != '_'
+				&& (field_name[0] != '\0'))) {
+			strncat(basename, "_", PATH_MAX - basename_len);
+			basename_len = strlen(basename);
+		}
+		strncat(basename, field_name, PATH_MAX - basename_len);
+	}
+	
+	switch(td->type) {
+		case SEQUENCE:
+		case STRUCT:
+		case UNION:
+		case ARRAY:
+			break;
+		default:
+			printf("print_type_write_fct : type has no write function.\n");
+			return 0;
+			break;
+	}
+	
+	/* Print header */
+	switch(td->type) {
+		case SEQUENCE:
+			fprintf(fd, "static inline void lttng_write_sequence_%s(\n",
+					basename);
+			break;
+		case STRUCT:
+			fprintf(fd, "static inline void lttng_write_struct_%s(\n", basename);
+			break;
+		case UNION:
+			fprintf(fd, "static inline void lttng_write_union_%s(\n", basename);
+			break;
+		case ARRAY:
+			fprintf(fd, "static inline void lttng_write_array_%s(\n", basename);
+			break;
+		default:
+			printf("print_type_write_fct : type has no write function.\n");
+			break;
+	}
+
+	print_tabs(2, fd);
+	fprintf(fd, "void *buffer,\n");
+	print_tabs(2, fd);
+	fprintf(fd, "size_t *to_base,\n");
+	print_tabs(2, fd);
+	fprintf(fd, "size_t *to,\n");
+	print_tabs(2, fd);
+	fprintf(fd, "void **from,\n");
+	print_tabs(2, fd);
+	fprintf(fd, "size_t *len,\n");
+	print_tabs(2, fd);
+	if(print_type(td,	fd, 0, basename, "")) return 1;
+
+	switch(td->type) {
+		case SEQUENCE:
+			fprintf(fd, " *obj)\n");
+			break;
+		case STRUCT:
+			fprintf(fd, " *obj)\n");
+			break;
+		case UNION:
+			fprintf(fd, " *obj)\n");
+			break;
+		case ARRAY:
+			fprintf(fd, " obj)\n");
+			break;
+		default:
+			printf("print_type_write_fct : type has no write function.\n");
+			break;
+	}
+
+	fprintf(fd, "{\n");
+	print_tabs(1, fd);
+	fprintf(fd, "size_t align, size;\n");
+	fprintf(fd, "\n");
+
+	switch(td->type) {
+		case SEQUENCE:
+		case STRING:
+			print_tabs(1, fd);
+			fprintf(fd, "/* Flush pending memcpy */\n");
+			print_tabs(1, fd);
+			fprintf(fd, "if(*len != 0) {\n");
+			print_tabs(2, fd);
+			fprintf(fd, "if(buffer != NULL)\n");
+			print_tabs(3, fd);
+			fprintf(fd, "memcpy(buffer+*to_base+*to, *from, *len);\n");
+			print_tabs(1, fd);
+			fprintf(fd, "}\n");
+			print_tabs(1, fd);
+			fprintf(fd, "*to += *len;\n");
+			print_tabs(1, fd);
+			fprintf(fd, "*len = 0;\n");
+			fprintf(fd, "\n");
+			break;
+		case STRUCT:
+		case UNION:
+		case ARRAY:
+			break;
+		default:
+			printf("print_type_write_fct : type has no write function.\n");
+			break;
+	}
+	
+	print_tabs(1, fd);
+	fprintf(fd, "align = ");
+	if(print_type_alignment(td, fd, 0, basename, field_name)) return 1;
+	fprintf(fd, ";\n");
+	fprintf(fd, "\n");
+	print_tabs(1, fd);
+	fprintf(fd, "if(*len == 0) {\n");
+	print_tabs(2, fd);
+	fprintf(fd, "*to += ltt_align(*to, align); /* align output */\n");
+	print_tabs(1, fd);
+	fprintf(fd, "} else {\n");
+	print_tabs(2, fd);
+	fprintf(fd, "*len += ltt_align(*to+*len, align); /* alignment, ok to do a memcpy of it */\n");
+	print_tabs(1, fd);
+	fprintf(fd, "}\n");
+	fprintf(fd, "\n");
+
+	/* First, check if the type has a fixed size. If it is the case, then the size
+	 * to write is know by the compiler : simply use a sizeof() */
+	if(has_type_fixed_size(td)) {
+		print_tabs(1, fd);
+		fprintf(fd, "/* Contains only fixed size fields : use compiler sizeof() */\n");
+		fprintf(fd, "\n");
+		print_tabs(1, fd);
+		fprintf(fd, "*len += sizeof(");
+		if(print_type(td, fd, 0, basename, field_name)) return 1;
+		fprintf(fd, ");\n");
+	} else {
+		/* The type contains nested variable size subtypes :
+		 * we must write field by field. */
+		print_tabs(1, fd);
+		fprintf(fd, "/* Contains variable sized fields : must explode the structure */\n");
+		fprintf(fd, "\n");
+
+		switch(td->type) {
+			case SEQUENCE:
+				print_tabs(1, fd);
+				fprintf(fd, "/* Copy members */\n");
+				print_tabs(1, fd);
+				fprintf(fd, "size = sizeof(\n");
+				if(print_type_write(((field_t*)td->fields.array[0])->type,
+						fd, 1, basename, ((field_t*)td->fields.array[0])->name)) return 1;
+				fprintf(fd, ");\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*to += ltt_align(*to, size);\n");
+				print_tabs(1, fd);
+				fprintf(fd, "if(buffer != NULL)\n");
+				print_tabs(2, fd);
+				fprintf(fd, "memcpy(buffer+*to_base+*to, &obj->len, size);\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*to += size;\n");
+				fprintf(fd, "\n");
+				
+				/* Write the child : varlen child or not ? */
+				if(has_type_fixed_size(((field_t*)td->fields.array[1])->type)) {
+					/* Fixed size len child : use a multiplication of its size */
+					print_tabs(1, fd);
+					fprintf(fd, "size = sizeof(\n");
+					if(print_type_write(((field_t*)td->fields.array[1])->type,
+							fd, 1, basename, ((field_t*)td->fields.array[1])->name)) return 1;
+					fprintf(fd, ");\n");
+					print_tabs(1, fd);
+					fprintf(fd, "*to += ltt_align(*to, size);\n");
+					print_tabs(1, fd);
+					fprintf(fd, "size = obj->len * size;\n");
+					print_tabs(1, fd);
+					fprintf(fd, "if(buffer != NULL)\n");
+					print_tabs(2, fd);
+					fprintf(fd, "memcpy(buffer+*to_base+*to, obj->array, size);\n");
+					print_tabs(1, fd);
+					fprintf(fd, "*to += size;\n");
+					fprintf(fd, "\n");
+				} else {
+					print_tabs(1, fd);
+					fprintf(fd, "/* Variable length child : iter. */\n");
+					print_tabs(1, fd);
+					fprintf(fd, "for(unsigned int i=0; i<obj->len; i++) {\n");
+					if(print_type_write(((field_t*)td->fields.array[1])->type,
+							fd, 2, basename, ((field_t*)td->fields.array[1])->name)) return 1;
+					print_tabs(1, fd);
+					fprintf(fd, "}\n");
+				}
+				fprintf(fd, "\n");
+				print_tabs(1, fd);
+				fprintf(fd, "/* Realign the *to_base on arch size, set *to to 0 */\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*to = ltt_align(*to, sizeof(void *));\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*to_base = *to_base+*to;\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*to = 0;\n");
+				fprintf(fd, "\n");
+				fprintf(fd, "/* Put source *from just after the C sequence */\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*from = obj+1;\n");
+				break;
+			case STRING:
+				fprintf(fd, "size = strlen(obj);\n");
+				print_tabs(1, fd);
+				fprintf(fd, "if(buffer != NULL)\n");
+				print_tabs(2, fd);
+				fprintf(fd, "memcpy(buffer+*to_base+*to, obj, size);\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*to += size;\n");
+				fprintf(fd, "\n");
+				print_tabs(1, fd);
+				fprintf(fd, "/* Realign the *to_base on arch size, set *to to 0 */\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*to = ltt_align(*to, sizeof(void *));\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*to_base = *to_base+*to;\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*to = 0;\n");
+				fprintf(fd, "\n");
+				fprintf(fd, "/* Put source *from just after the C sequence */\n");
+				print_tabs(1, fd);
+				fprintf(fd, "*from = obj+1;\n");
+				break;
+			case STRUCT:
+				for(unsigned int i=0;i<td->fields.position;i++){
+					field_t *field = (field_t*)(td->fields.array[i]);
+					type_descriptor_t *type = field->type;
+					if(print_type_write(type,
+							fd, 1, basename, field->name)) return 1;
+					fprintf(fd, "\n");
+				}
+				break;
+			case UNION:
+				printf("ERROR : A union CANNOT contain a variable size child.\n");
+				return 1;
+				break;
+			case ARRAY:
+				/* Write the child : varlen child or not ? */
+				if(has_type_fixed_size(((field_t*)td->fields.array[0])->type)) {
+					/* Error : if an array has a variable size, then its child must also
+					 * have a variable size. */
+					assert(0);
+				} else {
+					print_tabs(1, fd);
+					fprintf(fd, "/* Variable length child : iter. */\n");
+					print_tabs(1, fd);
+					fprintf(fd, "for(unsigned int i=0; i<LTTNG_ARRAY_SIZE_%s; i++) {\n", basename);
+					if(print_type_write(((field_t*)td->fields.array[1])->type,
+							fd, 2, basename, ((field_t*)td->fields.array[1])->name)) return 1;
+					print_tabs(1, fd);
+					fprintf(fd, "}\n");
+				}
+				break;
+			default:
+				printf("print_type_write_fct : type has no write function.\n");
+				break;
+		}
+
+
+	}
+
+
+	/* Function footer */
+	fprintf(fd, "}\n");
+	fprintf(fd, "\n");
+	return 0;
+}
+
+
+
 /* Print the logging function of an event. This is the core of genevent */
-int print_event_logging_function(char *basename, event_t *event, FILE *fd)
+int print_event_logging_function(char *basename, facility_t *fac,
+		event_t *event, FILE *fd)
 {
 	fprintf(fd, "static inline void trace_%s(\n", basename);
 	for(unsigned int j = 0; j < event->fields.position; j++) {
@@ -481,24 +1158,178 @@ int print_event_logging_function(char *basename, event_t *event, FILE *fd)
 	fprintf(fd,"#else\n");
 	fprintf(fd, "{\n");
 	/* Print the function variables */
+	print_tabs(1, fd);
+	fprintf(fd, "unsigned int index;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "struct ltt_channel_struct *channel;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "struct ltt_trace_struct *trace;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "struct rchan_buf *relayfs_buf;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "void *buffer = NULL;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "size_t to_base = 0; /* The buffer is allocated on arch_size alignment */\n");
+	print_tabs(1, fd);
+	fprintf(fd, "size_t to = 0;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "void *from;");
+	print_tabs(1, fd);
+	fprintf(fd, "size_t len = 0;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "size_t reserve_size;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "size_t slot_size;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "cycles_t tsc;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "size_t before_hdr_pad, size_t after_hdr_pad;\n");
+	fprintf(fd, "\n");
 	
-	/* Calculate event variable len + event alignment offset.
+	print_tabs(1, fd);
+	fprintf(fd, "if(ltt_traces.num_active_traces == 0) return;\n");
+	fprintf(fd, "\n");
+
+	/* Calculate event variable len + event data alignment offset.
 	 * Assume that the padding for alignment starts at a void*
-	 * address. */
+	 * address.
+	 * This excludes the header size and alignment. */
+
+	print_tabs(1, fd);
+	fprintf(fd, "/* For each field, calculate the field size. */\n");
+	print_tabs(1, fd);
+	fprintf(fd, "/* size = to_base + to + len */\n");
+	print_tabs(1, fd);
+	fprintf(fd, "/* Assume that the padding for alignment starts at a\n");
+	print_tabs(1, fd);
+	fprintf(fd, " * sizeof(void *) address. */\n");
+	fprintf(fd, "\n");
+
+	for(unsigned int i=0;i<event->fields.position;i++){
+		field_t *field = (field_t*)(event->fields.array[i]);
+		type_descriptor_t *type = field->type;
+		if(print_type_write(type,
+				fd, 1, basename, field->name)) return 1;
+		fprintf(fd, "\n");
+	}
+	print_tabs(1, fd);
+	fprintf(fd, "reserve_size = to_base + to + len;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "to_base = to = len = 0;\n");
+	fprintf(fd, "\n");
 
 	/* Take locks : make sure the trace does not vanish while we write on
 	 * it. A simple preemption disabling is enough (using rcu traces). */
+	print_tabs(1, fd);
+	fprintf(fd, "preempt_disable();\n");
+	print_tabs(1, fd);
+	fprintf(fd, "ltt_nesting[smp_processor_id()]++;\n");
+
+	/* Get facility index */
+
+	if(event->per_tracefile) {
+		print_tabs(1, fd);
+		fprintf(fd, "index = tracefile_index;\n");
+	} else {
+		print_tabs(1, fd);
+		fprintf(fd, 
+			"index = ltt_get_index_from_facility(ltt_facility_%s_%X,\n"\
+					"\t\t\t\t\t\tevent_%s);\n",
+				fac->name, fac->checksum, event->name);
+	}
+	fprintf(fd,"\n");
+
 	
 	/* For each trace */
+	print_tabs(1, fd);
+	fprintf(fd, "list_for_each_entry_rcu(trace, &ltt_traces.head, list) {\n");
+	print_tabs(2, fd);
+	fprintf(fd, "if(!trace->active) continue;\n\n");
+
+	if(event->per_trace) {
+		print_tabs(2, fd);
+		fprintf(fd, "if(dest_trace != trace) continue;\n\n");
+	}
+ 
+	print_tabs(2, fd);
+	fprintf(fd, "channel = ltt_get_channel_from_index(trace, index);\n");
+	print_tabs(2, fd);
+	fprintf(fd, "relayfs_buf = channel->rchan->buf[channel->rchan->buf->cpu];\n");
+	fprintf(fd, "\n");
+
 	
 	/* Relay reserve */
-	/* If error, increment counter and return */
+	/* If error, increment event lost counter (done by ltt_reserve_slot) and 
+	 * return */
+	print_tabs(2, fd);
+	fprintf(fd, "slot_size = 0;\n");
+	print_tabs(2, fd);
+	fprintf(fd, "buffer = ltt_reserve_slot(trace, relayfs_buf,\n");
+	print_tabs(3, fd);
+	fprintf(fd, "reserve_size, &slot_size, &tsc,\n");
+	print_tabs(3, fd);
+	fprintf(fd, "&before_hdr_pad, &after_hdr_pad);\n");
+	/* If error, return */
+	print_tabs(2, fd);
+	fprintf(fd, "if(!buffer) return;\n\n");
 	
-	/* write data */
+	/* write data : assume stack alignment is the same as struct alignment. */
+
+	for(unsigned int i=0;i<event->fields.position;i++){
+		field_t *field = (field_t*)(event->fields.array[i]);
+		type_descriptor_t *type = field->type;
+
+		/* Set from */
+		print_tabs(2, fd);
+		switch(type->type) {
+			case SEQUENCE:
+			case UNION:
+			case ARRAY:
+			case STRUCT:
+			case STRING:
+				fprintf(fd, "from = %s;\n", field->name);
+				break;
+			default:
+				fprintf(fd, "from = &%s;\n", field->name);
+				break;
+		}
+
+
+		if(print_type_write(type,
+				fd, 2, basename, field->name)) return 1;
+		fprintf(fd, "\n");
 		
+		/* Don't forget to flush pending memcpy */
+		print_tabs(2, fd);
+		fprintf(fd, "/* Flush pending memcpy */\n");
+		print_tabs(2, fd);
+		fprintf(fd, "if(len != 0) {\n");
+		print_tabs(3, fd);
+		fprintf(fd, "memcpy(buffer+to_base+to, from, len);\n");
+		print_tabs(3, fd);
+		fprintf(fd, "to += len;\n");
+		//print_tabs(3, fd);
+		//fprintf(fd, "from += len;\n");
+		print_tabs(3, fd);
+		fprintf(fd, "len = 0;\n");
+		print_tabs(2, fd);
+		fprintf(fd, "}\n");
+		fprintf(fd, "\n");
+	}
+
+	
 	/* commit */
+	print_tabs(2, fd);
+	fprintf(fd, "ltt_commit_slot(relayfs_buf, buffer, slot_size);\n\n");
 	
+	print_tabs(1, fd);
+	fprintf(fd, "}\n\n");
+
 	/* Release locks */
+	print_tabs(1, fd);
+	fprintf(fd, "ltt_nesting[smp_processor_id()]--;\n");
+	print_tabs(1, fd);
+	fprintf(fd, "preempt_enable_no_resched();\n");
 
 	fprintf(fd, "}\n");
 	fprintf(fd, "#endif //CONFIG_LTT\n\n");
@@ -530,6 +1361,12 @@ int print_log_header_types(facility_t *fac, FILE *fd)
 		/* For each named type, print the definition */
 		if((print_type_declaration(types->array[i], fd,
 						0, "", ""))) return 1;
+		/* Print also the align function */
+		if((print_type_alignment_fct(types->array[i], fd,
+						0, "", ""))) return 1;
+		/* Print also the write function */
+		if((print_type_write_fct(types->array[i], fd,
+						0, "", ""))) return 1;
 	}
 	return 0;
 }
@@ -556,15 +1393,21 @@ int print_log_header_events(facility_t *fac, FILE *fd)
 			/* For each unnamed type, print the definition */
 			field_t *f = (field_t*)event->fields.array[j];
 			type_descriptor_t *t = f->type;
-			if(t->type_name == NULL)
+			if(t->type_name == NULL) {
 				if((print_type_declaration(t, fd, 0, basename, f->name))) return 1;
+				/* Print also the align function */
+				if((print_type_alignment_fct(t, fd, 0, basename, f->name))) return 1;
+				/* Print also the write function */
+				if((print_type_write_fct(t, fd, 0, basename, f->name))) return 1;
+			}
 		}
+
 		fprintf(fd, "\n");
 
 		fprintf(fd, "/* Event %s logging function */\n",
 				event->name);
 
-		if(print_event_logging_function(basename, event, fd)) return 1;
+		if(print_event_logging_function(basename, fac, event, fd)) return 1;
 
 		fprintf(fd, "\n");
 	}
@@ -738,7 +1581,6 @@ facility_t *ltt_facility_open(char * pathname)
 	char *token;
 	parse_file_t in;
 	facility_t * fac = NULL;
-	unsigned long checksum;
 	char buffer[BUFFER_SIZE];
 	int generated = FALSE;
 
@@ -779,8 +1621,8 @@ facility_t *ltt_facility_open(char * pathname)
 			//check if any namedType is not defined
 			checkNamedTypesImplemented(&fac->named_types);
 		
-			generateChecksum(fac->name, &checksum, &fac->events);
-	
+			generateChecksum(fac->name, &fac->checksum, &fac->events);
+			
 			generated = TRUE;
 		}
 		else {