From f389e59696ff04e30873bd1c615744e71ce1462f Mon Sep 17 00:00:00 2001 From: compudj Date: Fri, 10 Mar 2006 03:52:15 +0000 Subject: [PATCH] XML 1.0 git-svn-id: http://ltt.polymtl.ca/svn@1660 04897980-b3bd-0310-b5e0-8ef037075253 --- genevent-new/genevent.c | 24 ++++++-- genevent-new/parser.c | 133 ++++++++++++++++++++++++++-------------- 2 files changed, 106 insertions(+), 51 deletions(-) diff --git a/genevent-new/genevent.c b/genevent-new/genevent.c index 7408b7e5..a478e03b 100644 --- a/genevent-new/genevent.c +++ b/genevent-new/genevent.c @@ -2117,7 +2117,7 @@ void print_log_header_head_user(facility_t *fac, FILE *fd) fprintf(fd, "#include \n", fac->name, fac->arch); - fprintf(fd, "#include \n"); + fprintf(fd, "#include \n"); fprintf(fd, "\n"); } @@ -2338,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 \n\n"); + fprintf(fd,"#include \n\n"); fprintf(fd,"/**** facility handle ****/\n\n"); fprintf(fd,"extern ltt_facility_t ltt_facility_%s_%X;\n", @@ -2475,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 \n"); + fprintf(fd,"#include \n"); if(!fac->arch) fprintf(fd,"#include \n\n", fac->name); @@ -2668,7 +2668,7 @@ int print_loader_c_user(facility_t *fac) fprintf(fd, "#define LTT_TRACE\n"); fprintf(fd, "#include \n"); fprintf(fd, "#include \n"); - fprintf(fd, "#include \n"); + fprintf(fd, "#include \n"); if(!fac->arch) fprintf(fd, "#include \"ltt-facility-loader-%s.h\"\n", fac->name); else @@ -2760,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; diff --git a/genevent-new/parser.c b/genevent-new/parser.c index d76f13b7..3d454a6a 100644 --- a/genevent-new/parser.c +++ b/genevent-new/parser.c @@ -96,24 +96,28 @@ int getSizeindex(unsigned int value) unsigned long long int getSize(parse_file_t *in) { - char *token; - int has_quotes = 0; + char *token, *token2; unsigned long long int ret; token = getToken(in); - if(token[0] == '"') { - has_quotes = 1; - token = getToken(in); - } + + + if(in->type == QUOTEDSTRING) { + in->type = NUMBER; + token2 = token; + do { + if (!isdigit(*token2)) { + in->type = QUOTEDSTRING; + break; + } + } while (*(++token2) != '\0'); + } + if(in->type == NUMBER) { ret = strtoull(token, NULL, 0); } else { goto error; } - if(has_quotes) { - token = getToken(in); - if(token[0] != '"') goto error; - } return ret; error: @@ -194,6 +198,7 @@ void getTypeAttributes(parse_file_t *in, type_descriptor_t *t, sequence_t * unnamed_types, table_t * named_types) { char * token; + char car; t->fmt = NULL; t->size = 0; @@ -221,9 +226,25 @@ void getTypeAttributes(parse_file_t *in, type_descriptor_t *t, t->size = getSize(in); } else if(!strcmp("custom_write", token)) { t->custom_write = 1; - } else if(!strcmp("network", token)) { - t->network = 1; - } + } else if(!strcmp("byte_order",token)) { + getEqual(in); + car = seekNextChar(in); + if(car == EOF) in->error(in,"byte order was expected (network?)"); + else if(car == '\"') token = getQuotedString(in); + else token = getName(in); + if(!strcmp("network", token)) { + t->network = 1; + } else if(!strcmp("write",token)) { + getEqual(in); + car = seekNextChar(in); + if(car == EOF) in->error(in,"write type was expected (custom?)"); + else if(car == '\"') token = getQuotedString(in); + else token = getName(in); + if(!strcmp("custom", token)) + t->network = 1; + } + } + } } @@ -263,16 +284,30 @@ void getEventAttributes(parse_file_t *in, event_t *ev) if(car == EOF) in->error(in,"name was expected"); else if(car == '\"') ev->name = allocAndCopy(getQuotedString(in)); else ev->name = allocAndCopy(getName(in)); - } else if(!strcmp("per_trace", token)) { - ev->per_trace = 1; - } else if(!strcmp("per_tracefile", token)) { - ev->per_tracefile = 1; - } else if(!strcmp("param_buffer", token)) { - ev->param_buffer = 1; - } else if(!strcmp("no_instrument_function", token)) { - ev->no_instrument_function = 1; - } - + } else if(!strcmp("scope", token)) { + getEqual(in); + car = seekNextChar(in); + if(car == EOF) in->error(in,"scope was expected"); + else if(car == '\"') token = getQuotedString(in); + else token = getName(in); + if(!strcmp(token, "trace")) ev->per_trace = 1; + else if(!strcmp(token, "tracefile")) ev->per_tracefile = 1; + } else if(!strcmp("param", token)) { + getEqual(in); + car = seekNextChar(in); + if(car == EOF) in->error(in,"parameter type was expected"); + else if(car == '\"') token = getQuotedString(in); + else token = getName(in); + if(!strcmp(token, "buffer")) ev->param_buffer = 1; + } else if(!strcmp("attribute", token)) { + getEqual(in); + car = seekNextChar(in); + if(car == EOF) in->error(in,"attribute was expected"); + else if(car == '\"') token = getQuotedString(in); + else token = getName(in); + if(!strcmp(token, "no_instrument_function")) + ev->no_instrument_function = 1; + } } } @@ -383,38 +418,39 @@ char *getNameAttribute(parse_file_t *in) -//for