X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent%2Fparser.c;h=0ac6f5454da87294dc2f28f3714bb44bd35d5ac0;hb=c133f16bdc98a06211111f3365b525b67379199f;hp=1ab1b73bf7bf256ac23f468d95482c31584cfc33;hpb=79ae5becfad40935a543fa270d73fbfc77bd0c31;p=lttv.git diff --git a/genevent/parser.c b/genevent/parser.c index 1ab1b73b..0ac6f545 100644 --- a/genevent/parser.c +++ b/genevent/parser.c @@ -97,7 +97,7 @@ int getSizeindex(unsigned int value) unsigned long long int getSize(parse_file_t *in) { char *token, *token2; - unsigned long long int ret; + unsigned long long int ret; token = getToken(in); @@ -198,7 +198,7 @@ void getTypeAttributes(parse_file_t *in, type_descriptor_t *t, sequence_t * unnamed_types, table_t * named_types) { char * token; - char car; + int car; t->fmt = NULL; t->size = 0; @@ -263,13 +263,14 @@ void getTypeAttributes(parse_file_t *in, type_descriptor_t *t, void getEventAttributes(parse_file_t *in, event_t *ev) { char * token; - char car; + int car; ev->name = NULL; ev->per_trace = 0; ev->per_tracefile = 0; ev->param_buffer = 0; - ev->no_instrument_function = 0; + ev->no_instrument_function = 0; + ev->high_priority = 0; while(1) { token = getToken(in); @@ -285,28 +286,30 @@ void getEventAttributes(parse_file_t *in, event_t *ev) else if(car == '\"') ev->name = allocAndCopy(getQuotedString(in)); else ev->name = allocAndCopy(getName(in)); } else if(!strcmp("scope", token)) { - getEqual(in); - car = seekNextChar(in); - if(car == EOF) in->error(in,"scope was expected"); + 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"); + 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"); + 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; + if(!strcmp(token, "no_instrument_function")) + ev->no_instrument_function = 1; + else if(!strcmp(token, "high_priority")) + ev->high_priority = 1; } } } @@ -326,7 +329,7 @@ void getEventAttributes(parse_file_t *in, event_t *ev) void getFacilityAttributes(parse_file_t *in, facility_t *fac) { char * token; - char car; + int car; fac->name = NULL; fac->arch = NULL; @@ -371,7 +374,7 @@ void getFacilityAttributes(parse_file_t *in, facility_t *fac) void getFieldAttributes(parse_file_t *in, field_t *f) { char * token; - char car; + int car; f->name = NULL; @@ -396,7 +399,7 @@ char *getNameAttribute(parse_file_t *in) { char * token; char *name = NULL; - char car; + int car; while(1) { token = getToken(in); @@ -459,7 +462,8 @@ error: char * getDescription(parse_file_t *in) { long int pos; - char * token, car, *str; + char * token, *str; + int car; pos = ftell(in->fp); @@ -749,8 +753,10 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType, //getLAnglebracket(in); // /* subfield */ - f = (field_t *)memAlloc(sizeof(field_t)); - sequence_push(&(t->fields),f); + f = (field_t *)memAlloc(sizeof(field_t)); + + f->name = NULL; + sequence_push(&(t->fields),f); parseFields(in, f, unnamed_types, named_types, 0); //getLAnglebracket(in); // @@ -771,14 +777,16 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType, //getLAnglebracket(in); // /* subfield */ - f = (field_t *)memAlloc(sizeof(field_t)); - sequence_push(&(t->fields),f); + f = (field_t *)memAlloc(sizeof(field_t)); + f->name = NULL; + sequence_push(&(t->fields),f); parseFields(in, f, unnamed_types, named_types, 0); //getLAnglebracket(in); // /* subfield */ - f = (field_t *)memAlloc(sizeof(field_t)); - sequence_push(&(t->fields),f); + f = (field_t *)memAlloc(sizeof(field_t)); + f->name = NULL; + sequence_push(&(t->fields),f); parseFields(in, f, unnamed_types, named_types, 0); //getLAnglebracket(in); // @@ -837,7 +845,7 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType, str = allocAndCopy(getNameAttribute(in)); has_value = getValueAttribute(in, &loc_value); - sequence_push(&(t->labels),str); + sequence_push(&(t->labels),str); if(has_value) value = loc_value; else value++; @@ -993,7 +1001,7 @@ type_descriptor_t * find_named_type(char *name, table_t * named_types) { type_descriptor_t *t; - t = table_find(named_types,name); + t = (type_descriptor_t*)table_find(named_types,name); return t; } @@ -1127,9 +1135,9 @@ char * getEqual(parse_file_t *in) return token; } -char seekNextChar(parse_file_t *in) +int seekNextChar(parse_file_t *in) { - char car; + int car; while((car = getc(in->fp)) != EOF) { if(!isspace(car)){ ungetc(car,in->fp); @@ -1162,7 +1170,7 @@ void ungetToken(parse_file_t * in) char *getToken(parse_file_t * in) { FILE *fp = in->fp; - char car, car1; + int car, car1; int pos = 0, escaped; if(in->unget == 1) { @@ -1274,7 +1282,7 @@ char *getToken(parse_file_t * in) void skipComment(parse_file_t * in) { - char car; + int car; while((car = getc(in->fp)) != EOF) { if(car == '\n') in->lineno++; else if(car == '*') { @@ -1289,7 +1297,7 @@ void skipComment(parse_file_t * in) void skipEOL(parse_file_t * in) { - char car; + int car; while((car = getc(in->fp)) != EOF) { if(car == '\n') { ungetc(car,in->fp);