add usertrace support
[lttv.git] / ltt / branches / poly / ltt / facility.c
index 5ededcaa9514d2f9daea2313c4633a0f9492cfa4..0440efb4e05ee721a15d86f79cee8ee4cfacf3e0 100644 (file)
+/* This file is part of the Linux Trace Toolkit viewer
+ * Copyright (C) 2003-2004 Xiangxiu Yang
+ *               2005 Mathieu Desnoyers
+ *
+ * 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 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
+ * Lesser General Public License for more details.
+ *
+ * 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
+#include <config.h>
+#endif
+
 #include <stdlib.h> 
 #include <string.h>
 #include <stdio.h>
+#include <glib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+
 
-#include <ltt/LTTTypes.h>  
 #include "parser.h"
+#include <ltt/ltt.h>
+#include "ltt-private.h"
 #include <ltt/facility.h>
 
+#ifndef g_open
+#define g_open open
+#endif
+
+#define g_close close
+
 /* search for the (named) type in the table, if it does not exist
    create a new one */
-ltt_type * lookup_named_type(ltt_facility *fac, type_descriptor * td);
+LttType * lookup_named_type(LttFacility *fac, type_descriptor_t * td);
 
 /* construct directed acyclic graph for types, and tree for fields */
-void constructTypeAndFields(ltt_facility * fac,type_descriptor * td, 
-                            ltt_field * fld);
+void construct_fields(LttFacility *fac,
+                                                                                       LttField *field,
+                      field_t *fld);
 
 /* generate the facility according to the events belongin to it */
-void generateFacility(ltt_facility * facility, char * pathname
-                      ltt_checksum checksum, sequence * events);
+void generateFacility(LttFacility * f, facility_t  * fac
+                      guint32 checksum);
 
 /* functions to release the memory occupied by a facility */
-void freeFacility(ltt_facility * facility);
-void freeEventtype(ltt_eventtype * evType);
-void freeAllNamedTypes(table * named_types);
-void freeAllUnamedTypes(sequence * unnamed_types);
-void freeAllFields(sequence * all_fields);
-void freeLttType(ltt_type * type);
-void freeLttField(ltt_field * fld);
+void freeFacility(LttFacility * facility);
+void freeEventtype(LttEventType * evType);
+void freeLttType(LttType * type);
+void freeLttField(LttField * fld);
+void freeLttNamedType(LttType * type);
 
 
 /*****************************************************************************
  *Function name
- *    ltt_facility_open       : open a facility
+ *    ltt_facility_open       : open facilities
  *Input params
+ *    t                       : the trace containing the facilities
  *    pathname                : the path name of the facility   
- *    c                       : checksum of the facility registered in kernal
- *Return value
- *    ltt_facility*           : return a ltt_facility
+ *
+ *  Open the facility corresponding to the right checksum.
+ * 
+ *returns 0 on success, 1 on error.
  ****************************************************************************/
 
-ltt_facility * ltt_facility_open(char * pathname, ltt_checksum c)
+int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname)
 {
-  char *token;
-  parse_file in;
-  char buffer[BUFFER_SIZE];
-  ltt_checksum checksum;
-  event *ev;
-  sequence  events;
-  table namedTypes;
-  sequence unnamedTypes;
-  ltt_facility * aFacility = NULL;
-
-  sequence_init(&events);
-  table_init(&namedTypes);
-  sequence_init(&unnamedTypes);
-
-  in.buffer = buffer;
+  int ret = 0;
+  gchar *token;
+  parse_file_t in;
+  facility_t * fac;
+  unsigned int checksum;
+  gchar buffer[BUFFER_SIZE];
+  gboolean generated = FALSE;
+
+  in.buffer = &(buffer[0]);
   in.lineno = 0;
   in.error = error_callback;
-  in.name = appendString(pathname,".event");
+  in.name = pathname;
+  in.unget = 0;
 
   in.fp = fopen(in.name, "r");
-  if(!in.fp )g_error("cannot open input file: %s\n", in.name);
+  if(in.fp == NULL) {
+    g_warning("cannot open facility description file %s",
+        in.name);
+    ret = 1;
+    goto open_error;
+  }
+
   while(1){
     token = getToken(&in);
     if(in.type == ENDFILE) break;
     
-    if(strcmp("event",token) == 0) {
-      ev = g_new(event,1);
-      sequence_push(&events,ev);
-      parseEvent(&in,ev, &unnamedTypes, &namedTypes);
+    if(g_ascii_strcasecmp(token, "<")) in.error(&in,"not a facility file");
+    token = getName(&in);
+
+    if(g_ascii_strcasecmp("facility",token) == 0) {
+      fac = g_new(facility_t, 1);
+      fac->name = NULL;
+      fac->description = NULL;
+      sequence_init(&(fac->events));
+      table_init(&(fac->named_types));
+      sequence_init(&(fac->unnamed_types));
+      
+      parseFacility(&in, fac);
+
+      //check if any namedType is not defined
+      checkNamedTypesImplemented(&fac->named_types);
+    
+      generateChecksum(fac->name, &checksum, &fac->events);
+  
+      if(checksum == f->checksum) {
+        generateFacility(f, fac, checksum);
+        generated = TRUE;
+      }
+
+      g_free(fac->name);
+      free(fac->capname);
+      g_free(fac->description);
+      freeEvents(&fac->events);
+      sequence_dispose(&fac->events);
+      freeNamedType(&fac->named_types);
+      table_dispose(&fac->named_types);
+      freeTypes(&fac->unnamed_types);
+      sequence_dispose(&fac->unnamed_types);      
+      g_free(fac);
+      if(generated) break; /* use the first good match */
     }
-    else if(strcmp("type",token) == 0) {
-      parseTypeDefinition(&in, &unnamedTypes, &namedTypes);
+    else {
+      g_warning("facility token was expected in file %s", in.name);
+      ret = 1;
+      goto parse_error;
     }
-    else g_error("event or type token expected\n");
   }
   
+ parse_error:
   fclose(in.fp);
+open_error:
 
-  checkNamedTypesImplemented(&namedTypes);
-
-  generateChecksum(pathname, &checksum, &events);
-
-  //yxx disable during the test
-  aFacility = g_new(ltt_facility,1);    
-  generateFacility(aFacility, pathname, checksum, &events);
-/*
-  if(checksum == c){
-    aFacility = g_new(ltt_facility,1);    
-    generateFacility(aFacility, pathname, checksum, &events);
-  }else{
-    g_error("local facility is different from the one registered in the kernel");
+  if(!generated) {
+    g_warning("Cannot find facility %s, checksum 0x%X",
+        g_quark_to_string(f->name), f->checksum);
+    ret = 1;
   }
-*/
-
-  free(in.name);
-  freeEvents(&events);
-  sequence_dispose(&events);
-  freeNamedType(&namedTypes);
-  table_dispose(&namedTypes);
-  freeTypes(&unnamedTypes);
-  sequence_dispose(&unnamedTypes);
 
-  return aFacility;
+  return ret;
 }
 
 
@@ -111,85 +163,425 @@ ltt_facility * ltt_facility_open(char * pathname, ltt_checksum c)
  *Function name
  *    generateFacility    : generate facility, internal function
  *Input params 
- *    facility            : facilty structure
- *    facName             : facility name
+ *    facility            : LttFacilty structure
+ *    fac                 : facility structure
  *    checksum            : checksum of the facility          
- *    events              : sequence of events belonging to the facility
  ****************************************************************************/
 
-void generateFacility(ltt_facility * facility, char * pathname, 
-                      ltt_checksum checksum, sequence * events)
+void generateFacility(LttFacility *f, facility_t *fac, guint32 checksum)
 {
-  char * facilityName;
-  int i;
-  ltt_eventtype * evType;
-  ltt_field * field;
-  ltt_type * type;
-
-  //get the facility name (strip any leading directory) 
-  facilityName = strrchr(pathname,'/');
-  if(facilityName) facilityName++;    
-  else facilityName = pathname;
+  char * facilityName = fac->name;
+  sequence_t * events = &fac->events;
+  unsigned int i, j;
+  LttType * type;
+  table_t *named_types = &fac->named_types;
   
-  facility->name = g_strdup(facilityName);
-  facility->event_number = events->position;
-  facility->checksum = checksum;
-  facility->usage_count = 0;
+  g_assert(f->name == g_quark_from_string(facilityName));
+  g_assert(f->checksum == checksum);
+
+  //f->event_number = events->position;
   
   //initialize inner structures
-  facility->events = g_new(ltt_eventtype*,facility->event_number); 
-  sequence_init(&(facility->all_fields));
-  sequence_init(&(facility->all_unnamed_types));
-  table_init(&(facility->all_named_types));
+  f->events = g_array_sized_new (FALSE, TRUE, sizeof(LttEventType),
+      events->position);
+  //f->events = g_new(LttEventType*,f->event_number);
+  f->events = g_array_set_size(f->events, events->position);
+
+  g_datalist_init(&f->events_by_name);
+ // g_datalist_init(&f->named_types);
+#if 0
+  /* The first day, he created the named types */
+
+  for(i=0; i<named_types->keys.position; i++) {
+    GQuark name = g_quark_from_string((char*)named_types->keys.array[i]);
+    type_descriptor_t *td = (type_descriptor_t*)named_types->values.array[i];
+
+    /* Create the type */
+    type = g_new(LttType,1);
+    type->type_name = name;
+    type->type_class = td->type;
+    if(td->fmt) type->fmt = g_strdup(td->fmt);
+    else type->fmt = NULL;
+    type->size = td->size;
+    type->enum_strings = NULL;
+    type->element_type = NULL;
+    type->element_number = 0;
+
+    construct_types_and_fields(type, td, NULL, NULL, ...);
+    
+    g_datalist_id_set_data_full(&fac->named_types, name,
+                type, (GDestroyNotify)freeLttNamedType);
 
-  //for each event, construct field tree and type graph
+  }
+#endif //0
+  /* The second day, he created the event fields and types */
+  //for each event, construct field and type acyclic graph
   for(i=0;i<events->position;i++){
-    evType = g_new(ltt_eventtype,1);
-    facility->events[i] = evType;
+               event_t *parser_event = (event_t*)events->array[i];
+    LttEventType *event_type = &g_array_index(f->events, LttEventType, i);
 
-    evType->name = g_strdup(((event*)(events->array[i]))->name);
-    evType->description=g_strdup(((event*)(events->array[i]))->description);
+    event_type->name = 
+      g_quark_from_string(parser_event->name);
+    
+    g_datalist_id_set_data(&f->events_by_name, event_type->name,
+        event_type);
     
-    field = g_new(ltt_field, 1);
-    sequence_push(&(facility->all_fields), field);
-    evType->root_field = field;
-    evType->facility = facility;
-    evType->index = i;
-
-    field->field_pos = 0;
-    type = lookup_named_type(facility,((event*)(events->array[i]))->type);
-    field->field_type = type;
-    field->offset_root = 0;
-    field->fixed_root = 1;
-    field->offset_parent = 0;
-    field->fixed_parent = 1;
-    //    field->base_address = NULL;
-    field->field_size  = 0;
-    field->field_fixed = -1;
-    field->parent = NULL;
-    field->child = NULL;
-    field->current_element = 0;
-
-    //construct field tree and type graph
-    constructTypeAndFields(facility,((event*)(events->array[i]))->type,field);
-  }  
+    event_type->description =
+      g_strdup(parser_event->description);
+    
+    event_type->index = i;
+    event_type->facility = f;
+
+    event_type->fields = g_array_sized_new(FALSE, TRUE,
+        sizeof(LttField), parser_event->fields.position);
+    event_type->fields = 
+      g_array_set_size(event_type->fields, parser_event->fields.position);
+    g_datalist_init(&event_type->fields_by_name);
+  
+    for(j=0; j<parser_event->fields.position; j++) {
+      LttField *field = &g_array_index(event_type->fields, LttField, j);
+      field_t *parser_field = (field_t*)parser_event->fields.array[j];
+
+      construct_fields(f, field, parser_field);
+      g_datalist_id_set_data(&event_type->fields_by_name, 
+         field->name, 
+         field);
+    }
+  }
+
+  /* What about 2 days weeks ? */
 }
 
 
 /*****************************************************************************
  *Function name
- *    constructTypeAndFields : construct field tree and type graph,
+ *    construct_types_and_fields : construct field tree and type graph,
  *                             internal recursion function
  *Input params 
  *    fac                    : facility struct
- *    td                     : type descriptor
- *    root_field             : root field of the event
+ *    field                  : destination lttv field
+ *    fld                    : source parser field
  ****************************************************************************/
 
-void constructTypeAndFields(ltt_facility * fac,type_descriptor * td, 
-                            ltt_field * fld)
+//DONE
+//make the change for arrays and sequences
+//no more root field. -> change this for an array of fields.
+// Compute the field size here.
+// Flag fields as "VARIABLE OFFSET" or "FIXED OFFSET" : as soon as
+// a field with a variable size is found, all the following fields must
+// be flagged with "VARIABLE OFFSET", this will be done by the offset
+// precomputation.
+
+
+void construct_fields(LttFacility *fac,
+                                                                                       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;
+
+  if(fld->description) {
+    len = strlen(fld->description);
+    field->description = g_new(gchar, len+1);
+    strcpy(field->description, fld->description);
+  }
+  field->dynamic_offsets = NULL;
+  type = &field->field_type;
+  td = fld->type;
+
+  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;
+      type->size = td->size;
+      break;
+    case UINT_FIXED:
+      type->type_class = LTT_UINT_FIXED;
+      type->size = td->size;
+      break;
+    case POINTER:
+      type->type_class = LTT_POINTER;
+      type->size = fac->pointer_size;
+      break;
+    case CHAR:
+      type->type_class = LTT_CHAR;
+      type->size = td->size;
+      break;
+    case UCHAR:
+      type->type_class = LTT_UCHAR;
+      type->size = td->size;
+      g_assert(type->size != 0);
+      break;
+    case SHORT:
+      type->type_class = LTT_SHORT;
+      type->size = td->size;
+      break;
+    case USHORT:
+      type->type_class = LTT_USHORT;
+      type->size = td->size;
+      break;
+    case INT:
+      type->type_class = LTT_INT;
+      type->size = fac->int_size;
+      break;
+    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;
+      type->size = fac->long_size;
+      break;
+    case ULONG:
+      type->type_class = LTT_ULONG;
+      type->size = fac->long_size;
+      break;
+    case SIZE_T:
+      type->type_class = LTT_SIZE_T;
+      type->size = fac->size_t_size;
+      break;
+    case SSIZE_T:
+      type->type_class = LTT_SSIZE_T;
+      type->size = fac->size_t_size;
+      break;
+    case OFF_T:
+      type->type_class = LTT_OFF_T;
+      type->size = fac->size_t_size;
+      break;
+    case FLOAT:
+      type->type_class = LTT_FLOAT;
+      type->size = td->size;
+      break;
+    case STRING:
+      type->type_class = LTT_STRING;
+      type->size = 0;
+      break;
+    case ENUM:
+      type->type_class = LTT_ENUM;
+      type->size = fac->int_size;
+      {
+        guint i;
+        type->enum_map = g_hash_table_new(g_direct_hash, g_direct_equal);
+        for(i=0; i<td->labels.position; i++) {
+          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);
+        }
+      }
+      g_assert(type->size != 0);
+      break;
+    case ARRAY:
+      type->type_class = LTT_ARRAY;
+      type->size = td->size;
+      type->fields = g_array_sized_new(FALSE, TRUE, sizeof(LttField),
+          td->fields.position);
+      type->fields = g_array_set_size(type->fields, td->fields.position);
+      {
+        guint i;
+
+        for(i=0; i<td->fields.position; i++) {
+          field_t *schild = (field_t*)td->fields.array[i];
+          LttField *dchild = &g_array_index(type->fields, LttField, i);
+          
+          construct_fields(fac, dchild, schild);
+        }
+      }
+      break;
+    case SEQUENCE:
+      type->type_class = LTT_SEQUENCE;
+      type->size = 0;
+      type->fields = g_array_sized_new(FALSE, TRUE, sizeof(LttField),
+          td->fields.position);
+      type->fields = g_array_set_size(type->fields, td->fields.position);
+      {
+        guint i;
+
+        for(i=0; i<td->fields.position; i++) {
+          field_t *schild = (field_t*)td->fields.array[i];
+          LttField *dchild = &g_array_index(type->fields, LttField, i);
+          
+          construct_fields(fac, dchild, schild);
+        }
+      }
+      break;
+    case STRUCT:
+      type->type_class = LTT_STRUCT;
+      type->size = 0; // Size not calculated by the parser.
+      type->fields = g_array_sized_new(FALSE, TRUE, sizeof(LttField),
+          td->fields.position);
+      type->fields = g_array_set_size(type->fields, td->fields.position);
+      g_datalist_init(&type->fields_by_name);
+      {
+        guint i;
+
+        for(i=0; i<td->fields.position; i++) {
+          field_t *schild = (field_t*)td->fields.array[i];
+          LttField *dchild = &g_array_index(type->fields, LttField, i);
+          
+          construct_fields(fac, dchild, schild);
+          g_datalist_id_set_data(&type->fields_by_name, 
+             dchild->name, 
+             dchild);
+        }
+      }
+      break;
+    case UNION:
+      type->type_class = LTT_UNION;
+      type->size = 0; // Size not calculated by the parser.
+      type->fields = g_array_sized_new(FALSE, TRUE, sizeof(LttField),
+          td->fields.position);
+      type->fields = g_array_set_size(type->fields, td->fields.position);
+      g_datalist_init(&type->fields_by_name);
+      {
+        guint i;
+
+        for(i=0; i<td->fields.position; i++) {
+          field_t *schild = (field_t*)td->fields.array[i];
+          LttField *dchild = &g_array_index(type->fields, LttField, i);
+          
+          construct_fields(fac, dchild, schild);
+          g_datalist_id_set_data(&type->fields_by_name, 
+             dchild->name, 
+             dchild);
+        }
+      }
+      break;
+    case NONE:
+    default:
+      g_error("construct_fields : unknown type");
+  }
+
+  field->field_size = type->size;
+
+  /* Put the fields as "variable" offset to root first. Then,
+   * the offset precomputation will only have to set the FIELD_FIXED until
+   * it reaches the first variable length field, then stop.
+   */
+  field->fixed_root = FIELD_VARIABLE;
+
+  if(td->fmt) {
+    len = strlen(td->fmt);
+    type->fmt = g_new(gchar, len+1);
+    strcpy(type->fmt, td->fmt);
+  }
+}
+
+
+
+#if 0
+void construct_types_and_fields(LttFacility * fac, type_descriptor_t * td, 
+                            LttField * fld)
 {
   int i;
+  type_descriptor_t * tmpTd;
+
+  switch(td->type) {
+    case INT:
+    case UINT:
+    case FLOAT:
+      fld->field_type->size = td->size;
+      break;
+    case POINTER:
+    case LONG:
+    case ULONG:
+    case SIZE_T:
+    case SSIZE_T:
+    case OFF_T:
+      fld->field_type->size = 0;
+      break;
+    case STRING:
+      fld->field_type->size = 0;
+      break;
+    case ENUM:
+      fld->field_type->element_number = td->labels.position;
+      fld->field_type->enum_strings = g_new(GQuark,td->labels.position);
+      for(i=0;i<td->labels.position;i++){
+        fld->field_type->enum_strings[i] 
+                       = g_quark_from_string(((char*)(td->labels.array[i])));
+      }
+      fld->field_type->size = td->size;
+      break;
+
+    case ARRAY:
+      fld->field_type->element_number = (unsigned)td->size;
+    case SEQUENCE:
+    fld->field_type->element_type = g_new(LttType*,1);
+    tmpTd = td->nested_type;
+    fld->field_type->element_type[0] = lookup_named_type(fac, tmpTd);
+    fld->child = g_new(LttField*, 1);
+    fld->child[0] = g_new(LttField, 1);
+    
+    fld->child[0]->field_type = fld->field_type->element_type[0];
+    fld->child[0]->offset_root = 0;
+    fld->child[0]->fixed_root = FIELD_UNKNOWN;
+    fld->child[0]->offset_parent = 0;
+    fld->child[0]->fixed_parent = FIELD_UNKNOWN;
+    fld->child[0]->field_size  = 0;
+    fld->child[0]->fixed_size = FIELD_UNKNOWN;
+    fld->child[0]->parent = fld;
+    fld->child[0]->child = NULL;
+    fld->child[0]->current_element = 0;
+    construct_types_and_fields(fac, tmpTd, fld->child[0]);
+    break;
+
+  case STRUCT:
+  case UNION:
+    fld->field_type->element_number = td->fields.position;
+
+    g_assert(fld->field_type->element_type == NULL);
+    fld->field_type->element_type = g_new(LttType*, td->fields.position);
+
+    fld->child = g_new(LttField*, td->fields.position);      
+    for(i=0;i<td->fields.position;i++){
+      tmpTd = ((field_t*)(td->fields.array[i]))->type;
+
+       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);
+
+      fld->child[i]->offset_root = 0;
+      fld->child[i]->fixed_root = FIELD_UNKNOWN;
+      fld->child[i]->offset_parent = 0;
+      fld->child[i]->fixed_parent = FIELD_UNKNOWN;
+      fld->child[i]->field_size  = 0;
+      fld->child[i]->fixed_size = FIELD_UNKNOWN;
+      fld->child[i]->parent = fld;
+      fld->child[i]->child = NULL;
+      fld->child[i]->current_element = 0;
+      construct_types_and_fields(fac, tmpTd, fld->child[i]);
+    }    
+    break;
+
+  default:
+    g_error("construct_types_and_fields : unknown type");
+  }
+
+
+}
+
+#endif //0
+
+#if 0
+void construct_types_and_fields(LttFacility * fac, type_descriptor * td, 
+                            LttField * fld)
+{
+  int i, flag;
   type_descriptor * tmpTd;
 
   //  if(td->type == LTT_STRING || td->type == LTT_SEQUENCE)
@@ -198,22 +590,21 @@ void constructTypeAndFields(ltt_facility * fac,type_descriptor * td,
 
   if(td->type == LTT_ENUM){
     fld->field_type->element_number = td->labels.position;
-    fld->field_type->enum_strings = g_new(char*,td->labels.position);
+    fld->field_type->enum_strings = g_new(GQuark,td->labels.position);
     for(i=0;i<td->labels.position;i++){
       fld->field_type->enum_strings[i] 
-                          = g_strdup(((char*)(td->labels.array[i])));
+                     = g_quark_from_string(((char*)(td->labels.array[i])));
     }
   }else if(td->type == LTT_ARRAY || td->type == LTT_SEQUENCE){
     if(td->type == LTT_ARRAY)
       fld->field_type->element_number = (unsigned)td->size;
-    fld->field_type->element_type = g_new(ltt_type*,1);
+    fld->field_type->element_type = g_new(LttType*,1);
     tmpTd = td->nested_type;
     fld->field_type->element_type[0] = lookup_named_type(fac, tmpTd);
-    fld->child = g_new(ltt_field*, 1);
-    fld->child[0] = g_new(ltt_field, 1);
-    sequence_push(&(fac->all_fields), fld->child[0]);
+    fld->child = g_new(LttField*, 1);
+    fld->child[0] = g_new(LttField, 1);
     
-    fld->child[0]->field_pos = 0;
+//    fld->child[0]->field_pos = 0;
     fld->child[0]->field_type = fld->field_type->element_type[0];
     fld->child[0]->offset_root = fld->offset_root;
     fld->child[0]->fixed_root = fld->fixed_root;
@@ -225,21 +616,33 @@ void constructTypeAndFields(ltt_facility * fac,type_descriptor * td,
     fld->child[0]->parent = fld;
     fld->child[0]->child = NULL;
     fld->child[0]->current_element = 0;
-    constructTypeAndFields(fac, tmpTd, fld->child[0]);
+    construct_types_and_fields(fac, tmpTd, fld->child[0]);
   }else if(td->type == LTT_STRUCT){
     fld->field_type->element_number = td->fields.position;
-    fld->field_type->element_type = g_new(ltt_type*, td->fields.position);
-    fld->child = g_new(ltt_field*, td->fields.position);      
+
+    if(fld->field_type->element_type == NULL){
+      fld->field_type->element_type = g_new(LttType*, td->fields.position);
+      flag = 1;
+    }else{
+      flag = 0;
+    }
+
+    fld->child = g_new(LttField*, td->fields.position);      
     for(i=0;i<td->fields.position;i++){
-      tmpTd = ((field*)(td->fields.array[i]))->type;
-      fld->field_type->element_type[i] = lookup_named_type(fac, tmpTd);
-      fld->child[i] = g_new(ltt_field,1); 
-      sequence_push(&(fac->all_fields), fld->child[i]);
+      tmpTd = ((type_fields*)(td->fields.array[i]))->type;
+
+      if(flag)
+       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_strdup(((field*)(td->fields.array[i]))->name);
+
+      if(flag){
+       fld->child[i]->field_type->element_name 
+                 = g_quark_from_string(((type_fields*)(td->fields.array[i]))->name);
+      }
+
       fld->child[i]->offset_root = -1;
       fld->child[i]->fixed_root = -1;
       fld->child[i]->offset_parent = -1;
@@ -250,61 +653,53 @@ void constructTypeAndFields(ltt_facility * fac,type_descriptor * td,
       fld->child[i]->parent = fld;
       fld->child[i]->child = NULL;
       fld->child[i]->current_element = 0;
-      constructTypeAndFields(fac, tmpTd, fld->child[i]);
+      construct_types_and_fields(fac, tmpTd, fld->child[i]);
     }    
   }
 }
+#endif //0
 
-
+#if 0
 /*****************************************************************************
  *Function name
  *    lookup_named_type: search named type in the table
  *                       internal function
  *Input params 
  *    fac              : facility struct
- *    td               : type descriptor
+ *    name             : type name
  *Return value    
- *                     : either find the named type, or create a new ltt_type
+ *                     : either find the named type, or create a new LttType
  ****************************************************************************/
 
-ltt_type * lookup_named_type(ltt_facility *fac, type_descriptor * td)
+LttType * lookup_named_type(LttFacility *fac, GQuark type_name)
 {
-  ltt_type * lttType = NULL;
-  int i;
-  char * name;
-  if(td->type_name){
-    for(i=0;i<fac->all_named_types.keys.position;i++){
-      name = (char *)(fac->all_named_types.keys.array[i]);
-      if(strcmp(name, td->type_name)==0){
-       lttType = (ltt_type*)(fac->all_named_types.values.array[i]);
-       break;
-      }
-    }
-  }
+  LttType *type = NULL;
   
-  if(!lttType){
-    lttType = g_new(ltt_type,1);
-    lttType->type_class = td->type;
-    if(td->fmt) lttType->fmt = g_strdup(td->fmt);
-    else lttType->fmt = NULL;
-    lttType->size = td->size;
-    lttType->enum_strings = NULL;
-    lttType->element_type = NULL;
-    lttType->element_number = 0;
-    if(td->type_name){
-      name = g_strdup(td->type_name);
-      table_insert(&(fac->all_named_types),name,lttType);
-      lttType->element_name = name;
-    }
-    else{
-      sequence_push(&(fac->all_unnamed_types), lttType);
-      lttType->element_name = NULL;
-    }
+  /* Named type */
+  type = g_datalist_id_get_data(&fac->named_types, name);
+
+  g_assert(type != NULL);
+#if 0
+  if(type == NULL){
+    /* Create the type */
+    type = g_new(LttType,1);
+    type->type_name = name;
+    type->type_class = td->type;
+    if(td->fmt) type->fmt = g_strdup(td->fmt);
+    else type->fmt = NULL;
+    type->size = td->size;
+    type->enum_strings = NULL;
+    type->element_type = NULL;
+    type->element_number = 0;
+    
+    if(td->type_name != NULL)
+      g_datalist_id_set_data_full(&fac->named_types, name,
+                  type, (GDestroyNotify)freeLttNamedType);
   }
-
-  return lttType;
+#endif //0
+  return type;
 }
-
+#endif //0
 
 /*****************************************************************************
  *Function name
@@ -312,117 +707,93 @@ ltt_type * lookup_named_type(ltt_facility *fac, type_descriptor * td)
  *                              if usage count = 0, release the memory
  *Input params
  *    f                       : facility that will be closed
- *Return value
- *    int                     : usage count ?? status
  ****************************************************************************/
 
-int ltt_facility_close(ltt_facility *f)
+void ltt_facility_close(LttFacility *f)
 {
-  //  f->usage_count--;
-  if(f->usage_count > 0) return f->usage_count;
-  
   //release the memory it occupied
   freeFacility(f);
-
-  return 0;
 }
 
 /*****************************************************************************
  * Functions to release the memory occupied by the facility
  ****************************************************************************/
 
-void freeFacility(ltt_facility * fac)
+void freeFacility(LttFacility * fac)
 {
-  int i;
-  g_free(fac->name);  //free facility name
+  guint i;
+  LttEventType *et;
 
-  //free event types
-  for(i=0;i<fac->event_number;i++){
-    freeEventtype(fac->events[i]);
+  for(i=0; i<fac->events->len; i++) {
+    et = &g_array_index (fac->events, LttEventType, i);
+    freeEventtype(et);
   }
+  g_array_free(fac->events, TRUE);
 
-  //free all named types
-  freeAllNamedTypes(&(fac->all_named_types));
+  g_datalist_clear(&fac->events_by_name);
 
-  //free all unnamed types
-  freeAllUnamedTypes(&(fac->all_unnamed_types));
-
-  //free all fields
-  freeAllFields(&(fac->all_fields));
-
-  //free the facility itself
-  g_free(fac);
+ // g_datalist_clear(&fac->named_types);
 }
 
-void freeEventtype(ltt_eventtype * evType)
+void freeEventtype(LttEventType * evType)
 {
-  g_free(evType->name);
+  unsigned int i;
+  LttType * root_type;
   if(evType->description)
-    g_free(evType->description); 
-  g_free(evType);
-}
-
-void freeAllNamedTypes(table * named_types)
-{
-  int i;
-  for(i=0;i<named_types->keys.position;i++){
-    //free the name of the type
-    g_free((char*)(named_types->keys.array[i]));
-    
-    //free type
-    freeLttType((ltt_type*)(named_types->values.array[i]));
+    g_free(evType->description);
+  
+  for(i=0; i<evType->fields->len;i++) {
+    LttField *field = &g_array_index(evType->fields, LttField, i);
+    freeLttField(field);
   }
-  table_dispose(named_types);
+  g_array_free(evType->fields, TRUE);
+  g_datalist_clear(&evType->fields_by_name);
 }
 
-void freeAllUnamedTypes(sequence * unnamed_types)
+void freeLttType(LttType * type)
 {
-  int i;
-  for(i=0;i<unnamed_types->position;i++){
-    freeLttType((ltt_type*)(unnamed_types->array[i]));
-  }
-  sequence_dispose(unnamed_types);
-}
+  unsigned int i;
 
-void freeAllFields(sequence * all_fields)
-{
-  int i;
-  for(i=0;i<all_fields->position;i++){
-    freeLttField((ltt_field*)(all_fields->array[i]));
+  if(type->fmt)
+    g_free(type->fmt);
+
+  if(type->enum_map)
+    g_hash_table_destroy(type->enum_map);
+
+  if(type->fields) {
+    for(i=0; i<type->fields->len; i++) {
+      freeLttField(&g_array_index(type->fields, LttField, i));
+    }
+    g_array_free(type->fields, TRUE);
   }
-  sequence_dispose(all_fields);
+  if(type->fields_by_name)
+    g_datalist_clear(&type->fields_by_name);
 }
 
-void freeLttType(ltt_type * type)
+void freeLttNamedType(LttType * type)
 {
-  if(type->element_name)
-    g_free(type->element_name);
-  if(type->fmt)
-    g_free(type->fmt);
-  if(type->enum_strings)
-    g_free(type->enum_strings);
-  if(type->element_type)
-    g_free(type->element_type);
-  g_free(type);
+  freeLttType(type);
 }
 
-void freeLttField(ltt_field * fld)
-{  
-  if(fld->child)
-    g_free(fld->child);
-  g_free(fld);
+void freeLttField(LttField * field)
+{ 
+  if(field->description)
+    g_free(field->description);
+  if(field->dynamic_offsets)
+    g_array_free(field->dynamic_offsets, TRUE);
+  freeLttType(&field->field_type);
 }
 
 /*****************************************************************************
  *Function name
  *    ltt_facility_name       : obtain the facility's name
  *Input params
- *    f                       : the facility that will be closed
+ *    f                       : the facility
  *Return value
- *    char *                  : the facility's name
+ *    GQuark                  : the facility's name
  ****************************************************************************/
 
-char *ltt_facility_name(ltt_facility *f)
+GQuark ltt_facility_name(LttFacility *f)
 {
   return f->name;
 }
@@ -431,28 +802,42 @@ char *ltt_facility_name(ltt_facility *f)
  *Function name
  *    ltt_facility_checksum   : obtain the facility's checksum
  *Input params
- *    f                       : the facility that will be closed
+ *    f                       : the facility
  *Return value
- *    ltt_checksum            : the checksum of the facility 
+ *                            : the checksum of the facility 
  ****************************************************************************/
 
-ltt_checksum ltt_facility_checksum(ltt_facility *f)
+guint32 ltt_facility_checksum(LttFacility *f)
 {
   return f->checksum;
 }
 
+/*****************************************************************************
+ *Function name
+ *    ltt_facility_base_id    : obtain the facility base id
+ *Input params
+ *    f                       : the facility
+ *Return value
+ *                            : the base id of the facility
+ ****************************************************************************/
+
+guint ltt_facility_id(LttFacility *f)
+{
+  return f->id;
+}
+
 /*****************************************************************************
  *Function name
  *    ltt_facility_eventtype_number: obtain the number of the event types 
  *Input params
  *    f                            : the facility that will be closed
  *Return value
- *    unsigned                     : the number of the event types 
+ *                                 : the number of the event types 
  ****************************************************************************/
 
-unsigned ltt_facility_eventtype_number(ltt_facility *f)
+guint8 ltt_facility_eventtype_number(LttFacility *f)
 {
-  return (unsigned)(f->event_number);
+  return (f->events->len);
 }
 
 /*****************************************************************************
@@ -462,12 +847,15 @@ unsigned ltt_facility_eventtype_number(ltt_facility *f)
  *Input params
  *    f                         : the facility that will be closed
  *Return value
- *    ltt_eventtype *           : the event type required  
+ *    LttEventType *           : the event type required  
  ****************************************************************************/
 
-ltt_eventtype *ltt_facility_eventtype_get(ltt_facility *f, unsigned i)
+LttEventType *ltt_facility_eventtype_get(LttFacility *f, guint8 i)
 {
-  return f->events[i];
+  if(!f->exists) return NULL;
+
+  g_assert(i < f->events->len);
+  return &g_array_index(f->events, LttEventType, i);
 }
 
 /*****************************************************************************
@@ -476,22 +864,15 @@ ltt_eventtype *ltt_facility_eventtype_get(ltt_facility *f, unsigned i)
  *                     : obtain the event type according to event name
  *                       event name is unique in the facility
  *Input params
- *    f                : the facility that will be closed
+ *    f                : the facility
  *    name             : the name of the event
  *Return value
- *    ltt_eventtype *  : the event type required  
+ *    LttEventType *  : the event type required  
  ****************************************************************************/
 
-ltt_eventtype *ltt_facility_eventtype_get_by_name(ltt_facility *f, char *name)
+LttEventType *ltt_facility_eventtype_get_by_name(LttFacility *f, GQuark name)
 {
-  int i;
-  ltt_eventtype * ev;
-  for(i=0;i<f->event_number;i++){
-    ev = f->events[i];
-    if(strcmp(ev->name, name) == 0)break;      
-  }
-
-  if(i==f->event_number) return NULL;
-  else return ev;
+  LttEventType *et = g_datalist_id_get_data(&f->events_by_name, name);
+  return et;
 }
 
This page took 0.034203 seconds and 4 git commands to generate.