X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent-new%2Fparser.h;h=4215f286cd82077ad90b90df4a49ed305d88c345;hb=1119e2d296c87740378d50b65ec15bd4f01860b4;hp=588790989895417e8e483487873a983a24dc4342;hpb=be97b9537557ac5ed4b010dbacb26be3452f6035;p=lttv.git

diff --git a/genevent-new/parser.h b/genevent-new/parser.h
index 58879098..4215f286 100644
--- a/genevent-new/parser.h
+++ b/genevent-new/parser.h
@@ -101,25 +101,21 @@ typedef enum _data_type {
   NONE
 } data_type_t;
 
-/* Event type descriptors */
-
 typedef struct _type_descriptor {
   char * type_name; //used for named type
   data_type_t type;
   char *fmt;
-  unsigned long long size;
+  size_t size;
   sequence_t labels; // for enumeration
+  sequence_t labels_values; // for enumeration
 	sequence_t labels_description;
 	int	already_printed;
-  sequence_t fields; // for structure
-  struct _type_descriptor *nested_type; // for array and sequence 
-	struct _type_descriptor *length_type; // for sequence
-  int alignment;
+  sequence_t fields; // for structure, array and sequence (field_t type)
 } type_descriptor_t;
 
 
-/* Fields within types */
 
+/* Fields within types or events */
 typedef struct _field{
   char *name;
   char *description;
@@ -141,10 +137,12 @@ typedef struct _event {
 typedef struct _facility {
   char * name;
 	char * capname;
+	char * arch;
   char * description;
   sequence_t events;
-  sequence_t unnamed_types;
+  sequence_t unnamed_types; //FIXME : remove
   table_t named_types;
+	unsigned int checksum;
 } facility_t;
 
 int getSizeindex(unsigned int value);
@@ -159,11 +157,13 @@ void parseTypeDefinition(parse_file_t *in,
 type_descriptor_t *parseType(parse_file_t *in,
     type_descriptor_t *t, sequence_t * unnamed_types, table_t * named_types);
 void parseFields(parse_file_t *in, field_t *f,
-    sequence_t * unnamed_types, table_t * named_types);
+    sequence_t * unnamed_types,
+		table_t * named_types,
+		int tag);
 void checkNamedTypesImplemented(table_t * namedTypes);
 type_descriptor_t * find_named_type(char *name, table_t * named_types);
 void generateChecksum(char * facName,
-    unsigned long * checksum, sequence_t * events);
+    unsigned int * checksum, sequence_t * events);
 
 
 /* get attributes */