X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fparser.c;h=1ab1b73bf7bf256ac23f468d95482c31584cfc33;hb=a3999b493f2735815c7a75ef367899973c312450;hp=2d8c9c4ae2f992d4f4252181caeb11747b140bd9;hpb=f0b795e0b579719a95fee5f84d4dcb893044d926;p=lttv.git
diff --git a/ltt/branches/poly/ltt/parser.c b/ltt/branches/poly/ltt/parser.c
index 2d8c9c4a..1ab1b73b 100644
--- a/ltt/branches/poly/ltt/parser.c
+++ b/ltt/branches/poly/ltt/parser.c
@@ -96,12 +96,31 @@ int getSizeindex(unsigned int value)
unsigned long long int getSize(parse_file_t *in)
{
- char *token;
+ char *token, *token2;
+ unsigned long long int ret;
token = getToken(in);
- if(in->type == NUMBER) {
- return strtoull(token, NULL, 0);
+
+
+ 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;
+ }
+
+ return ret;
+error:
in->error(in,"incorrect size specification");
return -1;
}
@@ -179,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;
@@ -206,10 +226,26 @@ 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->custom_write = 1;
+ }
+ }
+ }
}
/**************************************************************************
@@ -232,6 +268,8 @@ void getEventAttributes(parse_file_t *in, event_t *ev)
ev->name = NULL;
ev->per_trace = 0;
ev->per_tracefile = 0;
+ ev->param_buffer = 0;
+ ev->no_instrument_function = 0;
while(1) {
token = getToken(in);
@@ -246,12 +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("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;
}
-
}
}
@@ -274,6 +330,7 @@ void getFacilityAttributes(parse_file_t *in, facility_t *fac)
fac->name = NULL;
fac->arch = NULL;
+ fac->user = 0;
while(1) {
token = getToken(in);
@@ -288,10 +345,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(!strncmp(fac->name, "user_", sizeof("user_")-1))
+ fac->user = 1;
} else if(!strcmp("arch", token)) {
getEqual(in);
car = seekNextChar(in);
- if(car == '\"') fac->name = allocAndCopy(getQuotedString(in));
+ if(car == '\"') fac->arch = allocAndCopy(getQuotedString(in));
else fac->arch = allocAndCopy(getName(in));
}
}
@@ -359,22 +418,42 @@ char *getNameAttribute(parse_file_t *in)
-//for , value is an option
-char * getValueStrAttribute(parse_file_t *in)
+//for