X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent%2Fgenevent.c;h=d39fd02711ca9e5e17a0fda44e221bf41f4ba04f;hb=f31e451543241243392b739b93d8b2c6c1bc0bc5;hp=c4c4d5d2c31382489b37580d38a577881b9a0514;hpb=d7ed29cd594089309e454fe2a0d3a0ba1e12de77;p=lttv.git

diff --git a/genevent/genevent.c b/genevent/genevent.c
index c4c4d5d2..d39fd027 100644
--- a/genevent/genevent.c
+++ b/genevent/genevent.c
@@ -45,19 +45,27 @@ This program is distributed in the hope that it will be useful,
 #include "parser.h"
 #include "genevent.h"
 
+#define max(a,b) ((a)<(b))?(b):(a)
+
 /* Named types may be referenced from anywhere */
 
-facility * fac;
+facility_t * fac;
+
+unsigned alignment = 0;
 
 int main(int argc, char** argv)
 {
   char *token;
-  parse_file in;
+  parse_file_t in;
   char buffer[BUFFER_SIZE];
   int i;
 
   if(argc < 2){
     printf("At least one event definition file is needed\n");
+    printf("You may specify the default alignment for a facility with\n");
+    printf("  -a x , where x is the desired alignment in bytes.\n");
+    printf("The alignment value will affect all the following xml files.\n");
+    printf("i.e. genevent -a 8 core.xml -a 4 kernel.xml is valid.\n");
     exit(1);
   }
 
@@ -65,52 +73,61 @@ int main(int argc, char** argv)
   in.error = error_callback;
 
   for(i = 1 ; i < argc ; i++) {
-    in.lineno = 0;
-    in.name = allocAndCopy(argv[i]);
-
-    in.fp = fopen(in.name, "r");
-    if(!in.fp ){
-      in.error(&in,"cannot open facility input file");
-    }
-
-    while(1){
-      token = getToken(&in);
-      if(in.type == ENDFILE) break;
-
-      if(strcmp(token, "<")) in.error(&in,"not a facility file");
-      token = getName(&in);
-    
-      if(strcmp("facility",token) == 0) {
-				fac = memAlloc(sizeof(facility));
-				fac->name = NULL;
-				fac->description = NULL;
-				sequence_init(&(fac->events));
-				table_init(&(fac->named_types));
-				sequence_init(&(fac->unnamed_types));
-				
-				parseFacility(&in, fac);
-				
-				//check if any namedType is not defined
-				checkNamedTypesImplemented(&fac->named_types);
-      }
-			else in.error(&in,"facility token was expected");
-
-      generateFile(argv[i]);
-
-      free(fac->name);
-      free(fac->description);
-      freeEvents(&fac->events);
-      sequence_dispose(&fac->events);
-      freeNamedType(&fac->named_types);
-      table_dispose(&fac->named_types);
-      freeTypes(&fac->unnamed_types);
-      sequence_dispose(&fac->unnamed_types);      
-      free(fac);      
-    }
-
-    free(in.name);
-    fclose(in.fp);
 
+		if(strcmp("-a", argv[i])==0) {
+			if(i >= argc-1) {
+				printf("Error : missing argument to -a\n");
+				exit(1);
+			} else i++;
+			alignment = atoi(argv[i]);
+		} else {
+		
+			in.lineno = 0;
+			in.name = allocAndCopy(argv[i]);
+
+			in.fp = fopen(in.name, "r");
+			if(!in.fp ){
+				in.error(&in,"cannot open facility input file");
+			}
+
+			while(1){
+				token = getToken(&in);
+				if(in.type == ENDFILE) break;
+
+				if(strcmp(token, "<")) in.error(&in,"not a facility file");
+				token = getName(&in);
+			
+				if(strcmp("facility",token) == 0) {
+					fac = memAlloc(sizeof(facility_t));
+					fac->name = NULL;
+					fac->description = NULL;
+					sequence_init(&(fac->events));
+					table_init(&(fac->named_types));
+					sequence_init(&(fac->unnamed_types));
+					
+					parseFacility(&in, fac);
+					
+					//check if any namedType is not defined
+					checkNamedTypesImplemented(&fac->named_types);
+				}
+				else in.error(&in,"facility token was expected");
+
+				generateFile(argv[i]);
+
+				free(fac->name);
+				free(fac->description);
+				freeEvents(&fac->events);
+				sequence_dispose(&fac->events);
+				freeNamedType(&fac->named_types);
+				table_dispose(&fac->named_types);
+				freeTypes(&fac->unnamed_types);
+				sequence_dispose(&fac->unnamed_types);      
+				free(fac);      
+			}
+
+			free(in.name);
+			fclose(in.fp);
+		}
   }
   return 0;
 }
@@ -122,9 +139,10 @@ int main(int argc, char** argv)
  *Input Params
  *    name         : name of event definition file
  ****************************************************************************/
-void generateFile(char *name){
-  char *loadName, *hName, *tmp, *tmp2;
-  FILE * lFp, *hFp;
+void generateFile(char *name)
+{
+  char *loadName, *hName, *hIdName, *cName, *tmp, *tmp2;
+  FILE * lFp, *hFp, *iFp, *cFp;
   int nbEvent;
   unsigned long checksum=0;
 
@@ -149,6 +167,14 @@ void generateFile(char *name){
   tmp2 = appendString(hName,".h");
   free(hName);
   hName = tmp2;
+  hIdName = appendString("ltt-facility-id-", tmp);
+  tmp2 = appendString(hIdName,".h");
+  free(hIdName);
+  hIdName = tmp2;
+  cName = appendString("ltt-facility-loader-", tmp);
+  tmp2 = appendString(cName,".c");
+  free(cName);
+  cName = tmp2;
   lFp = fopen(loadName,"w");
   if(!lFp){
     printf("Cannot open the file : %s\n",loadName);
@@ -160,25 +186,54 @@ void generateFile(char *name){
      printf("Cannot open the file : %s\n",hName);
      exit(1);
   }
+
+  iFp = fopen(hIdName,"w");
+  if(!iFp){
+     printf("Cannot open the file : %s\n",hIdName);
+     exit(1);
+  }
+  
+  cFp = fopen(cName,"w");
+  if(!cFp){
+     printf("Cannot open the file : %s\n",cName);
+     exit(1);
+  }
   
   free(loadName);
   free(hName);
+  free(hIdName);
+  free(cName);
 
   generateChecksum(fac->name, &checksum, &(fac->events));
 
   /* generate .h file, event enumeration then structures and functions */
-	fprintf(hFp, "#ifndef _LTT_FACILITY_%s_H_\n",fac->capname);
-	fprintf(hFp, "#define _LTT_FACILITY_%s_H_\n\n",fac->capname);
-  generateEnumEvent(hFp, fac->name, &nbEvent, checksum);
-  generateTypeDefs(hFp);
+  fprintf(iFp, "#ifndef _LTT_FACILITY_ID_%s_H_\n",fac->capname);
+  fprintf(iFp, "#define _LTT_FACILITY_ID_%s_H_\n\n",fac->capname);
+  fprintf(iFp, "#ifdef CONFIG_LTT\n");
+  generateEnumEvent(iFp, fac->name, &nbEvent, checksum);
+  fprintf(iFp, "#endif //CONFIG_LTT\n");
+  fprintf(iFp, "#endif //_LTT_FACILITY_ID_%s_H_\n",fac->capname);
+
+
+  fprintf(hFp, "#ifndef _LTT_FACILITY_%s_H_\n",fac->capname);
+  fprintf(hFp, "#define _LTT_FACILITY_%s_H_\n\n",fac->capname);
+  //fprintf(hFp, "#ifdef CONFIG_LTT\n");
+  generateTypeDefs(hFp, fac->name);
   generateStructFunc(hFp, fac->name,checksum);
-	fprintf(hFp, "#endif //_LTT_FACILITY_%s_H_\n",fac->capname);
+  //fprintf(hFp, "#endif //CONFIG_LTT\n");
+  fprintf(hFp, "#endif //_LTT_FACILITY_%s_H_\n",fac->capname);
 
   /* generate .h file, calls to register the facility at init time */
   generateLoaderfile(lFp,fac->name,nbEvent,checksum,fac->capname);
 
+  // create ltt-facility-loader-facname.c
+  generateCfile(cFp, tmp);
+
   fclose(hFp);
+  fclose(iFp);
   fclose(lFp);
+  fclose(cFp);
+
 }
 
 
@@ -191,20 +246,21 @@ void generateFile(char *name){
  *Output Params
  *    nbEvent           : number of events in the facility
  ****************************************************************************/
-void generateEnumEvent(FILE *fp, char *facName, int * nbEvent, unsigned long checksum) {
+void generateEnumEvent(FILE *fp, char *facName, int * nbEvent,
+                       unsigned long checksum) {
   int pos = 0;
 
-  fprintf(fp,"#include <linux/ltt-log.h>\n\n");
+  fprintf(fp,"#include <linux/ltt-facilities.h>\n\n");
 
   fprintf(fp,"/****  facility handle  ****/\n\n");
-  fprintf(fp,"extern trace_facility_t ltt_facility_%s_%X;\n",facName, checksum);
-  fprintf(fp,"extern trace_facility_t ltt_facility_%s;\n\n\n",facName, checksum);
+  fprintf(fp,"extern ltt_facility_t ltt_facility_%s_%X;\n",facName, checksum);
+  fprintf(fp,"extern ltt_facility_t ltt_facility_%s;\n\n\n",facName, checksum);
 
   fprintf(fp,"/****  event type  ****/\n\n");
   fprintf(fp,"enum %s_event {\n",facName);
 
   for(pos = 0; pos < fac->events.position;pos++) {
-    fprintf(fp,"\t%s", ((event *)(fac->events.array[pos]))->name);
+    fprintf(fp,"\tevent_%s", ((event_t *)(fac->events.array[pos]))->name);
     if(pos != fac->events.position-1) fprintf(fp,",\n");
   }
   fprintf(fp,"\n};\n\n\n");
@@ -231,48 +287,48 @@ void generateEnumEvent(FILE *fp, char *facName, int * nbEvent, unsigned long che
 
 static void
 printStruct(FILE * fp, int len, void ** array, char * name, char * facName,
-	     int * whichTypeFirst, int * hasStrSeq, int * structCount)
+       int * whichTypeFirst, int * hasStrSeq, int * structCount,
+       type_descriptor_t *type)
 {
   int flag = 0;
   int pos;
-  field * fld;
-  type_descriptor * td;
+  field_t * fld;
+  type_descriptor_t * td;
 
   for (pos = 0; pos < len; pos++) {
-    fld  = (field *)array[pos];
+    fld  = (field_t *)array[pos];
     td = fld->type;
-    if( td->type != STRING && td->type != SEQUENCE &&
-	      td->type != ARRAY) {
-      if (*whichTypeFirst == 0) {
-        *whichTypeFirst = 1; //struct first
-      }
+    if( td->type == STRING || td->type == SEQUENCE ||
+        td->type == ARRAY) {
+        (*hasStrSeq)++;
+		} else {
       if (flag == 0) {
         flag = 1;
-
         fprintf(fp,"struct %s_%s",name, facName);
         if (structCount) {
-	        fprintf(fp, "_%d {\n",++*structCount);
+          fprintf(fp, "_%d {\n",++*structCount);
         } else {
           fprintf(fp, " {\n");
         }
       }
       fprintf(fp, "\t%s %s; /* %s */\n", 
           getTypeStr(td),fld->name,fld->description );
-    } else {
-        if (*whichTypeFirst == 0) {
-        //string or sequence or array first
-          *whichTypeFirst = 2;
-        }
-        (*hasStrSeq)++;
-        if(flag) {
-          fprintf(fp,"} __attribute__ ((packed));\n\n");
-        }
-        flag = 0;
     }
   }
 
   if(flag) {
-    fprintf(fp,"} __attribute__ ((packed));\n\n");
+		unsigned align = max(alignment, type->alignment);
+		
+    if(align == 0)
+      fprintf(fp,"} __attribute__ ((packed));\n\n");
+    else {
+      if(align != 1 && align != 2
+          && align != 4 && align != 8) {
+        printf("Wrong alignment %i, using packed.\n", align);
+        fprintf(fp,"} __attribute__ ((packed));\n\n");
+      } else
+        fprintf(fp,"} __attribute__ ((aligned(%i)));\n\n", align);
+    }
   }
 }
 
@@ -284,10 +340,16 @@ printStruct(FILE * fp, int len, void ** array, char * name, char * facName,
  *    fp                : file to be written to
  ****************************************************************************/
 void
-generateTypeDefs(FILE * fp)
+generateTypeDefs(FILE * fp, char *facName)
 {
   int pos, tmp = 1;
 
+  fprintf(fp,"#include <linux/types.h>\n");
+  fprintf(fp,"#include <linux/spinlock.h>\n");
+  fprintf(fp,"#include <linux/ltt/ltt-facility-id-%s.h>\n\n", facName);
+  fprintf(fp,"#include <linux/ltt-core.h>\n");
+
+#if 0 //broken
   fprintf(fp, "/****  Basic Type Definitions  ****/\n\n");
 
   for (pos = 0; pos < fac->named_types.values.position; pos++) {
@@ -298,6 +360,7 @@ generateTypeDefs(FILE * fp)
     fprintf(fp, "typedef struct _%s %s;\n\n",
             type->type_name, type->type_name);
   }
+#endif //0
 }
 
 
@@ -308,23 +371,23 @@ generateTypeDefs(FILE * fp)
  *    fp                    : file to be written to
  *    fHead                 : enum type
  ****************************************************************************/
-void generateEnumDefinition(FILE * fp, type_descriptor * type){
+void generateEnumDefinition(FILE * fp, type_descriptor_t * type){
   int pos;
 
-	if(type->already_printed) return;
-	
+  if(type->already_printed) return;
+  
   fprintf(fp,"enum {\n");
   for(pos = 0; pos < type->labels.position; pos++){
-    fprintf(fp,"\t%s", type->labels.array[pos]);
+    fprintf(fp,"\tLTT_ENUM_%s", type->labels.array[pos]);
     if (pos != type->labels.position - 1) fprintf(fp,",");
-		if(type->labels_description.array[pos] != NULL)
-			fprintf(fp,"\t/* %s */\n",type->labels_description.array[pos]);
-		else
-			fprintf(fp,"\n");
+    if(type->labels_description.array[pos] != NULL)
+      fprintf(fp,"\t/* %s */\n",type->labels_description.array[pos]);
+    else
+      fprintf(fp,"\n");
   }
   fprintf(fp,"};\n\n\n");
 
-	type->already_printed = 1;
+  type->already_printed = 1;
 }
 
 /*****************************************************************************
@@ -335,32 +398,34 @@ void generateEnumDefinition(FILE * fp, type_descriptor * type){
  *    facName           : name of facility
  ****************************************************************************/
 void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){
-  event * ev;
-  field * fld;
-  type_descriptor * td;
+  event_t * ev;
+  field_t * fld;
+  type_descriptor_t * td;
   int pos, pos1;
   int hasStrSeq, flag, structCount, seqCount,strCount, whichTypeFirst=0;
+  int args_empty;
 
   for(pos = 0; pos < fac->events.position; pos++){
-    ev = (event *) fac->events.array[pos];
+    ev = (event_t *) fac->events.array[pos];
     //yxx    if(ev->nested)continue;
     fprintf(fp,"/****  structure and trace function for event: %s  ****/\n\n",
         ev->name);
-    if(ev->type == 0){ // event without type
-      fprintf(fp,"static inline void trace_%s_%s(void){\n",facName,ev->name);
-      fprintf(fp,"\tltt_log_event(ltt_facility_%s_%X, %s, 0, NULL);\n",
-          facName,checksum,ev->name);
-      fprintf(fp,"};\n\n\n");
-      continue;
-    }
+    //if(ev->type == 0){ // event without type
+    //  fprintf(fp,"static inline void trace_%s_%s(void){\n",facName,ev->name);
+    //  fprintf(fp,"\tltt_log_event(ltt_facility_%s_%X, event_%s, 0, NULL);\n",
+    //      facName,checksum,ev->name);
+    //  fprintf(fp,"};\n\n\n");
+    //  continue;
+    //}
 
     //if fields contain enum, print out enum definition
     //MD : fixed in generateEnumDefinition to do not print the same enum
     //twice.
-    for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
-      fld = (field *)ev->type->fields.array[pos1];
-      if(fld->type->type == ENUM) generateEnumDefinition(fp, fld->type);      
-    }
+    if(ev->type != 0)
+      for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
+        fld = (field_t *)ev->type->fields.array[pos1];
+        if(fld->type->type == ENUM) generateEnumDefinition(fp, fld->type);      
+      }
       
     //default: no string, array or sequence in the event
     hasStrSeq = 0;
@@ -368,116 +433,388 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){
     structCount = 0;
 
     //structure for kernel
-    printStruct(fp, ev->type->fields.position, ev->type->fields.array,
-		  ev->name, facName, &whichTypeFirst, &hasStrSeq, &structCount);
+    if(ev->type != 0)
+      printStruct(fp, ev->type->fields.position, ev->type->fields.array,
+        ev->name, facName, &whichTypeFirst, &hasStrSeq, &structCount,
+        ev->type);
 
-    //trace function : function name and parameters
+
+    //trace function : function name and parameters : stub function.
     seqCount = 0;
     strCount = 0;
+		fprintf(fp, "#ifndef CONFIG_LTT\n");
     fprintf(fp,"static inline void trace_%s_%s(",facName,ev->name);
-    for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
-      fld  = (field *)ev->type->fields.array[pos1];
-      td = fld->type;
-      if(td->type == ARRAY ){
-	      fprintf(fp,"%s * %s",getTypeStr(td), fld->name);
-      }else if(td->type == STRING){
-       	fprintf(fp,"short int strlength_%d, %s * %s",
-            ++strCount, getTypeStr(td), fld->name);
-     }else if(td->type == SEQUENCE){
-        fprintf(fp,"%s seqlength_%d, %s * %s",
-            uintOutputTypes[td->size], ++seqCount,getTypeStr(td), fld->name);
-     }else fprintf(fp,"%s %s",getTypeStr(td), fld->name);     
-     if(pos1 != ev->type->fields.position - 1) fprintf(fp,", ");
-    }
-    fprintf(fp,")\n{\n");
 
-    //length of buffer : length of all structures
-    fprintf(fp,"\tint length = ");
-    for(pos1=0;pos1<structCount;pos1++){
-      fprintf(fp,"sizeof(struct %s_%s_%d)",ev->name, facName,pos1+1);
-      if(pos1 != structCount-1) fprintf(fp," + ");
+    args_empty = 1;
+
+    /* Does it support per trace tracing ? */
+    if(ev->per_trace) {
+      fprintf(fp, "struct ltt_trace_struct *dest_trace");
+      args_empty = 0;
+    }
+    
+    /* Does it support per tracefile tracing ? */
+    if(ev->per_tracefile) {
+      if(!args_empty) fprintf(fp, ", ");
+      fprintf(fp, "unsigned int tracefile_index");
+      args_empty = 0;
+    }
+    
+    if(ev->type != 0) {
+      for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
+        fld  = (field_t *)ev->type->fields.array[pos1];
+        td = fld->type;
+        if(!args_empty) fprintf(fp, ", ");
+        if(td->type == ARRAY ){
+          fprintf(fp,"%s * %s",getTypeStr(td), fld->name);
+          args_empty = 0;
+        }else if(td->type == STRING){
+          fprintf(fp,"short int strlength_%d, %s * %s",
+              ++strCount, getTypeStr(td), fld->name);
+          args_empty = 0;
+        }else if(td->type == SEQUENCE){
+          fprintf(fp,"%s seqlength_%d, %s * %s",
+              uintOutputTypes[td->size], ++seqCount,getTypeStr(td), fld->name);
+          args_empty = 0;
+        }else {
+          fprintf(fp,"%s %s",getTypeStr(td), fld->name);     
+          args_empty = 0;
+        }
+      }
     }
+    if(args_empty) fprintf(fp, "void");
 
-    //length of buffer : length of all arrays, sequences and strings
+    fprintf(fp,")\n{\n");
+    fprintf(fp,"}\n");
+		fprintf(fp,"#else\n");
+
+    //trace function : function name and parameters
     seqCount = 0;
     strCount = 0;
-    flag = 0;
-    for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
-      fld  = (field *)ev->type->fields.array[pos1];
-      td = fld->type;
-      if(td->type == SEQUENCE || td->type==STRING || td->type==ARRAY){
-      	if(structCount || flag > 0) fprintf(fp," + ");	  
-      	if(td->type == SEQUENCE) 
-          fprintf(fp,"sizeof(%s) + sizeof(%s) * seqlength_%d",
-              uintOutputTypes[td->size], getTypeStr(td), ++seqCount);
-      	else if(td->type==STRING) fprintf(fp,"strlength_%d + 1", ++strCount);
-      	else if(td->type==ARRAY) 
-          fprintf(fp,"sizeof(%s) * %d", getTypeStr(td),td->size);
-      	if(structCount == 0) flag = 1;
+    fprintf(fp,"static inline void trace_%s_%s(",facName,ev->name);
+
+    args_empty = 1;
+
+    /* Does it support per trace tracing ? */
+    if(ev->per_trace) {
+      fprintf(fp, "struct ltt_trace_struct *dest_trace");
+      args_empty = 0;
+    }
+    
+    /* Does it support per tracefile tracing ? */
+    if(ev->per_tracefile) {
+      if(!args_empty) fprintf(fp, ", ");
+      fprintf(fp, "unsigned int tracefile_index");
+      args_empty = 0;
+    }
+
+    if(ev->type != 0) {
+      for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
+        fld  = (field_t *)ev->type->fields.array[pos1];
+        td = fld->type;
+        if(!args_empty) fprintf(fp, ", ");
+        if(td->type == ARRAY ){
+          fprintf(fp,"%s * %s",getTypeStr(td), fld->name);
+          args_empty = 0;
+        }else if(td->type == STRING){
+          fprintf(fp,"short int strlength_%d, %s * %s",
+              ++strCount, getTypeStr(td), fld->name);
+          args_empty = 0;
+        }else if(td->type == SEQUENCE){
+          fprintf(fp,"%s seqlength_%d, %s * %s",
+              uintOutputTypes[td->size], ++seqCount,getTypeStr(td), fld->name);
+          args_empty = 0;
+        }else {
+          fprintf(fp,"%s %s",getTypeStr(td), fld->name);     
+          args_empty = 0;
+        }
       }
     }
-    fprintf(fp,";\n");
+    if(args_empty) fprintf(fp, "void");
 
+    fprintf(fp,")\n{\n");
+	
     //allocate buffer
     // MD no more need. fprintf(fp,"\tchar buff[buflength];\n");
     // write directly to the channel
     fprintf(fp, "\tunsigned int index;\n");
     fprintf(fp, "\tstruct ltt_channel_struct *channel;\n");
     fprintf(fp, "\tstruct ltt_trace_struct *trace;\n");
-    fprintf(fp, "\tunsigned long flags;\n");
-    fprintf(fp, "\tstruct %s_%s_1* __1;\n\n", ev->name, facName);
+    fprintf(fp, "\tunsigned long _flags;\n");
+    fprintf(fp, "\tvoid *buff;\n");
+    fprintf(fp, "\tunsigned old_offset;\n");
+    fprintf(fp, "\tunsigned int header_length;\n");
+    fprintf(fp, "\tunsigned int event_length;\n");	// total size (incl hdr)
+		fprintf(fp, "\tunsigned int length;\n");	// Size of the event var data.
+    fprintf(fp, "\tunsigned char _offset;\n");
+		fprintf(fp, "\tstruct rchan_buf *buf;\n");
+		fprintf(fp, "\tstruct timeval delta;\n");
+		fprintf(fp, "\tu64 tsc;\n");
+		fprintf(fp, "\tchar *ptr;\n");
+
+		if(ev->type != 0)
+      fprintf(fp, "\tstruct %s_%s_1* __1;\n\n", ev->name, facName);
+
+		/* Warning : this is done prior to taking locks : 
+		 * setting this value must be done at the end of the trace activation.
+		 * (we don't care for trace removal, as the list of traces is protected : it
+		 * just won't iterate on any trace). */
+    fprintf(fp,
+        "\tif(ltt_traces.num_active_traces == 0) return;\n\n");
 
-		fprintf(fp, "\tread_lock(&ltt_traces.traces_rwlock, flags);\n");
+    fprintf(fp, "\t/* Disable interrupts. */\n");
+    fprintf(fp, "\tlocal_irq_save(_flags);\n");
+    fprintf(fp, "\tpreempt_disable();\n\n");
 
-    fprintf(fp, 
+		fprintf(fp, "\tltt_nesting[smp_processor_id()]++;\n");
+		fprintf(fp, "\tbarrier();\n");
+		fprintf(fp, "\tif(ltt_nesting[smp_processor_id()] > 1) goto unlock;\n");
+    fprintf(fp, "\tspin_lock(&ltt_traces.locks[smp_processor_id()]);\n\n");
+		
+    if(ev->per_tracefile) {
+      fprintf(fp, "\tindex = tracefile_index;\n");
+    } else {
+      fprintf(fp, 
         "\tindex = ltt_get_index_from_facility(ltt_facility_%s_%X,\n"\
-						"\t\t\t\t%s);\n",
+            "\t\t\t\tevent_%s);\n",
         facName, checksum, ev->name);
+    }
     fprintf(fp,"\n");
 
-    fprintf(fp, "\t/* Disable interrupts. */\n");
-    fprintf(fp, "\tlocal_irq_save(flags);\n");
-
+    /* For each trace */
     fprintf(fp, "\tlist_for_each_entry(trace, &ltt_traces.head, list) {\n");
-    
-		fprintf(fp, "\t\tunsigned int header_length = "
-								"ltt_get_event_header_size(trace);\n");
-		fprintf(fp, "\t\tunsigned int event_length = header_length + length;\n");
+    fprintf(fp, "\t\tif(!trace->active) continue;\n\n");
+
+    if(ev->per_trace) {
+      fprintf(fp, "\t\tif(dest_trace != trace) continue;\n\n");
+    }
+     //length of buffer : length of all structures
+ //   if(ev->type == 0) fprintf(fp, "0");
    
-    /* Reserve the channel */
     fprintf(fp, "\t\tchannel = ltt_get_channel_from_index(trace, index);\n");
-    fprintf(fp,
-				"\t\tvoid *buff = relay_reserve(channel->rchan, event_length);\n");
-		fprintf(fp, "\t\tif(buff == NULL) {\n");
-		fprintf(fp, "\t\t\t/* Buffer is full*/\n");
-		fprintf(fp, "\t\t\tchannel->events_lost++;\n");
-		fprintf(fp, "\t\t\tgoto commit_work;\n");
-		fprintf(fp, "\t\t}\n");
-
-		/* Write the header */
+		fprintf(fp, "\t\tbuf = channel->rchan->buf[smp_processor_id()];\n");
+		fprintf(fp, "\n");
+		/* Warning : not atomic reservation : event size depends on the current
+		 * address for alignment */
+		/* NOTE : using cmpxchg in reserve with repeat for atomicity */
+    // Replaces _offset
+		/* NOTE2 : as the read old address from memory must come before any
+		 * protected event, let's add a memory barrier() to make sure the compiler
+		 * will not reorder this read. */
+		fprintf(fp, "\t\tdo {\n");
+		fprintf(fp, "\t\t\told_offset = buf->offset;\n");
+		fprintf(fp, "\t\t\tbarrier();\n");
+    fprintf(fp, "\t\t\tptr = (char*)buf->data + old_offset;\n");
+
+
+    fprintf(fp, "\t\t\theader_length = ltt_get_event_header_data(trace, "
+																																"channel,\n"
+								"\t\t\t\t\t\t\t\t\t\tptr, &_offset, &delta, &tsc);\n");
+
+    fprintf(fp, "\t\t\tptr += _offset + header_length;\n");
+
+    for(pos1=0;pos1<structCount;pos1++){
+
+			unsigned align = max(alignment, ev->type->alignment);
+      if(align > 1) {
+        fprintf(fp,"\t\t\tptr += (%u - ((unsigned int)ptr&(%u-1)))&(%u-1) ;\n",
+            align, align, align);
+      }
+      fprintf(fp,"\t\t\tptr += sizeof(struct %s_%s_%d);\n",ev->name,
+          facName,pos1+1);
+//      if(pos1 != structCount-1) fprintf(fp," + ");
+    }
+
+    //length of buffer : length of all arrays, sequences and strings
+    seqCount = 0;
+    strCount = 0;
+    flag = 0;
+		if(ev->type != 0)
+			for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
+				fld  = (field_t *)ev->type->fields.array[pos1];
+				td = fld->type;
+				if(td->type == SEQUENCE || td->type==STRING || td->type==ARRAY){
+					if(td->type == SEQUENCE) {
+
+						unsigned align = max(alignment, td->alignment);
+						if(align > 1) {
+							fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+											align, align, align);
+						}
+						fprintf(fp,"\t\tptr += sizeof(%s);\n",uintOutputTypes[td->size]);
+						if(align > 1) {
+							fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+											align, align, align);
+						}
+						fprintf(fp,"\t\tptr += sizeof(%s) * seqlength_%d;\n\n",
+							getTypeStr(td), seqCount);
+
+          } else if(td->type==STRING) {
+						unsigned align = max(alignment, td->alignment);
+            if(align > 1) {
+              fprintf(fp,"\t\t\tptr += (%u - ((unsigned int)ptr&(%u-1)))&(%u-1)) ;\n",
+                 align, align, align);
+            }
+            fprintf(fp,"ptr += strlength_%d + 1;\n",
+                                                ++strCount);
+          }
+					else if(td->type==ARRAY) {
+						unsigned align = max(alignment, td->alignment);
+            if(align > 1) {
+              fprintf(fp,"\t\t\tptr += (%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+                 align, align, align);
+            }
+						fprintf(fp,"\t\t\tptr += sizeof(%s) * %d;\n",
+                getTypeStr(td),td->size);
+					if(structCount == 0) flag = 1;
+          }
+				}
+			}
+    fprintf(fp, "\t\t\tevent_length = (unsigned long)ptr -"
+				"(unsigned long)(buf->data + old_offset);\n");
+		
+		/* let's put some protection before the cmpxchg : the space reservation and
+		 * the get TSC are not dependant from each other. I don't want the compiler
+		 * to reorder those in the wrong order. And relay_reserve is inline, so
+		 * _yes_, the compiler could mess it up. */
+		fprintf(fp, "\t\t\tbarrier();\n");
+		fprintf(fp, "\t\t\tbuff = relay_reserve(channel->rchan, event_length, "
+												"old_offset);\n");
 		fprintf(fp, "\n");
-    fprintf(fp, "\t\tltt_write_event_header(channel, buff, \n"
-								"\t\t\t\tltt_facility_%s_%X, %s, length);\n",
-								facName, checksum, ev->name);
+ 		fprintf(fp, "\t\t} while(PTR_ERR(buff) == -EAGAIN);\n");
 		fprintf(fp, "\n");
+
+  
+    /* Reserve the channel */
+    //fprintf(fp, "\t\tbuff = relay_reserve(channel->rchan, event_length);\n");
+    fprintf(fp, "\t\tif(buff == NULL) {\n");
+    fprintf(fp, "\t\t\t/* Buffer is full*/\n");
+    fprintf(fp, "\t\t\t/* for debug BUG(); */\n"); // DEBUG!
+    fprintf(fp, "\t\t\tchannel->events_lost[smp_processor_id()]++;\n");
+    fprintf(fp, "\t\t\tbreak;\n");	 /* don't commit a NULL reservation! */
+    fprintf(fp, "\t\t}\n");
 		
+		/* DEBUG */
+    //fprintf(fp, "\t\tif(resret == 1) {\n");
+		//fprintf(fp, "printk(\"f%%lu e\%%u \", ltt_facility_%s_%X, event_%s);",
+		//		facName, checksum, ev->name);
+    //fprintf(fp, "\t\t}\n");
+
+    /* Write the header */
+    fprintf(fp, "\n");
+		fprintf(fp,"\t\tlength = event_length - _offset - header_length;\n");
+    fprintf(fp, "\n");
+    fprintf(fp, "\t\tltt_write_event_header(trace, channel, buff, \n"
+                "\t\t\t\tltt_facility_%s_%X, event_%s, length, _offset,\n"
+								"\t\t\t\t&delta, &tsc);\n",
+                facName, checksum, ev->name);
+    fprintf(fp, "\n");
+
+    if(ev->type != 0)
+      fprintf(fp, "\t\tptr = (char*)buff + _offset + header_length;\n");
+
+    //copy struct, sequence and string to buffer
+    //FIXME : they always come before the structs.
+    seqCount = 0;
+    strCount = 0;
+    flag = 0;
+    structCount = 0;
+		if(ev->type != 0)
+			for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
+				fld  = (field_t *)ev->type->fields.array[pos1];
+				td = fld->type;
+	//      if(td->type != STRING && td->type != SEQUENCE && td->type != ARRAY){
+	//        if(flag == 0) structCount++;  
+	//        flag++;  
+	//        if((structCount > 1 || whichTypeFirst == 2) && flag == 1){
+	//          assert(0); // MD : disabled !
+	//          fprintf(fp,"\t//copy struct to buffer\n");
+	//          fprintf(fp,"\tmemcpy(ptr, &__%d, sizeof(struct %s_%s_%d));\n",
+	//              structCount, ev->name, facName,structCount);
+	//          fprintf(fp,"\tptr +=  sizeof(struct %s_%s_%d);\n\n",
+	//              ev->name, facName,structCount);
+	//        }
+	 //     }
+				//else if(td->type == SEQUENCE){
+				if(td->type == SEQUENCE){
+					flag = 0;
+					fprintf(fp,"\t\t//copy sequence length and sequence to buffer\n");
+
+					unsigned align = max(alignment, td->alignment);
+          if(align > 1) {
+            fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+                    align, align, align);
+          }
+					fprintf(fp,"\t\t*ptr = seqlength_%d;\n",++seqCount);
+					fprintf(fp,"\t\tptr += sizeof(%s);\n",uintOutputTypes[td->size]);
+          if(align > 1) {
+            fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+                    align, align, align);
+          }
+					fprintf(fp,"\t\tmemcpy(ptr, %s, sizeof(%s) * seqlength_%d);\n",
+						fld->name, getTypeStr(td), seqCount);
+					fprintf(fp,"\t\tptr += sizeof(%s) * seqlength_%d;\n\n",
+						getTypeStr(td), seqCount);
+				}
+				else if(td->type==STRING){
+					flag = 0;
+					fprintf(fp,"\t\t//copy string to buffer\n");
+					fprintf(fp,"\t\tif(strlength_%d > 0){\n",++strCount);
+					unsigned align = max(alignment, td->alignment);
+          if(align > 1) {
+            fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+                    align, align, align);
+          }
+					fprintf(fp,"\t\t\tmemcpy(ptr, %s, strlength_%d + 1);\n",
+							fld->name, strCount);
+					fprintf(fp,"\t\t\tptr += strlength_%d + 1;\n",strCount);
+					fprintf(fp,"\t\t}else{\n");
+					fprintf(fp,"\t\t\t*ptr = '\\0';\n");
+					fprintf(fp,"\t\t\tptr += 1;\n");
+					fprintf(fp,"\t\t}\n\n");
+				}else if(td->type==ARRAY){
+					flag = 0;
+					fprintf(fp,"\t//copy array to buffer\n");
+					unsigned align = max(alignment, td->alignment);
+          if(align > 1) {
+            fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+                    align, align, align);
+          }
+					fprintf(fp,"\tmemcpy(ptr, %s, sizeof(%s) * %d);\n",
+							fld->name, getTypeStr(td), td->size);
+					fprintf(fp,"\tptr += sizeof(%s) * %d;\n\n", getTypeStr(td), td->size);
+				}      
+			}
+    if(structCount + seqCount > 1) fprintf(fp,"\n");
+
+
+
+
     //declare a char pointer if needed : starts at the end of the structs.
-    if(structCount + hasStrSeq > 1) {
-      fprintf(fp,"\t\tchar * ptr = (char*)buff + header_length");
-      for(pos1=0;pos1<structCount;pos1++){
-        fprintf(fp," + sizeof(struct %s_%s_%d)",ev->name, facName,pos1+1);
-      }
-      if(structCount + hasStrSeq > 1) fprintf(fp,";\n");
-    }
+    //if(structCount + hasStrSeq > 1) {
+    //  fprintf(fp,"\t\tchar * ptr = (char*)buff + header_length");
+    //  for(pos1=0;pos1<structCount;pos1++){
+    //    fprintf(fp," + sizeof(struct %s_%s_%d)",ev->name, facName,pos1+1);
+    //  }
+    //  if(structCount + hasStrSeq > 1) fprintf(fp,";\n");
+    //}
 
     // Declare an alias pointer of the struct type to the beginning
     // of the reserved area, just after the event header.
-    fprintf(fp, "\t\t__1 = (struct %s_%s_1 *)(buff + header_length);\n",
-				ev->name, facName);
+    if(ev->type != 0) {
+			unsigned align = max(alignment, td->alignment);
+      if(align > 1) {
+        fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+              align, align, align);
+      }
+    
+      fprintf(fp, "\t\t__1 = (struct %s_%s_1 *)(ptr);\n",
+          ev->name, facName);
+    }
     //allocate memory for new struct and initialize it
     //if(whichTypeFirst == 1){ //struct first
-      //for(pos1=0;pos1<structCount;pos1++){	
-      //	if(pos1==0) fprintf(fp,
+      //for(pos1=0;pos1<structCount;pos1++){  
+      //  if(pos1==0) fprintf(fp,
       //      "\tstruct %s_%s_1 * __1 = (struct %s_%s_1 *)buff;\n",
       //      ev->name, facName,ev->name, facName);
   //MD disabled      else fprintf(fp,
@@ -486,7 +823,7 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){
       //}      
     //}else if(whichTypeFirst == 2){
      // for(pos1=0;pos1<structCount;pos1++)
-     // 	fprintf(fp,"\tstruct %s_%s_%d  __%d;\n",
+     //   fprintf(fp,"\tstruct %s_%s_%d  __%d;\n",
      //       ev->name, facName,pos1+1,pos1+1);
     //}
     fprintf(fp,"\n");
@@ -494,102 +831,61 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){
     if(structCount) fprintf(fp,"\t\t//initialize structs\n");
     //flag = 0;
     //structCount = 0;
-    for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
-      fld  = (field *)ev->type->fields.array[pos1];
-      td = fld->type;
-      if(td->type != ARRAY && td->type != SEQUENCE && td->type != STRING){
-      	//if(flag == 0){
-      	//  flag = 1;	
-      	//  structCount++;
-      	//  if(structCount > 1) fprintf(fp,"\n");
-      	//}
-        fprintf(fp, "\t\t__1->%s = %s;\n", fld->name, fld->name );
-
-	    //if(structCount == 1 && whichTypeFirst == 1)
-      //  fprintf(fp, "\t__1->%s =  %s;\n",fld->name,fld->name );
-    	//else 
-      //  fprintf(fp, "\t__%d.%s =  %s;\n",structCount ,fld->name,fld->name);
-      }
-      //else flag = 0;
-    }
-   // if(structCount) fprintf(fp,"\n");
+		if(ev->type != 0)
+			for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
+				fld  = (field_t *)ev->type->fields.array[pos1];
+				td = fld->type;
+				if(td->type != ARRAY && td->type != SEQUENCE && td->type != STRING){
+					//if(flag == 0){
+					//  flag = 1;  
+					//  structCount++;
+					//  if(structCount > 1) fprintf(fp,"\n");
+					//}
+					fprintf(fp, "\t\t__1->%s = %s;\n", fld->name, fld->name );
+
+				//if(structCount == 1 && whichTypeFirst == 1)
+				//  fprintf(fp, "\t__1->%s =  %s;\n",fld->name,fld->name );
+				//else 
+				//  fprintf(fp, "\t__%d.%s =  %s;\n",structCount ,fld->name,fld->name);
+				}
+				//else flag = 0;
+			}
+    if(structCount) fprintf(fp,"\n");
     //set ptr to the end of first struct if needed;
-    //if(whichTypeFirst == 1 && structCount + hasStrSeq > 1){
-    //  fprintf(fp,"\n\t//set ptr to the end of the first struct\n");
-    //  fprintf(fp,"\tptr +=  sizeof(struct %s_%s_1);\n\n",ev->name, facName);
-   // }
-
-    //copy struct, sequence and string to buffer
-    seqCount = 0;
-    strCount = 0;
-    flag = 0;
-    structCount = 0;
-    for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){
-      fld  = (field *)ev->type->fields.array[pos1];
-      td = fld->type;
-//      if(td->type != STRING && td->type != SEQUENCE && td->type != ARRAY){
-//				if(flag == 0) structCount++;	
-//				flag++;	
-//				if((structCount > 1 || whichTypeFirst == 2) && flag == 1){
-//				  assert(0); // MD : disabled !
-//				  fprintf(fp,"\t//copy struct to buffer\n");
-//				  fprintf(fp,"\tmemcpy(ptr, &__%d, sizeof(struct %s_%s_%d));\n",
-//							structCount, ev->name, facName,structCount);
-//				  fprintf(fp,"\tptr +=  sizeof(struct %s_%s_%d);\n\n",
-//							ev->name, facName,structCount);
-//				}
- //     }
-			//else if(td->type == SEQUENCE){
-			if(td->type == SEQUENCE){
-      	flag = 0;
-      	fprintf(fp,"\t\t//copy sequence length and sequence to buffer\n");
-	      fprintf(fp,"\t\t*ptr = seqlength_%d;\n",++seqCount);
-  	    fprintf(fp,"\t\tptr += sizeof(%s);\n",uintOutputTypes[td->size]);
-    	  fprintf(fp,"\t\tmemcpy(ptr, %s, sizeof(%s) * seqlength_%d);\n",
-          fld->name, getTypeStr(td), seqCount);
-     	  fprintf(fp,"\t\tptr += sizeof(%s) * seqlength_%d;\n\n",
-          getTypeStr(td), seqCount);
-      }
-      else if(td->type==STRING){
-        flag = 0;
-        fprintf(fp,"\t\t//copy string to buffer\n");
-        fprintf(fp,"\t\tif(strlength_%d > 0){\n",++strCount);
-        fprintf(fp,"\t\t\tmemcpy(ptr, %s, strlength_%d + 1);\n",
-            fld->name, strCount);
-        fprintf(fp,"\t\t\tptr += strlength_%d + 1;\n",strCount);
-        fprintf(fp,"\t\t}else{\n");
-        fprintf(fp,"\t\t\t*ptr = '\\0';\n");
-        fprintf(fp,"\t\t\tptr += 1;\n");
-        fprintf(fp,"\t\t}\n\n");
-      }else if(td->type==ARRAY){
-        flag = 0;
-        fprintf(fp,"\t//copy array to buffer\n");
-        fprintf(fp,"\tmemcpy(ptr, %s, sizeof(%s) * %d);\n",
-            fld->name, getTypeStr(td), td->size);
-        fprintf(fp,"\tptr += sizeof(%s) * %d;\n\n", getTypeStr(td), td->size);
-      }      
-    }    
-    if(structCount + seqCount > 1) fprintf(fp,"\n");
+    //if(structCount + hasStrSeq > 1){
+    //  fprintf(fp,"\n\t\t//set ptr to the end of the first struct\n");
+    //  fprintf(fp,"\t\tptr +=  sizeof(struct %s_%s_1);\n\n",ev->name, facName);
+    //}
 
-    fprintf(fp,"\n");
-    fprintf(fp,"commit_work:\n");
     fprintf(fp,"\n");
     fprintf(fp, "\t\t/* Commit the work */\n");
-    fprintf(fp, "\t\trelay_commit(channel->rchan, buff, event_length);\n");
+    fprintf(fp, "\t\trelay_commit(channel->rchan->buf[smp_processor_id()],\n"
+        "\t\t\t\tbuff, event_length);\n");
+    fprintf(fp, "\t\tltt_write_commit_counter("
+				"channel->rchan->buf[smp_processor_id()],\n"
+        "\t\t\t\tbuff);\n");
 
    /* End of traces iteration */
     fprintf(fp, "\t}\n\n");
 
-    fprintf(fp, "\t/* Re-enable interrupts */\n");
-    fprintf(fp, "\tlocal_irq_restore(flags);\n");
-    fprintf(fp, "\tpreempt_check_resched();\n");
+    fprintf(fp, "\n");
+		// The generated preempt_check_resched is not dangerous because
+		// interrupts are disabled.
+    fprintf(fp, "\tspin_unlock(&ltt_traces.locks[smp_processor_id()]);\n");
 
+    fprintf(fp, "unlock:\n");
+		fprintf(fp, "\tbarrier();\n");
+		fprintf(fp, "\tltt_nesting[smp_processor_id()]--;\n");
+    fprintf(fp, "\t/* Re-enable interrupts */\n");
+    fprintf(fp, "\tlocal_irq_restore(_flags);\n");
+    fprintf(fp, "\tpreempt_enable_no_resched();\n");
+    //fprintf(fp, "\tpreempt_check_resched();\n");
     
-    fprintf(fp, "\tread_unlock(&ltt_traces.traces_rwlock);\n");
     //call trace function
     //fprintf(fp,"\n\t//call trace function\n");
     //fprintf(fp,"\tltt_log_event(ltt_facility_%s_%X, %s, bufLength, buff);\n",facName,checksum,ev->name);
-    fprintf(fp,"};\n\n\n");
+    fprintf(fp,"}\n");
+		fprintf(fp, "#endif //CONFIG_LTT\n\n");
   }
 
 }
@@ -602,8 +898,8 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){
  *Return Values
  *    char *            : type string
  ****************************************************************************/
-char * getTypeStr(type_descriptor * td){
-  type_descriptor * t ;
+char * getTypeStr(type_descriptor_t * td){
+  type_descriptor_t * t ;
 
   switch(td->type){
     case INT:
@@ -625,7 +921,7 @@ char * getTypeStr(type_descriptor * td){
     case FLOAT:
       return floatOutputTypes[td->size];
     case STRING:
-      return "char";
+      return "const char";
     case ENUM:
       return uintOutputTypes[td->size];
     case ARRAY:
@@ -633,9 +929,9 @@ char * getTypeStr(type_descriptor * td){
       t = td->nested_type;
       switch(t->type){
         case INT:
-      	  return intOutputTypes[t->size];
+          return intOutputTypes[t->size];
         case UINT:
-      	  return uintOutputTypes[t->size];
+          return uintOutputTypes[t->size];
         case POINTER:
           return "void *";
         case LONG:
@@ -649,14 +945,14 @@ char * getTypeStr(type_descriptor * td){
         case OFF_T:
           return "off_t";
         case FLOAT:
-	        return floatOutputTypes[t->size];
+          return floatOutputTypes[t->size];
         case STRING:
-      	  return "char";
+          return "const char";
         case ENUM:
-      	  return uintOutputTypes[t->size];
+          return uintOutputTypes[t->size];
         default :
-      	  error_callback(NULL,"Nested struct is not supportted");
-      	  break;	
+          error_callback(NULL,"Nested struct is not supportted");
+          break;  
       }
       break;
     case STRUCT: //for now we do not support nested struct
@@ -679,23 +975,111 @@ char * getTypeStr(type_descriptor * td){
  *    checksum          : checksum for the facility
  ****************************************************************************/
 void generateLoaderfile(FILE * fp, char * facName, int nbEvent, unsigned long checksum, char *capname){
-	fprintf(fp, "#ifndef _LTT_FACILITY_LOADER_%s_H_\n",capname);
-	fprintf(fp, "#define _LTT_FACILITY_LOADER_%s_H_\n\n",capname);
+  fprintf(fp, "#ifndef _LTT_FACILITY_LOADER_%s_H_\n",capname);
+  fprintf(fp, "#define _LTT_FACILITY_LOADER_%s_H_\n\n",capname);
   fprintf(fp,"#include <linux/ltt-facilities.h>\n", facName, checksum);
-  fprintf(fp,"#include <linux/module.h>\n\n", facName, checksum);
   fprintf(fp,"ltt_facility_t\tltt_facility_%s;\n", facName, checksum);
   fprintf(fp,"ltt_facility_t\tltt_facility_%s_%X;\n\n", facName, checksum);
 
-  fprintf(fp,"EXPORT_SYMBOL(ltt_facility_%s);\n\n",facName, checksum);
-  fprintf(fp,"EXPORT_SYMBOL(ltt_facility_%s_%X);\n\n",facName, checksum);
-  fprintf(fp,"#define LTT_FACILITY_SYMBOL\t\t\t\tltt_facility_%s\n",
+  fprintf(fp,"#define LTT_FACILITY_SYMBOL\t\t\t\t\t\t\tltt_facility_%s\n",
       facName);
-  fprintf(fp,"#define LTT_FACILITY_CHECKSUM_SYMBOL\t\t\t\tltt_facility_%s_%X\n",
+  fprintf(fp,"#define LTT_FACILITY_CHECKSUM_SYMBOL\t\tltt_facility_%s_%X\n",
       facName, checksum);
-  fprintf(fp,"#define LTT_FACILITY_CHECKSUM\t\t\t0x%X\n", checksum);
-  fprintf(fp,"#define LTT_FACILITY_NAME\t\t\t\t\t\"%s\"\n", facName);
-  fprintf(fp,"#define LTT_FACILITY_NUM_EVENTS\t\t%d\n\n", nbEvent);
-	fprintf(fp, "#endif //_LTT_FACILITY_LOADER_%s_H_\n",capname);
+  fprintf(fp,"#define LTT_FACILITY_CHECKSUM\t\t\t\t\t\t0x%X\n", checksum);
+  fprintf(fp,"#define LTT_FACILITY_NAME\t\t\t\t\t\t\t\t\"%s\"\n", facName);
+  fprintf(fp,"#define LTT_FACILITY_NUM_EVENTS\t\t\t\t\t%d\n\n", nbEvent);
+  fprintf(fp, "#endif //_LTT_FACILITY_LOADER_%s_H_\n",capname);
+}
+
+void generateCfile(FILE * fp, char * filefacname){
+
+  fprintf(fp, "/*\n");
+  fprintf(fp, " * ltt-facility-loader-%s.c\n", filefacname);
+  fprintf(fp, " *\n");
+  fprintf(fp, " * (C) Copyright  2005 - \n");
+  fprintf(fp, " *          Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca)\n");
+  fprintf(fp, " *\n");
+  fprintf(fp, " * Contains the LTT facility loader.\n");
+  fprintf(fp, " *\n");
+  fprintf(fp, " */\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "#include <linux/ltt-facilities.h>\n");
+  fprintf(fp, "#include <linux/module.h>\n");
+  fprintf(fp, "#include <linux/init.h>\n");
+  fprintf(fp, "#include <linux/config.h>\n");
+  fprintf(fp, "#include \"ltt-facility-loader-%s.h\"\n", filefacname);
+  fprintf(fp, "\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "#ifdef CONFIG_LTT\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "EXPORT_SYMBOL(LTT_FACILITY_SYMBOL);\n");
+  fprintf(fp, "EXPORT_SYMBOL(LTT_FACILITY_CHECKSUM_SYMBOL);\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "static const char ltt_facility_name[] = LTT_FACILITY_NAME;\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "#define SYMBOL_STRING(sym) #sym\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "static struct ltt_facility facility = {\n");
+  fprintf(fp, "\t.name = ltt_facility_name,\n");
+  fprintf(fp, "\t.num_events = LTT_FACILITY_NUM_EVENTS,\n");
+  fprintf(fp, "\t.checksum = LTT_FACILITY_CHECKSUM,\n");
+  fprintf(fp, "\t.symbol = SYMBOL_STRING(LTT_FACILITY_SYMBOL),\n");
+  fprintf(fp, "\t.alignment = %u\n", alignment);	/* default alignment */
+  fprintf(fp, "};\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "#ifndef MODULE\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "/* Built-in facility. */\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "static int __init facility_init(void)\n");
+  fprintf(fp, "{\n");
+  fprintf(fp, "\tprintk(KERN_INFO \"LTT : ltt-facility-%s init in kernel\\n\");\n", filefacname);
+  fprintf(fp, "\n");
+  fprintf(fp, "\tLTT_FACILITY_SYMBOL = ltt_facility_builtin_register(&facility);\n");
+  fprintf(fp, "\tLTT_FACILITY_CHECKSUM_SYMBOL = LTT_FACILITY_SYMBOL;\n");
+  fprintf(fp, "\t\n");
+  fprintf(fp, "\treturn LTT_FACILITY_SYMBOL;\n");
+  fprintf(fp, "}\n");
+  fprintf(fp, "__initcall(facility_init);\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "#else \n");
+  fprintf(fp, "\n");
+  fprintf(fp, "/* Dynamic facility. */\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "static int __init facility_init(void)\n");
+  fprintf(fp, "{\n");
+  fprintf(fp, "\tprintk(KERN_INFO \"LTT : ltt-facility-%s init dynamic\\n\");\n", filefacname);
+  fprintf(fp, "\n");
+  fprintf(fp, "\tLTT_FACILITY_SYMBOL = ltt_facility_dynamic_register(&facility);\n");
+  fprintf(fp, "\tLTT_FACILITY_SYMBOL_CHECKSUM = LTT_FACILITY_SYMBOL;\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "\treturn LTT_FACILITY_SYMBOL;\n");
+  fprintf(fp, "}\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "static void __exit facility_exit(void)\n");
+  fprintf(fp, "{\n");
+  fprintf(fp, "\tint err;\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "\terr = ltt_facility_dynamic_unregister(LTT_FACILITY_SYMBOL);\n");
+  fprintf(fp, "\tif(err != 0)\n");
+  fprintf(fp, "\t\tprintk(KERN_ERR \"LTT : Error in unregistering facility.\\n\");\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "}\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "module_init(facility_init)\n");
+  fprintf(fp, "module_exit(facility_exit)\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "MODULE_LICENSE(\"GPL\");\n");
+  fprintf(fp, "MODULE_AUTHOR(\"Mathieu Desnoyers\");\n");
+  fprintf(fp, "MODULE_DESCRIPTION(\"Linux Trace Toolkit Facility\");\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "#endif //MODULE\n");
+  fprintf(fp, "\n");
+  fprintf(fp, "#endif //CONFIG_LTT\n");
 }