enhance .h

git-svn-id: http://ltt.polymtl.ca/svn@937 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/genevent/genevent.c b/genevent/genevent.c
index 7c21d9e6d3bdb2bb3ede8b5ef90d6cb56d8ae703..14bc6ddd720d2b061ba74ad26e64cf8e8d25e85d 100644 (file)
--- a/genevent/genevent.c
+++ b/genevent/genevent.c
@@ -45,7 +45,6 @@ This program is distributed in the hope that it will be useful,
 #include "parser.h"
 #include "genevent.h"
 
-
 /* Named types may be referenced from anywhere */
 
 facility * fac;
@@ -124,8 +123,8 @@ int main(int argc, char** argv)
  *    name         : name of event definition file
  ****************************************************************************/
 void generateFile(char *name){
-  char *cName, *hName, *tmp;
-  FILE * cFp, *hFp;
+  char *loadName, *hName, *tmp, *tmp2;
+  FILE * lFp, *hFp;
   int nbEvent;
   unsigned long checksum=0;
 
@@ -141,12 +140,18 @@ void generateFile(char *name){
   }else{
     tmp = name;
   }
-  
-  cName = appendString(tmp,".c");
-  hName = appendString(tmp,".h");
-  cFp = fopen(cName,"w");
-  if(!cFp){
-    printf("Cannot open the file : %s\n",cName);
+
+  loadName = appendString("ltt-facility-loader-", tmp);
+  tmp2 = appendString(loadName,".h");
+  free(loadName);
+  loadName = tmp2;
+  hName = appendString("ltt-facility-", tmp);
+  tmp2 = appendString(hName,".h");
+  free(hName);
+  hName = tmp2;
+  lFp = fopen(loadName,"w");
+  if(!lFp){
+    printf("Cannot open the file : %s\n",loadName);
     exit(1);
   }
 
@@ -156,7 +161,7 @@ void generateFile(char *name){
      exit(1);
   }
   
-  free(cName);
+  free(loadName);
   free(hName);
 
   generateChecksum(fac->name, &checksum, &(fac->events));
@@ -169,11 +174,14 @@ void generateFile(char *name){
   generateStructFunc(hFp, fac->name,checksum);
        fprintf(hFp, "#endif //_LTT_FACILITY_%s_H_\n",fac->capname);
 
-  /* generate .c file, calls to register the facility at init time */
-  generateCfile(cFp,fac->name,nbEvent,checksum);
+  /* generate .h file, calls to register the facility at init time */
+       fprintf(lFp, "#ifndef _LTT_FACILITY_LOADER_%s_H_\n",fac->capname);
+       fprintf(lFp, "#define _LTT_FACILITY_LOADER_%s_H_\n\n",fac->capname);
+  generateLoaderfile(lFp,fac->name,nbEvent,checksum);
+       fprintf(lFp, "#endif //_LTT_FACILITY_LOADER_%s_H_\n",fac->capname);
 
   fclose(hFp);
-  fclose(cFp);
+  fclose(lFp);
 }
 
 
@@ -564,30 +572,23 @@ char * getTypeStr(type_descriptor * td){
 
 /*****************************************************************************
  *Function name
- *    generateCfile     : generate a .c file 
+ *    generateLoaderfile: generate a facility loaded .h file 
  *Input Params
  *    fp                : file to be written to
  *    facName           : name of facility
  *    nbEvent           : number of events in the facility
  *    checksum          : checksum for the facility
  ****************************************************************************/
-void generateCfile(FILE * fp, char * facName, int nbEvent, unsigned long checksum){
+void generateLoaderfile(FILE * fp, char * facName, int nbEvent, unsigned long checksum){
   //will be removed later
-  fprintf(fp,"typedef unsigned int trace_facility_t;\n\n");
-
-  fprintf(fp,"static unsigned long checksum = %lu;\n\n",checksum);
-  fprintf(fp,"/* facility handle */\n");
-  fprintf(fp,"trace_facility_t facility_%s;\n\n",facName);
-
-  fprintf(fp,"static void __init facility_%s_init(){\n",facName);  
-  fprintf(fp,"\tfacility_%s =  trace_register_facility_by_checksum(\"%s\", checksum,%d);\n",facName,facName,nbEvent);
-  fprintf(fp,"}\n\n");
-
-  fprintf(fp,"static void __exit facility_%s_exit(){\n",facName);  
-  fprintf(fp,"}\n\n");
-
-  fprintf(fp,"module_init(facility_%s_init);\n",facName);
-  fprintf(fp,"module_exit(facility_%s_exit);\n",facName);  
+  fprintf(fp,"ltt_facility_t\tltt_facility_%s_%X;\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_%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);
 }
 
 

diff --git a/genevent/genevent.h b/genevent/genevent.h
index bea164a76600549b2936f38580c5da8624fa2401..991985fd1e27c6541566e4b9ecf6b2e0c602acf1 100644 (file)
--- a/genevent/genevent.h
+++ b/genevent/genevent.h
@@ -4,7 +4,7 @@ void generateHfile(FILE *);
 void generateTypeDefs(FILE *);
 void generateEnumEvent(FILE * fp,char * facName, int * nbEvent, unsigned long checksum);
 void generateStructFunc(FILE * fp, char * facName, unsigned long checksum);
-void generateCfile(FILE * fp, char * facName, int nbEvent, unsigned long checksum);
+void generateLoaderfile(FILE * fp, char * facName, int nbEvent, unsigned long checksum);
 void generateEnumDefinition(FILE * fp, type_descriptor * fHead);
 char * getTypeStr(type_descriptor * td);