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

diff --git a/genevent-new/genevent.c b/genevent-new/genevent.c
index 15518d80..006c902f 100644
--- a/genevent-new/genevent.c
+++ b/genevent-new/genevent.c
@@ -543,11 +543,13 @@ int print_type_alignment(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 		 * 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);
 		}
-		strncat(basename, field_name, PATH_MAX - basename_len);
+		if(field_name != NULL)
+			strncat(basename, field_name, PATH_MAX - basename_len);
 	}
 	
 	switch(td->type) {
@@ -654,7 +656,7 @@ int print_type_write(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 			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;");
+			fprintf(fd, "size += ltt_align(*to+*len, size) + size;\n");
 			print_tabs(tabs, fd);
 			fprintf(fd, "*len += size;");
 			break;
@@ -664,17 +666,17 @@ int print_type_write(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 			break;
 		case SEQUENCE:
 			print_tabs(tabs, fd);
-			fprintf(fd, "lttng_write_%s(buffer, to_base, to, from, len, obj->%s)", basename,
+			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,
+			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,
+			fprintf(fd, "lttng_write_union_%s(buffer, to_base, to, from, len, &obj->%s)", basename,
 					field_name);
 			break;
 		case ARRAY:
@@ -825,6 +827,7 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
 			break;
 		default:
 			printf("print_type_alignment_fct : type has no alignment function.\n");
+			return 0;
 			break;
 	}
 
@@ -868,26 +871,32 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 		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 size_t lttng_get_alignment_sequence_%s(\n",
+			fprintf(fd, "static inline void lttng_write_sequence_%s(\n",
 					basename);
-
-			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);
+			fprintf(fd, "static inline void lttng_write_struct_%s(\n", basename);
 			break;
 		case UNION:
-			fprintf(fd, "lttng_get_alignment_union_%s(&obj->%s)", basename,
-					field_name);
+			fprintf(fd, "static inline void lttng_write_union_%s(\n", basename);
 			break;
 		case ARRAY:
-			fprintf(fd, "lttng_get_alignment_array_%s(obj->%s)", basename,
-					field_name);
+			fprintf(fd, "static inline void lttng_write_array_%s(\n", basename);
 			break;
 		default:
 			printf("print_type_write_fct : type has no write function.\n");
@@ -959,7 +968,7 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 	}
 	
 	print_tabs(1, fd);
-	fprintf(fd, "align = \n");
+	fprintf(fd, "align = ");
 	if(print_type_alignment(td, fd, 0, basename, field_name)) return 1;
 	fprintf(fd, ";\n");
 	fprintf(fd, "\n");
@@ -1167,11 +1176,13 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	fprintf(fd, "void *from;");
 	print_tabs(1, fd);
 	fprintf(fd, "size_t len = 0;\n");
-	fprintf(fd, "\n");
+	print_tabs(1, fd);
+	fprintf(fd, "size_t reserve_size;\n");
+	print_tabs(1, fd);
 	fprintf(fd, "size_t slot_size;\n");
-	fprintf(fd, "\n");
+	print_tabs(1, fd);
 	fprintf(fd, "cycles_t tsc;\n");
-	fprintf(fd, "\n");
+	print_tabs(1, fd);
 	fprintf(fd, "size_t before_hdr_pad, size_t after_hdr_pad;\n");
 	fprintf(fd, "\n");
 	
@@ -1189,9 +1200,9 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	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 void*\n");
+	fprintf(fd, "/* Assume that the padding for alignment starts at a\n");
 	print_tabs(1, fd);
-	fprintf(fd, "/* address. */\n");
+	fprintf(fd, " * sizeof(void *) address. */\n");
 	fprintf(fd, "\n");
 
 	for(unsigned int i=0;i<event->fields.position;i++){
@@ -1201,6 +1212,11 @@ int print_event_logging_function(char *basename, facility_t *fac,
 				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). */
@@ -1218,7 +1234,7 @@ int print_event_logging_function(char *basename, facility_t *fac,
 		print_tabs(1, fd);
 		fprintf(fd, 
 			"index = ltt_get_index_from_facility(ltt_facility_%s_%X,\n"\
-					"\t\t\t\tevent_%s);\n",
+					"\t\t\t\t\t\tevent_%s);\n",
 				fac->name, fac->checksum, event->name);
 	}
 	fprintf(fd,"\n");
@@ -1248,8 +1264,11 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	print_tabs(2, fd);
 	fprintf(fd, "slot_size = 0;\n");
 	print_tabs(2, fd);
-	fprintf(fd, "buffer = ltt_reserve_slot(trace, relayfs_buf, to_base + to + len, &slot_size, &tsc,\n"
-		"\t\t&before_hdr_pad, &after_hdr_pad);\n");
+	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");
@@ -1261,8 +1280,20 @@ int print_event_logging_function(char *basename, facility_t *fac,
 		type_descriptor_t *type = field->type;
 
 		/* Set from */
-		print_tabs(3, fd);
-		fprintf(fd, "from = %s;\n", field->name);
+		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;
@@ -1330,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;
 }
@@ -1356,9 +1393,15 @@ 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",