X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftype.c;h=dc39d9d1d082b6dbf6b194fcba5064e5362e9e64;hb=acd767ee11976fedd7455f3891d7f11d75d550df;hp=34a7b5d6a8dea3fe4c2c456270ce244a6bf3ad15;hpb=fcdf0ec203524819d926c57c9aa4d2fb6a268ca1;p=lttv.git diff --git a/ltt/branches/poly/ltt/type.c b/ltt/branches/poly/ltt/type.c index 34a7b5d6..dc39d9d1 100644 --- a/ltt/branches/poly/ltt/type.c +++ b/ltt/branches/poly/ltt/type.c @@ -1,7 +1,8 @@ #include -#include #include "parser.h" +#include +#include "ltt-private.h" #include static unsigned intSizes[] = { @@ -21,7 +22,7 @@ static unsigned floatSizes[] = { * char * : the name of the event type ****************************************************************************/ -char *ltt_eventtype_name(ltt_eventtype *et) +char *ltt_eventtype_name(LttEventType *et) { return et->name; } @@ -35,25 +36,82 @@ char *ltt_eventtype_name(ltt_eventtype *et) * char * : the description of the event type ****************************************************************************/ -char *ltt_eventtype_description(ltt_eventtype *et) +char *ltt_eventtype_description(LttEventType *et) { return et->description; } +/***************************************************************************** + *Function name + * ltt_eventtype_facility : get the facility which contains the event type + *Input params + * et : an event type + *Return value + * LttFacility * : the facility + ****************************************************************************/ + +LttFacility *ltt_eventtype_facility(LttEventType *et) +{ + return et->facility; +} + +/***************************************************************************** + *Function name + * ltt_eventtype_relative_id : get the relative id of the event type + *Input params + * et : an event type + *Return value + * unsigned : the relative id + ****************************************************************************/ + +unsigned ltt_eventtype_relative_id(LttEventType *et) +{ + return et->index; +} + +/***************************************************************************** + *Function name + * ltt_eventtype_id : get the id of the event type + *Input params + * et : an event type + *Return value + * unsigned : the id + ****************************************************************************/ + +unsigned ltt_eventtype_id(LttEventType *et) +{ + return et->facility->base_id + et->index; +} + /***************************************************************************** *Function name * ltt_eventtype_type : get the type of the event type *Input params * et : an event type *Return value - * ltt_type * : the type of the event type + * LttType * : the type of the event type ****************************************************************************/ -ltt_type *ltt_eventtype_type(ltt_eventtype *et) +LttType *ltt_eventtype_type(LttEventType *et) { + if(!et->root_field) return NULL; return et->root_field->field_type; } +/***************************************************************************** + *Function name + * ltt_eventtype_field : get the root filed of the event type + *Input params + * et : an event type + *Return value + * LttField * : the root filed of the event type + ****************************************************************************/ + +LttField *ltt_eventtype_field(LttEventType *et) +{ + return et->root_field; +} + /***************************************************************************** *Function name * ltt_type_name : get the name of the type @@ -63,7 +121,7 @@ ltt_type *ltt_eventtype_type(ltt_eventtype *et) * char * : the name of the type ****************************************************************************/ -char *ltt_type_name(ltt_type *t) +char *ltt_type_name(LttType *t) { return t->element_name; } @@ -74,10 +132,10 @@ char *ltt_type_name(ltt_type *t) *Input params * t : a type *Return value - * ltt_type_enum : the type class of the type + * LttTypeEnum : the type class of the type ****************************************************************************/ -ltt_type_enum ltt_type_class(ltt_type *t) +LttTypeEnum ltt_type_class(LttType *t) { return t->type_class; } @@ -94,7 +152,7 @@ ltt_type_enum ltt_type_class(ltt_type *t) * unsigned : the type size ****************************************************************************/ -unsigned ltt_type_size(ltt_tracefile * tf, ltt_type *t) +unsigned ltt_type_size(LttTrace * trace, LttType *t) { if(t->type_class==LTT_STRUCT || t->type_class==LTT_ARRAY || t->type_class==LTT_STRING) return 0; @@ -105,13 +163,19 @@ unsigned ltt_type_size(ltt_tracefile * tf, ltt_type *t) if(t->size < sizeof(intSizes)/sizeof(unsigned)) return intSizes[t->size]; else{ - ltt_arch_size size = tf->trace_header->arch_size; - if(size == LTT_LP32) - return sizeof(int16_t); - else if(size == LTT_ILP32 || size == LTT_LP64) - return sizeof(int32_t); - else if(size == LTT_ILP64) - return sizeof(int64_t); + LttArchSize size = trace->system_description->size; + if(size == LTT_LP32){ + if(t->size == 5)return sizeof(int16_t); + else return sizeof(int32_t); + } + else if(size == LTT_ILP32 || size == LTT_LP64){ + if(t->size == 5)return sizeof(int32_t); + else{ + if(size == LTT_ILP32) return sizeof(int32_t); + else return sizeof(int64_t); + } + } + else if(size == LTT_ILP64)return sizeof(int64_t); } } } @@ -123,12 +187,12 @@ unsigned ltt_type_size(ltt_tracefile * tf, ltt_type *t) *Input params * t : a type *Return value - * ltt_type : the type of nested element of array or sequence + * LttType : the type of nested element of array or sequence ****************************************************************************/ -ltt_type *ltt_type_element_type(ltt_type *t) +LttType *ltt_type_element_type(LttType *t) { - if(t->type_class != LTT_ARRAY || t->type_class != LTT_SEQUENCE) + if(t->type_class != LTT_ARRAY && t->type_class != LTT_SEQUENCE) return NULL; return t->element_type[0]; } @@ -142,7 +206,7 @@ ltt_type *ltt_type_element_type(ltt_type *t) * unsigned : the number of elements for arrays ****************************************************************************/ -unsigned ltt_type_element_number(ltt_type *t) +unsigned ltt_type_element_number(LttType *t) { if(t->type_class != LTT_ARRAY) return 0; @@ -158,9 +222,9 @@ unsigned ltt_type_element_number(ltt_type *t) * unsigned : the number of members for structure ****************************************************************************/ -unsigned ltt_type_member_number(ltt_type *t) +unsigned ltt_type_member_number(LttType *t) { - if(t->type_class != LTT_STRUCT) + if(t->type_class != LTT_STRUCT && t->type_class != LTT_UNION) return 0; return t->element_number; } @@ -172,14 +236,15 @@ unsigned ltt_type_member_number(ltt_type *t) * t : a type * i : index of the member *Return value - * ltt_type * : the type of structure member + * LttType * : the type of structure member ****************************************************************************/ -ltt_type *ltt_type_member_type(ltt_type *t, unsigned i) +LttType *ltt_type_member_type(LttType *t, unsigned i, char ** name) { - if(t->type_class != LTT_STRUCT) return NULL; - if(i > t->element_number || i == 0 ) return NULL; - return t->element_type[i-1]; + if(t->type_class != LTT_STRUCT){*name == NULL; return NULL;} + if(i >= t->element_number || i < 0 ){*name = NULL; return NULL;} + *name = t->element_type[i]->element_name; + return t->element_type[i]; } /***************************************************************************** @@ -194,11 +259,11 @@ ltt_type *ltt_type_member_type(ltt_type *t, unsigned i) * char * : symbolic string associated with a value ****************************************************************************/ -char *ltt_enum_string_get(ltt_type *t, unsigned i) +char *ltt_enum_string_get(LttType *t, unsigned i) { if(t->type_class != LTT_ENUM) return NULL; - if(i > t->element_number || i == 0 ) return NULL; - return t->enum_strings[i-1]; + if(i >= t->element_number || i < 0 ) return NULL; + return t->enum_strings[i]; } /***************************************************************************** @@ -208,12 +273,12 @@ char *ltt_enum_string_get(ltt_type *t, unsigned i) *Input params * f : a field *Return value - * ltt_field * : the field of the nested element + * LttField * : the field of the nested element ****************************************************************************/ -ltt_field *ltt_field_element(ltt_field *f) +LttField *ltt_field_element(LttField *f) { - if(f->field_type->type_class != LTT_ARRAY || + if(f->field_type->type_class != LTT_ARRAY && f->field_type->type_class != LTT_SEQUENCE) return NULL; @@ -227,14 +292,14 @@ ltt_field *ltt_field_element(ltt_field *f) * f : a field * i : index of member field *Return value - * ltt_field * : the field of the nested element + * LttField * : the field of the nested element ****************************************************************************/ -ltt_field *ltt_field_member(ltt_field *f, unsigned i) +LttField *ltt_field_member(LttField *f, unsigned i) { if(f->field_type->type_class != LTT_STRUCT) return NULL; - if(i==0 || i>f->field_type->element_number) return NULL; - return f->child[i-1]; + if(i < 0 || i >= f->field_type->element_number) return NULL; + return f->child[i]; } /***************************************************************************** @@ -246,8 +311,14 @@ ltt_field *ltt_field_member(ltt_field *f, unsigned i) * ltt_tyoe * : the type of field ****************************************************************************/ -ltt_type *ltt_field_type(ltt_field *f) +LttType *ltt_field_type(LttField *f) { + if(!f)return NULL; return f->field_type; } +int ltt_field_size(LttField * f) +{ + if(!f)return 0; + return f->field_size; +}