projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fine tune per architecture facilities
[lttv.git]
/
genevent-new
/
parser.c
diff --git
a/genevent-new/parser.c
b/genevent-new/parser.c
index 42c38c316a52e9101cb45a610a82305ff6db88ec..6dbf402d76fd4f008f8d8c5cce17378df0617b15 100644
(file)
--- a/
genevent-new/parser.c
+++ b/
genevent-new/parser.c
@@
-182,7
+182,6
@@
void getTypeAttributes(parse_file_t *in, type_descriptor_t *t,
t->fmt = NULL;
t->size = 0;
t->fmt = NULL;
t->size = 0;
- t->alignment = 0;
while(1) {
token = getToken(in);
while(1) {
token = getToken(in);
@@
-203,9
+202,6
@@
void getTypeAttributes(parse_file_t *in, type_descriptor_t *t,
} else if(!strcmp("size",token)) {
getEqual(in);
t->size = getSize(in);
} else if(!strcmp("size",token)) {
getEqual(in);
t->size = getSize(in);
- } else if(!strcmp("align",token)) {
- getEqual(in);
- t->alignment = getNumber(in);
}
}
}
}
}
}
@@
-271,6
+267,7
@@
void getFacilityAttributes(parse_file_t *in, facility_t *fac)
char car;
fac->name = NULL;
char car;
fac->name = NULL;
+ fac->arch = NULL;
while(1) {
token = getToken(in);
while(1) {
token = getToken(in);
@@
-285,7
+282,12
@@
void getFacilityAttributes(parse_file_t *in, facility_t *fac)
if(car == EOF) in->error(in,"name was expected");
else if(car == '\"') fac->name = allocAndCopy(getQuotedString(in));
else fac->name = allocAndCopy(getName(in));
if(car == EOF) in->error(in,"name was expected");
else if(car == '\"') fac->name = allocAndCopy(getQuotedString(in));
else fac->name = allocAndCopy(getName(in));
- }
+ } else if(!strcmp("arch", token)) {
+ getEqual(in);
+ car = seekNextChar(in);
+ if(car == '\"') fac->name = allocAndCopy(getQuotedString(in));
+ else fac->arch = allocAndCopy(getName(in));
+ }
}
}
}
}
@@
-424,7
+426,7
@@
void parseFacility(parse_file_t *in, facility_t * fac)
getFacilityAttributes(in, fac);
if(fac->name == NULL) in->error(in, "Attribute not named");
getFacilityAttributes(in, fac);
if(fac->name == NULL) in->error(in, "Attribute not named");
-
+
fac->capname = allocAndCopy(fac->name);
strupper(fac->capname);
getRAnglebracket(in);
fac->capname = allocAndCopy(fac->name);
strupper(fac->capname);
getRAnglebracket(in);
@@
-733,10
+735,10
@@
type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
t->already_printed = 0;
getTypeAttributes(in, t, unnamed_types, named_types);
//if(t->size == 0) in->error(in, "Sequence has empty size");
t->already_printed = 0;
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.
+ //Mathieu : we fix enum size to
target int size
. GCC is always like this.
//fox copy optimisation.
//fox copy optimisation.
- if(t->size != 0) in->error(in, "Enum has fixed size of
4
.");
- t->size =
4
;
+ if(t->size != 0) in->error(in, "Enum has fixed size of
target int
.");
+ t->size =
0
;
getRAnglebracket(in);
//<label name=label1 value=n/>
getRAnglebracket(in);
//<label name=label1 value=n/>
@@
-745,7
+747,7
@@
type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
while(strcmp("label",token) == 0){
int *label_value = malloc(sizeof(int));
while(strcmp("label",token) == 0){
int *label_value = malloc(sizeof(int));
- str = allocAndCopy(getNameAttribute(in));
+ str = allocAndCopy(getNameAttribute(in));
token = getValueStrAttribute(in);
sequence_push(&(t->labels),str);
token = getValueStrAttribute(in);
sequence_push(&(t->labels),str);
@@
-788,29
+790,29
@@
type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
}
else if(strcmp(token,"char") == 0) {
t->type = CHAR;
}
else if(strcmp(token,"char") == 0) {
t->type = CHAR;
- t->size = 1;
getTypeAttributes(in, t, unnamed_types, named_types);
getTypeAttributes(in, t, unnamed_types, named_types);
+ t->size = 1;
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"uchar") == 0) {
t->type = UCHAR;
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"uchar") == 0) {
t->type = UCHAR;
- t->size = 1;
getTypeAttributes(in, t, unnamed_types, named_types);
getTypeAttributes(in, t, unnamed_types, named_types);
+ t->size = 1;
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"short") == 0) {
t->type = SHORT;
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"short") == 0) {
t->type = SHORT;
- t->size = 2;
getTypeAttributes(in, t, unnamed_types, named_types);
getTypeAttributes(in, t, unnamed_types, named_types);
+ t->size = 2;
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"ushort") == 0) {
t->type = USHORT;
getForwardslash(in);
getRAnglebracket(in);
}
else if(strcmp(token,"ushort") == 0) {
t->type = USHORT;
- t->size = 2;
getTypeAttributes(in, t, unnamed_types, named_types);
getTypeAttributes(in, t, unnamed_types, named_types);
+ t->size = 2;
getForwardslash(in);
getRAnglebracket(in);
}
getForwardslash(in);
getRAnglebracket(in);
}
@@
-976,7
+978,8
@@
char *getName(parse_file_t * in)
char *token;
token = getToken(in);
char *token;
token = getToken(in);
- if(in->type != NAME) in->error(in,"Name token was expected");
+ // Optional descriptions
+ // if(in->type != NAME) in->error(in,"Name token was expected");
return token;
}
return token;
}
@@
-1158,11
+1161,11
@@
char *getToken(parse_file_t * in)
if(pos == BUFFER_SIZE) in->error(in, "number token too large");
in->type = NUMBER;
}
if(pos == BUFFER_SIZE) in->error(in, "number token too large");
in->type = NUMBER;
}
- else if(isal
pha(car)
) {
+ else if(isal
num(car) || car == '_' || car == '-'
) {
in->buffer[0] = car;
pos = 1;
while((car = getc(fp)) != EOF && pos < BUFFER_SIZE) {
in->buffer[0] = car;
pos = 1;
while((car = getc(fp)) != EOF && pos < BUFFER_SIZE) {
- if(!(isalnum(car) || car == '_')) {
+ if(!(isalnum(car) || car == '_'
|| car == '-'
)) {
ungetc(car,fp);
break;
}
ungetc(car,fp);
break;
}
@@
-1243,12
+1246,13
@@
void generateChecksum(char* facName,
unsigned long crc ;
int pos;
event_t * ev;
unsigned long crc ;
int pos;
event_t * ev;
+ unsigned int i;
crc = crc32(facName);
for(pos = 0; pos < events->position; pos++){
ev = (event_t *)(events->array[pos]);
crc = partial_crc32(ev->name, crc);
crc = crc32(facName);
for(pos = 0; pos < events->position; pos++){
ev = (event_t *)(events->array[pos]);
crc = partial_crc32(ev->name, crc);
- for(
unsigned int
i = 0; i < ev->fields.position; i++) {
+ for(i = 0; i < ev->fields.position; i++) {
field_t *f = (field_t*)ev->fields.array[i];
crc = partial_crc32(f->name, crc);
crc = getTypeChecksum(crc, f->type);
field_t *f = (field_t*)ev->fields.array[i];
crc = partial_crc32(f->name, crc);
crc = getTypeChecksum(crc, f->type);
@@
-1347,8
+1351,7
@@
unsigned long getTypeChecksum(unsigned long aCrc, type_descriptor_t * type)
flag = 1;
break;
case SEQUENCE:
flag = 1;
break;
case SEQUENCE:
- sprintf(buf,"%zu", type->size);
- str = appendString("sequence ",buf);
+ str = allocAndCopy("sequence ");
flag = 1;
break;
case STRUCT:
flag = 1;
break;
case STRUCT:
@@
-1554,5
+1557,3
@@
char *appendString(char *s, char *suffix)
strcat(tmp,suffix);
return tmp;
}
strcat(tmp,suffix);
return tmp;
}
-
-
This page took
0.030736 seconds
and
4
git commands to generate.