X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent-new%2Fparser.c;h=42c38c316a52e9101cb45a610a82305ff6db88ec;hb=dbe259499a8b8ff190cdec2a1b0990ef1de81cf4;hp=ce416ed963ac85dcc7b2ccef0a7be86ff1de0a10;hpb=47299663f9a2f077317b95f7e669e8373052364b;p=lttv.git
diff --git a/genevent-new/parser.c b/genevent-new/parser.c
index ce416ed9..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.
@@ -174,7 +175,8 @@ char *allocAndCopy(char *str)
*
**************************************************************************/
-void getTypeAttributes(parse_file_t *in, type_descriptor_t *t)
+void getTypeAttributes(parse_file_t *in, type_descriptor_t *t,
+ sequence_t * unnamed_types, table_t * named_types)
{
char * token;
@@ -198,7 +200,7 @@ void getTypeAttributes(parse_file_t *in, type_descriptor_t *t)
// if(car == EOF) in->error(in,"name was expected");
// else if(car == '\"') t->type_name = allocAndCopy(getQuotedString(in));
// else t->type_name = allocAndCopy(getName(in));
- } else if(!strcmp("size",token) || !strcmp("lengthsize", token)) {
+ } else if(!strcmp("size",token)) {
getEqual(in);
t->size = getSize(in);
} else if(!strcmp("align",token)) {
@@ -497,7 +499,7 @@ void parseEvent(parse_file_t *in, event_t * ev, sequence_t * unnamed_types,
if(strcmp("field",token))in->error(in,"expecting a field");
f = (field_t *)memAlloc(sizeof(field_t));
sequence_push(&(ev->fields),f);
- parseFields(in, f, unnamed_types, named_types);
+ parseFields(in, f, unnamed_types, named_types, 1);
break;
default:
in->error(in, "expecting or ");
@@ -534,30 +536,35 @@ void parseEvent(parse_file_t *in, event_t * ev, sequence_t * unnamed_types,
* f : field
* unnamed_types : array of unamed types
* named_types : array of named types
+ * tag : is field surrounded by a tag ?
****************************************************************************/
void parseFields(parse_file_t *in, field_t *f,
sequence_t * unnamed_types,
- table_t * named_types)
+ table_t * named_types,
+ int tag)
{
char * token;
+ if(tag) {
+ //
+ getFieldAttributes(in, f);
+ if(f->name == NULL) in->error(in, "Field not named");
+ getRAnglebracket(in);
- //
- getFieldAttributes(in, f);
- if(f->name == NULL) in->error(in, "Field not named");
- getRAnglebracket(in);
-
- f->description = getDescription(in);
+ f->description = getDescription(in);
+ }
//
getLAnglebracket(in);
f->type = parseType(in,NULL, unnamed_types, named_types);
- getLAnglebracket(in);
- getForwardslash(in);
- token = getName(in);
- if(strcmp("field",token))in->error(in,"not a valid field definition");
- getRAnglebracket(in); //
+ if(tag) {
+ getLAnglebracket(in);
+ getForwardslash(in);
+ token = getName(in);
+ if(strcmp("field",token))in->error(in,"not a valid field definition");
+ getRAnglebracket(in); //
+ }
}
@@ -601,7 +608,7 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
if(strcmp(token,"struct") == 0) {
t->type = STRUCT;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getRAnglebracket(in); //
getLAnglebracket(in); //
token = getToken(in);
@@ -610,7 +617,7 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
f = (field_t *)memAlloc(sizeof(field_t));
sequence_push(&(t->fields),f);
- parseFields(in, f, unnamed_types, named_types);
+ parseFields(in, f, unnamed_types, named_types, 1);
//next field
getLAnglebracket(in);
@@ -624,7 +631,7 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
}
else if(strcmp(token,"union") == 0) {
t->type = UNION;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getRAnglebracket(in); //
getLAnglebracket(in); //
@@ -633,7 +640,7 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
while(strcmp("field",token) == 0){
f = (field_t *)memAlloc(sizeof(field_t));
sequence_push(&(t->fields),f);
- parseFields(in, f, unnamed_types, named_types);
+ parseFields(in, f, unnamed_types, named_types, 1);
//next field
getLAnglebracket(in);
@@ -647,13 +654,20 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
}
else if(strcmp(token,"array") == 0) {
t->type = ARRAY;
- getTypeAttributes(in, t);
+ sequence_init(&(t->fields));
+ getTypeAttributes(in, t, unnamed_types, named_types);
if(t->size == 0) in->error(in, "Array has empty size");
getForwardslash(in);
getRAnglebracket(in); //
- getLAnglebracket(in); //
- t->nested_type = parseType(in, NULL, unnamed_types, named_types);
+ //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); //
+ //t->nested_type = parseType(in, NULL, unnamed_types, named_types);
getLAnglebracket(in); //
getForwardslash(in);
@@ -663,13 +677,44 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
}
else if(strcmp(token,"sequence") == 0) {
t->type = SEQUENCE;
- getTypeAttributes(in, t);
- if(t->size == 0) in->error(in, "Sequence has empty lengthsize");
- getForwardslash(in);
- getRAnglebracket(in); //
-
- getLAnglebracket(in); //
- t->nested_type = parseType(in,NULL, unnamed_types, named_types);
+ sequence_init(&(t->fields));
+ //getTypeAttributes(in, t, unnamed_types, named_types);
+ //getForwardslash(in);
+ getRAnglebracket(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); //
+ /* subfield */
+ f = (field_t *)memAlloc(sizeof(field_t));
+ sequence_push(&(t->fields),f);
+ parseFields(in, f, unnamed_types, named_types, 0);
+
+ //getLAnglebracket(in); //
+ //t->length_type = parseType(in, NULL, unnamed_types, named_types);
+
+ //getLAnglebracket(in); //
+
+ //t->nested_type = parseType(in, NULL, unnamed_types, named_types);
+
+ if(t->fields.position < 1) in->error(in, "Sequence has no length type");
+ if(t->fields.position < 2) in->error(in, "Sequence has no subtype");
+ switch(((field_t*)t->fields.array[0])->type->type) {
+ case UINT_FIXED :
+ case UCHAR :
+ case USHORT :
+ case UINT :
+ case ULONG :
+ case SIZE_T :
+ case OFF_T :
+ break;
+ default:
+ in->error(in, "Wrong length type for sequence");
+ }
getLAnglebracket(in); //
getForwardslash(in);
@@ -678,12 +723,15 @@ 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);
+ getTypeAttributes(in, t, unnamed_types, named_types);
//if(t->size == 0) in->error(in, "Sequence has empty size");
//Mathieu : we fix enum size to 4 bytes. GCC is always like this.
//fox copy optimisation.
@@ -695,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);
@@ -725,116 +774,117 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
}
else if(strcmp(token,"int_fixed") == 0) {
t->type = INT_FIXED;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
if(t->size == 0) in->error(in, "int has empty size");
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"uint_fixed") == 0) {
t->type = UINT_FIXED;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
if(t->size == 0) in->error(in, "uint has empty size");
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"char") == 0) {
t->type = CHAR;
- getTypeAttributes(in, t);
+ t->size = 1;
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"uchar") == 0) {
t->type = UCHAR;
- getTypeAttributes(in, t);
+ t->size = 1;
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"short") == 0) {
t->type = SHORT;
- getTypeAttributes(in, t);
+ t->size = 2;
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"ushort") == 0) {
t->type = USHORT;
- getTypeAttributes(in, t);
+ t->size = 2;
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"int") == 0) {
t->type = INT;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"uint") == 0) {
t->type = UINT;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"pointer") == 0) {
t->type = POINTER;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"long") == 0) {
t->type = LONG;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"ulong") == 0) {
t->type = ULONG;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"size_t") == 0) {
t->type = SIZE_T;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"ssize_t") == 0) {
t->type = SSIZE_T;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"off_t") == 0) {
t->type = OFF_T;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"float") == 0) {
t->type = FLOAT;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"string") == 0) {
t->type = STRING;
- getTypeAttributes(in, t);
+ getTypeAttributes(in, t, unnamed_types, named_types);
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"typeref") == 0){
// Must be a named type
- if(inType != NULL)
- in->error(in,"Named type cannot refer to a named type");
- else {
- free(t);
- sequence_pop(unnamed_types);
- token = getNameAttribute(in);
- t = find_named_type(token, named_types);
- getForwardslash(in); //
- getRAnglebracket(in);
- return t;
- }
+ free(t);
+ sequence_pop(unnamed_types);
+ token = getNameAttribute(in);
+ t = find_named_type(token, named_types);
+ if(t == NULL) in->error(in,"Named referred to must be pre-declared.");
+ getForwardslash(in); //
+ getRAnglebracket(in);
+ return t;
}else in->error(in,"not a valid type");
return t;
@@ -855,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
@@ -883,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); //
@@ -1182,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;
@@ -1286,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;
@@ -1313,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);
@@ -1342,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++) {