discuss marker types

[lttv.git] / genevent / parser.c

diff --git a/genevent/parser.c b/genevent/parser.c
index 3bc227cfb154b9c5b9993d7cb93713428eb05865..0ac6f5454da87294dc2f28f3714bb44bd35d5ac0 100644 (file)
--- a/genevent/parser.c
+++ b/genevent/parser.c
@@ -269,7 +269,8 @@ void getEventAttributes(parse_file_t *in, event_t *ev)
   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;
     }
   }
 }
@@ -750,8 +753,10 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
 
     //getLAnglebracket(in); //<subtype> 
                /* 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); //<type struct> 
@@ -772,14 +777,16 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
 
     //getLAnglebracket(in); //<sequence size type> 
                /* 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); //<subtype> 
                /* 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); //<type sequence> 
@@ -838,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++;
@@ -994,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;
 }