X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=genevent-new%2Fgenevent.c;h=88fbde1576e54d7ba313834f880542407047ff0b;hb=ba899d3dc9f7c730c8bf699617d5f7a22d196f37;hp=a478e03b0c308e3a703f9ad05d689708409f270e;hpb=804b200f8253c7f6d1c91fc31180267dfb7152d1;p=lttv.git

diff --git a/genevent-new/genevent.c b/genevent-new/genevent.c
index a478e03b..88fbde15 100644
--- a/genevent-new/genevent.c
+++ b/genevent-new/genevent.c
@@ -861,6 +861,11 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
 	
 	switch(td->type) {
 		case SEQUENCE:
+			if(((field_t*)td->fields.array[1])->type->type_name == NULL) {
+				/* Not a named nested type : we must print its align fct */
+				if(print_type_alignment_fct(((field_t*)td->fields.array[1])->type, fd,
+								0, basename, "")) return 1;
+			}
 			/* Function header */
 			fprintf(fd, "static inline size_t lttng_get_alignment_sequence_%s(\n",
 					basename);
@@ -891,6 +896,15 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
 			fprintf(fd, "return align;\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(type->type_name == NULL) {
+					/* Not a named nested type : we must print its align fct */
+					if(print_type_alignment_fct(type, fd,
+								0, basename, field->name)) return 1;
+				}
+			}
 			/* Function header */
 			fprintf(fd, "static inline size_t lttng_get_alignment_struct_%s(\n",
 					basename);
@@ -918,6 +932,15 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
 
 			break;
 		case UNION:
+			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(type->type_name == NULL) {
+					/* Not a named nested type : we must print its align fct */
+					if(print_type_alignment_fct(type, fd,
+								0, basename, field->name)) return 1;
+				}
+			}
 			/* Function header */
 			fprintf(fd, "static inline size_t lttng_get_alignment_union_%s(\n",
 					basename);
@@ -945,6 +968,11 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
 
 			break;
 		case ARRAY:
+			if(((field_t*)td->fields.array[0])->type->type_name == NULL) {
+				/* Not a named nested type : we must print its align fct */
+				if(print_type_alignment_fct(((field_t*)td->fields.array[0])->type, fd,
+								0, basename, "")) return 1;
+			}
 			/* Function header */
 			fprintf(fd, "static inline size_t lttng_get_alignment_array_%s(\n",
 					basename);
@@ -1009,9 +1037,41 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 	
 	switch(td->type) {
 		case SEQUENCE:
+			if(((field_t*)td->fields.array[1])->type->type_name == NULL) {
+				/* Not a named nested type : we must print its write fct */
+				if(print_type_write_fct(((field_t*)td->fields.array[1])->type, fd,
+								0, basename, "")) return 1;
+			}
+			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(type->type_name == NULL) {
+					/* Not a named nested type : we must print its write fct */
+					if(print_type_write_fct(type, fd,
+								0, basename, field->name)) return 1;
+				}
+			}
+			break;
 		case UNION:
+			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(type->type_name == NULL) {
+					/* Not a named nested type : we must print its write fct */
+					if(print_type_write_fct(type, fd,
+								0, basename, field->name)) return 1;
+				}
+			}
+			break;
 		case ARRAY:
+			if(((field_t*)td->fields.array[0])->type->type_name == NULL) {
+				/* Not a named nested type : we must print its write fct */
+				if(print_type_write_fct(((field_t*)td->fields.array[0])->type, fd,
+								0, basename, "")) return 1;
+			}
+			break;
 		case STRING:
 			break;
 		default:
@@ -2588,11 +2648,11 @@ int print_loader_c(facility_t *fac)
   fprintf(fd, "\t\n");
   fprintf(fd, "\treturn LTT_FACILITY_SYMBOL;\n");
   fprintf(fd, "}\n");
-  fprintf(fd, "__initcall(facility_init);\n");
-  fprintf(fd, "\n");
   fprintf(fd, "\n");
   fprintf(fd, "#ifndef MODULE\n");
-  fprintf(fd, "\n");
+  fprintf(fd, "__initcall(facility_init);\n");
+  fprintf(fd, "#else\n");
+  fprintf(fd, "module_init(facility_init);\n");
   fprintf(fd, "static void __exit facility_exit(void)\n");
   fprintf(fd, "{\n");
   fprintf(fd, "\tint err;\n");
@@ -2602,10 +2662,8 @@ int print_loader_c(facility_t *fac)
   fprintf(fd, "\t\tprintk(KERN_ERR \"LTT : Error in unregistering facility.\\n\");\n");
   fprintf(fd, "\n");
   fprintf(fd, "}\n");
-  fprintf(fd, "\n");
   fprintf(fd, "module_exit(facility_exit)\n");
   fprintf(fd, "\n");
-  fprintf(fd, "\n");
   fprintf(fd, "MODULE_LICENSE(\"GPL\");\n");
   fprintf(fd, "MODULE_AUTHOR(\"Mathieu Desnoyers\");\n");
   fprintf(fd, "MODULE_DESCRIPTION(\"Linux Trace Toolkit Facility\");\n");