X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ffacility.c;h=380689b4628e773ea4195c8d2fe122e811702cb8;hb=880fded3c234f271a7437bf055fbefb6aaca2386;hp=75b89bed5e01f1a084d2b6d2e7e324bcba1f3cd3;hpb=f104d082727461632e7a5cc1d2a854f0ad66db07;p=lttv.git diff --git a/ltt/branches/poly/ltt/facility.c b/ltt/branches/poly/ltt/facility.c index 75b89bed..380689b4 100644 --- a/ltt/branches/poly/ltt/facility.c +++ b/ltt/branches/poly/ltt/facility.c @@ -2,19 +2,19 @@ * Copyright (C) 2003-2004 Xiangxiu Yang * 2005 Mathieu Desnoyers * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License Version 2 as - * published by the Free Software Foundation; + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License Version 2.1 as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H @@ -47,8 +47,9 @@ LttType * lookup_named_type(LttFacility *fac, type_descriptor_t * td); /* construct directed acyclic graph for types, and tree for fields */ -void construct_types_and_fields(LttFacility * fac, type_descriptor_t * td, - LttField * fld); +void construct_fields(LttFacility *fac, + LttField *field, + field_t *fld); /* generate the facility according to the events belongin to it */ void generateFacility(LttFacility * f, facility_t * fac, @@ -57,7 +58,7 @@ void generateFacility(LttFacility * f, facility_t * fac, /* functions to release the memory occupied by a facility */ void freeFacility(LttFacility * facility); void freeEventtype(LttEventType * evType); -void freeLttType(LttType ** type); +void freeLttType(LttType * type); void freeLttField(LttField * fld); void freeLttNamedType(LttType * type); @@ -80,7 +81,7 @@ int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname) gchar *token; parse_file_t in; facility_t * fac; - unsigned long checksum; + unsigned int checksum; gchar buffer[BUFFER_SIZE]; gboolean generated = FALSE; @@ -101,6 +102,24 @@ int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname) while(1){ token = getToken(&in); if(in.type == ENDFILE) break; + + if(g_ascii_strcasecmp(token, "<")) in.error(&in,"not a facility file"); + token = getName(&in); + if(g_ascii_strcasecmp(token, "?")) in.error(&in,"not a facility file"); + token = getName(&in); + if(g_ascii_strcasecmp(token, "xml")) in.error(&in,"not a facility file"); + token = getName(&in); + if(g_ascii_strcasecmp(token, "version")) in.error(&in,"not a facility file"); + token = getName(&in); + if(g_ascii_strcasecmp(token, "=")) in.error(&in,"not a facility file"); + token = getQuotedString(&in); + if(g_ascii_strcasecmp(token, "1.0")) in.error(&in,"not a facility file"); + token = getName(&in); + if(g_ascii_strcasecmp(token, "?")) in.error(&in,"not a facility file"); + token = getToken(&in); + if(g_ascii_strcasecmp(token, ">")) in.error(&in,"not a facility file"); + + token = getToken(&in); if(g_ascii_strcasecmp(token, "<")) in.error(&in,"not a facility file"); token = getName(&in); @@ -119,11 +138,13 @@ int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname) checkNamedTypesImplemented(&fac->named_types); generateChecksum(fac->name, &checksum, &fac->events); - - if(checksum == f->checksum) { + // FIXME if(checksum == f->checksum) { generateFacility(f, fac, checksum); generated = TRUE; - } + //} + if (checksum != f->checksum) + g_warning("Facility checksum mismatch for facility %s : kernel 0x%X vs " + "XML 0x%X\n", fac->name, f->checksum, checksum); g_free(fac->name); free(fac->capname); @@ -176,7 +197,7 @@ void generateFacility(LttFacility *f, facility_t *fac, guint32 checksum) table_t *named_types = &fac->named_types; g_assert(f->name == g_quark_from_string(facilityName)); - g_assert(f->checksum == checksum); + //g_assert(f->checksum == checksum); //f->event_number = events->position; @@ -187,7 +208,7 @@ void generateFacility(LttFacility *f, facility_t *fac, guint32 checksum) f->events = g_array_set_size(f->events, events->position); g_datalist_init(&f->events_by_name); - g_datalist_init(&f->named_types); + // g_datalist_init(&f->named_types); #if 0 /* The first day, he created the named types */ @@ -216,7 +237,7 @@ void generateFacility(LttFacility *f, facility_t *fac, guint32 checksum) /* The second day, he created the event fields and types */ //for each event, construct field and type acyclic graph for(i=0;iposition;i++){ - event_t parser_event = (event_t*)events->array[i]; + event_t *parser_event = (event_t*)events->array[i]; LttEventType *event_type = &g_array_index(f->events, LttEventType, i); event_type->name = @@ -231,6 +252,8 @@ void generateFacility(LttFacility *f, facility_t *fac, guint32 checksum) event_type->index = i; event_type->facility = f; + event_type->has_compact_data = parser_event->compact_data; + event_type->fields = g_array_sized_new(FALSE, TRUE, sizeof(LttField), parser_event->fields.position); event_type->fields = @@ -241,7 +264,7 @@ void generateFacility(LttFacility *f, facility_t *fac, guint32 checksum) LttField *field = &g_array_index(event_type->fields, LttField, j); field_t *parser_field = (field_t*)parser_event->fields.array[j]; - construct_types_and_fields(NULL, NULL, field, parser_field, ...); + construct_fields(f, field, parser_field); g_datalist_id_set_data(&event_type->fields_by_name, field->name, field); @@ -273,13 +296,18 @@ void generateFacility(LttFacility *f, facility_t *fac, guint32 checksum) void construct_fields(LttFacility *fac, - LttField *field, + LttField *field, field_t *fld) { guint len; type_descriptor_t *td; + LttType *type; + + if(fld->name) + field->name = g_quark_from_string(fld->name); + else + fld->name = 0; - field->name = g_quark_from_string(fld->name); if(fld->description) { len = strlen(fld->description); field->description = g_new(gchar, len+1); @@ -292,7 +320,8 @@ void construct_fields(LttFacility *fac, type->enum_map = NULL; type->fields = NULL; type->fields_by_name = NULL; - + type->network = td->network; + switch(td->type) { case INT_FIXED: type->type_class = LTT_INT_FIXED; @@ -313,6 +342,7 @@ void construct_fields(LttFacility *fac, case UCHAR: type->type_class = LTT_UCHAR; type->size = td->size; + g_assert(type->size != 0); break; case SHORT: type->type_class = LTT_SHORT; @@ -329,6 +359,7 @@ void construct_fields(LttFacility *fac, case UINT: type->type_class = LTT_UINT; type->size = fac->int_size; + g_assert(type->size != 0); break; case LONG: type->type_class = LTT_LONG; @@ -363,14 +394,18 @@ void construct_fields(LttFacility *fac, type->size = fac->int_size; { guint i; - g_datalist_init(&type->enum_map); + type->enum_map = g_hash_table_new(g_direct_hash, g_direct_equal); + type->lowest_value = G_MAXINT32; + type->highest_value = G_MININT32; for(i=0; ilabels.position; i++) { - GQuark key = g_quark_from_string((char*)td->labels.array[i]); - int *src = (int*)td->labels_values.array[i]; - /* it's always ok to cast a int to a pointer type */ - g_datalist_id_set_data(&type->enum_map, key, (gpointer)*src); + GQuark value = g_quark_from_string((char*)td->labels.array[i]); + gint key = *(int*)td->labels_values.array[i]; + g_hash_table_insert(type->enum_map, (gpointer)key, (gpointer)value); + type->highest_value = max(key, type->highest_value); + type->lowest_value = min(key, type->lowest_value); } } + g_assert(type->size != 0); break; case ARRAY: type->type_class = LTT_ARRAY; @@ -537,14 +572,14 @@ void construct_types_and_fields(LttFacility * fac, type_descriptor_t * td, for(i=0;ifields.position;i++){ tmpTd = ((field_t*)(td->fields.array[i]))->type; - fld->field_type->element_type[i] = lookup_named_type(fac, tmpTd); + fld->field_type->element_type[i] = lookup_named_type(fac, tmpTd); fld->child[i] = g_new(LttField,1); // fld->child[i]->field_pos = i; fld->child[i]->field_type = fld->field_type->element_type[i]; fld->child[i]->field_type->element_name - = g_quark_from_string(((field_t*)(td->fields.array[i]))->name); + = g_quark_from_string(((field_t*)(td->fields.array[i]))->name); fld->child[i]->offset_root = 0; fld->child[i]->fixed_root = FIELD_UNKNOWN; @@ -623,15 +658,15 @@ void construct_types_and_fields(LttFacility * fac, type_descriptor * td, tmpTd = ((type_fields*)(td->fields.array[i]))->type; if(flag) - fld->field_type->element_type[i] = lookup_named_type(fac, tmpTd); + fld->field_type->element_type[i] = lookup_named_type(fac, tmpTd); fld->child[i] = g_new(LttField,1); fld->child[i]->field_pos = i; fld->child[i]->field_type = fld->field_type->element_type[i]; if(flag){ - fld->child[i]->field_type->element_name - = g_quark_from_string(((type_fields*)(td->fields.array[i]))->name); + fld->child[i]->field_type->element_name + = g_quark_from_string(((type_fields*)(td->fields.array[i]))->name); } fld->child[i]->offset_root = -1; @@ -734,7 +769,8 @@ void freeEventtype(LttEventType * evType) g_free(evType->description); for(i=0; ifields->len;i++) { - freeLttType(&g_array_index(evType->fields, LttType, i)); + LttField *field = &g_array_index(evType->fields, LttField, i); + freeLttField(field); } g_array_free(evType->fields, TRUE); g_datalist_clear(&evType->fields_by_name); @@ -748,7 +784,7 @@ void freeLttType(LttType * type) g_free(type->fmt); if(type->enum_map) - g_datalist_clear(&type->enum_map); + g_hash_table_destroy(type->enum_map); if(type->fields) { for(i=0; ifields->len; i++) { @@ -765,19 +801,13 @@ void freeLttNamedType(LttType * type) freeLttType(type); } -void copy_enum_element(GQuark keyid, gpointer data, gpointer user_data) -{ - int *value = gpointer data; - -} - void freeLttField(LttField * field) { if(field->description) g_free(field->description); if(field->dynamic_offsets) g_array_free(field->dynamic_offsets, TRUE); - freeLttType(field->type); + freeLttType(&field->field_type); } /*****************************************************************************