X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent-new%2Fparser.c;h=42c38c316a52e9101cb45a610a82305ff6db88ec;hb=dbe259499a8b8ff190cdec2a1b0990ef1de81cf4;hp=a2a07e212c054adaca1dea3b9e95152b6a3f91aa;hpb=a67cd958dd88555bd8f2352d8ecfe2bc678e9d6f;p=lttv.git diff --git a/genevent-new/parser.c b/genevent-new/parser.c index a2a07e21..42c38c31 100644 --- a/genevent-new/parser.c +++ b/genevent-new/parser.c @@ -3,14 +3,15 @@ parser.c: Generate helper declarations and functions to trace events from an event description file. -Copyright (C) 2002, Xianxiu Yang -Copyright (C) 2002, Michel Dagenais -This program is free software; you can redistribute it and/or modify + Copyright (C) 2005, Mathieu Desnoyers + Copyright (C) 2002, Xianxiu Yang + Copyright (C) 2002, Michel Dagenais + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License. + the Free Software Foundation; version 2 of the License. -This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -557,11 +558,6 @@ void parseFields(parse_file_t *in, field_t *f, getLAnglebracket(in); f->type = parseType(in,NULL, unnamed_types, named_types); - /* Those will be set later by preset_field_type_size */ - f->fixed_root = FIELD_UNKNOWN; - f->fixed_parent = FIELD_UNKNOWN; - f->fixed_size = FIELD_UNKNOWN; - if(tag) { getLAnglebracket(in); getForwardslash(in); @@ -664,7 +660,7 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType, getForwardslash(in); getRAnglebracket(in); // - getLAnglebracket(in); // + //getLAnglebracket(in); // /* subfield */ f = (field_t *)memAlloc(sizeof(field_t)); sequence_push(&(t->fields),f); @@ -686,13 +682,13 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType, //getForwardslash(in); getRAnglebracket(in); // - getLAnglebracket(in); // + //getLAnglebracket(in); // /* subfield */ f = (field_t *)memAlloc(sizeof(field_t)); sequence_push(&(t->fields),f); parseFields(in, f, unnamed_types, named_types, 0); - getLAnglebracket(in); // + //getLAnglebracket(in); // /* subfield */ f = (field_t *)memAlloc(sizeof(field_t)); sequence_push(&(t->fields),f); @@ -727,9 +723,12 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType, getRAnglebracket(in); // } else if(strcmp(token,"enum") == 0) { - char * str, *str1; + char * str; + int value = -1; + t->type = ENUM; sequence_init(&(t->labels)); + sequence_init(&(t->labels_values)); sequence_init(&(t->labels_description)); t->already_printed = 0; getTypeAttributes(in, t, unnamed_types, named_types); @@ -744,17 +743,18 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType, getLAnglebracket(in); token = getToken(in); //"label" or "/" while(strcmp("label",token) == 0){ + int *label_value = malloc(sizeof(int)); + str = allocAndCopy(getNameAttribute(in)); token = getValueStrAttribute(in); - if(token){ - str1 = appendString(str,"="); - free(str); - str = appendString(str1,token); - free(str1); - sequence_push(&(t->labels),str); - } - else - sequence_push(&(t->labels),str); + + sequence_push(&(t->labels),str); + + if(token) value = strtol(token, NULL, 0); + else value++; + + *label_value = value; + sequence_push(&(t->labels_values), label_value); getForwardslash(in); getRAnglebracket(in); @@ -905,16 +905,22 @@ type_descriptor_t * find_named_type(char *name, table_t * named_types) type_descriptor_t *t; t = table_find(named_types,name); - if(t == NULL) { - t = (type_descriptor_t *)memAlloc(sizeof(type_descriptor_t)); - t->type_name = allocAndCopy(name); - t->type = NONE; - t->fmt = NULL; - table_insert(named_types,t->type_name,t); - // table_insert(named_types,allocAndCopy(name),t); - } + return t; -} +} + +type_descriptor_t * create_named_type(char *name, table_t * named_types) +{ + type_descriptor_t *t; + + t = (type_descriptor_t *)memAlloc(sizeof(type_descriptor_t)); + t->type_name = allocAndCopy(name); + t->type = NONE; + t->fmt = NULL; + table_insert(named_types,t->type_name,t); + // table_insert(named_types,allocAndCopy(name),t); + return t; +} /***************************************************************************** *Function name @@ -933,7 +939,7 @@ void parseTypeDefinition(parse_file_t * in, sequence_t * unnamed_types, token = getNameAttribute(in); if(token == NULL) in->error(in, "Type has empty name"); - t = find_named_type(token, named_types); + t = create_named_type(token, named_types); if(t->type != NONE) in->error(in,"redefinition of named type"); getRAnglebracket(in); // @@ -1232,7 +1238,7 @@ void checkNamedTypesImplemented(table_t * named_types) ****************************************************************************/ void generateChecksum(char* facName, - unsigned long * checksum, sequence_t * events) + unsigned int * checksum, sequence_t * events) { unsigned long crc ; int pos; @@ -1336,12 +1342,12 @@ unsigned long getTypeChecksum(unsigned long aCrc, type_descriptor_t * type) flag = 1; break; case ARRAY: - sprintf(buf,"%llu", type->size); + sprintf(buf,"%zu", type->size); str = appendString("array ",buf); flag = 1; break; case SEQUENCE: - sprintf(buf,"%llu", type->size); + sprintf(buf,"%zu", type->size); str = appendString("sequence ",buf); flag = 1; break; @@ -1363,9 +1369,12 @@ unsigned long getTypeChecksum(unsigned long aCrc, type_descriptor_t * type) if(type->fmt) crc = partial_crc32(type->fmt,crc); - if(type->type == ARRAY || type->type == SEQUENCE){ - crc = getTypeChecksum(crc,type->nested_type); - }else if(type->type == STRUCT || type->type == UNION){ + if(type->type == ARRAY){ + crc = getTypeChecksum(crc,((field_t*)type->fields.array[0])->type); + } else if(type->type ==SEQUENCE) { + crc = getTypeChecksum(crc,((field_t*)type->fields.array[0])->type); + crc = getTypeChecksum(crc,((field_t*)type->fields.array[1])->type); + } else if(type->type == STRUCT || type->type == UNION){ for(pos =0; pos < type->fields.position; pos++){ fld = (field_t *) type->fields.array[pos]; crc = partial_crc32(fld->name,crc); @@ -1392,6 +1401,10 @@ void freeType(type_descriptor_t * tp) free(tp->labels.array[pos2]); } sequence_dispose(&(tp->labels)); + for(pos2 = 0; pos2 < tp->labels_values.position; pos2++) { + free(tp->labels_values.array[pos2]); + } + sequence_dispose(&(tp->labels_values)); } if(tp->type == STRUCT) { for(pos2 = 0; pos2 < tp->fields.position; pos2++) {