xml 1.0

[lttv.git] / genevent-new / genevent.c

diff --git a/genevent-new/genevent.c b/genevent-new/genevent.c
index c62459c36572e9f6d4c7053fbf5762d1f1a3d2df..a478e03b0c308e3a703f9ad05d689708409f270e 100644 (file)
--- a/genevent-new/genevent.c
+++ b/genevent-new/genevent.c
@@ -1905,7 +1905,13 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
        fprintf(fd, "\n");
        
        print_tabs(1, fd);
-       fprintf(fd, "if(!trace) ltt_thread_init();\n");
+       fprintf(fd, "if(!trace) {\n");
+       print_tabs(2, fd);
+       fprintf(fd, "ltt_thread_init();\n");
+       print_tabs(2, fd);
+       fprintf(fd, "trace = thread_trace_info;\n");
+       print_tabs(1, fd);
+       fprintf(fd, "}\n\n");
        fprintf(fd, "\n");
 
        /* Calculate event variable len + event data alignment offset.
@@ -2111,7 +2117,7 @@ void print_log_header_head_user(facility_t *fac, FILE *fd)
          fprintf(fd, "#include <asm/ltt/ltt-facility-id-%s_%s.h>\n",
                                fac->name,
                                fac->arch);
-  fprintf(fd, "#include <ltt/ltt-generic.h>\n");
+  fprintf(fd, "#include <ltt/ltt-usertrace.h>\n");
        fprintf(fd, "\n");
 }
 
@@ -2332,7 +2338,7 @@ int print_id_header(facility_t *fac)
                fprintf(fd, "#define _LTT_FACILITY_ID_%s_H_\n\n",fac->capname);
                fprintf(fd, "#ifdef LTT_TRACE\n");
 
-               fprintf(fd,"#include <ltt/ltt-generic.h>\n\n");
+               fprintf(fd,"#include <ltt/ltt-usertrace.h>\n\n");
 
                fprintf(fd,"/****  facility handle  ****/\n\n");
                fprintf(fd,"extern ltt_facility_t ltt_facility_%s_%X;\n",
@@ -2469,7 +2475,7 @@ int print_loader_header_user(facility_t *fac)
 
   fprintf(fd, "#ifndef _LTT_FACILITY_LOADER_%s_H_\n", fac->capname);
   fprintf(fd, "#define _LTT_FACILITY_LOADER_%s_H_\n\n", fac->capname);
-  fprintf(fd,"#include <ltt/ltt-generic.h>\n");
+  fprintf(fd,"#include <ltt/ltt-usertrace.h>\n");
        if(!fac->arch)
          fprintf(fd,"#include <ltt/ltt-facility-id-%s.h>\n\n",
                                fac->name);
@@ -2662,7 +2668,7 @@ int print_loader_c_user(facility_t *fac)
   fprintf(fd, "#define LTT_TRACE\n");
   fprintf(fd, "#include <error.h>\n");
   fprintf(fd, "#include <stdio.h>\n");
-  fprintf(fd, "#include <ltt/ltt-generic.h>\n");
+  fprintf(fd, "#include <ltt/ltt-usertrace.h>\n");
        if(!fac->arch)
        fprintf(fd, "#include \"ltt-facility-loader-%s.h\"\n", fac->name);
        else
@@ -2754,7 +2760,23 @@ facility_t *ltt_facility_open(char * pathname)
                
                if(strcmp(token, "<")) in.error(&in,"not a facility file");
                token = getName(&in);
+               if(strcmp(token, "?")) in.error(&in,"not a facility file");
+               token = getName(&in);
+               if(strcmp(token, "xml")) in.error(&in,"not a facility file");
+               token = getName(&in);
+               if(strcmp(token, "version")) in.error(&in,"not a facility file");
+               token = getName(&in);
+               if(strcmp(token, "=")) in.error(&in,"not a facility file");
+               token = getQuotedString(&in);
+               if(strcmp(token, "1.0")) in.error(&in,"not a facility file");
+               token = getName(&in);
+               if(strcmp(token, "?")) in.error(&in,"not a facility file");
+               token = getToken(&in);
+               if(strcmp(token, ">")) in.error(&in,"not a facility file");
 
+               token = getName(&in);
+               if(strcmp(token, "<")) in.error(&in,"not a facility file");
+               token = getName(&in);
                if(strcmp("facility",token) == 0) {
                        fac = malloc(sizeof(facility_t));
                        fac->name = NULL;