X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ffacility.c;h=6807ef0e91a8081ede942fd1d5dc10d33a457b60;hb=a5dcde2f975b43a9c6069c4a346528588bf1f8c8;hp=ea34c4a49401bc4b0436d81d28e89ebaf9687506;hpb=72a508f8d22aa0700f4712fb1103ebde9ae73156;p=lttv.git

diff --git a/ltt/branches/poly/ltt/facility.c b/ltt/branches/poly/ltt/facility.c
index ea34c4a4..6807ef0e 100644
--- a/ltt/branches/poly/ltt/facility.c
+++ b/ltt/branches/poly/ltt/facility.c
@@ -2,8 +2,9 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <ltt/LTTTypes.h>  
 #include "parser.h"
+#include <ltt/ltt.h>
+#include "ltt-private.h"
 #include <ltt/facility.h>
 
 /* search for the (named) type in the table, if it does not exist
@@ -21,11 +22,9 @@ void generateFacility(LttFacility * f, facility  * fac,
 /* functions to release the memory occupied by a facility */
 void freeFacility(LttFacility * facility);
 void freeEventtype(LttEventType * evType);
-void freeAllNamedTypes(table * named_types);
-void freeAllUnamedTypes(sequence * unnamed_types);
-void freeAllFields(sequence * all_fields);
-void freeLttType(LttType * type);
+void freeLttType(LttType ** type);
 void freeLttField(LttField * fld);
+void freeLttNamedType(LttType * type);
 
 
 /*****************************************************************************
@@ -76,6 +75,7 @@ void ltt_facility_open(LttTrace * t, char * pathname)
       generateChecksum(fac->name, &checksum, &fac->events);
 
       f = g_new(LttFacility,1);    
+      f->base_id = 0;
       generateFacility(f, fac, checksum);
 
       t->facility_number++;
@@ -89,7 +89,7 @@ void ltt_facility_open(LttTrace * t, char * pathname)
       table_dispose(&fac->named_types);
       freeTypes(&fac->unnamed_types);
       sequence_dispose(&fac->unnamed_types);      
-      free(fac);
+      g_free(fac);
     }
     else in.error(&in,"facility token was expected");
   }
@@ -121,9 +121,9 @@ void generateFacility(LttFacility *f, facility *fac,LttChecksum checksum)
   
   //initialize inner structures
   f->events = g_new(LttEventType*,f->event_number); 
-  sequence_init(&(f->all_fields));
-  sequence_init(&(f->all_unnamed_types));
-  table_init(&(f->all_named_types));
+  f->named_types_number = fac->named_types.keys.position;
+  f->named_types = g_new(LttType*, fac->named_types.keys.position);
+  for(i=0;i<fac->named_types.keys.position;i++) f->named_types[i] = NULL;
 
   //for each event, construct field tree and type graph
   for(i=0;i<events->position;i++){
@@ -134,7 +134,6 @@ void generateFacility(LttFacility *f, facility *fac,LttChecksum checksum)
     evType->description=g_strdup(((event*)(events->array[i]))->description);
     
     field = g_new(LttField, 1);
-    sequence_push(&(f->all_fields), field);
     evType->root_field = field;
     evType->facility = f;
     evType->index = i;
@@ -158,7 +157,6 @@ void generateFacility(LttFacility *f, facility *fac,LttChecksum checksum)
       constructTypeAndFields(f,((event*)(events->array[i]))->type,field);
     }else{
       evType->root_field = NULL;
-      sequence_pop(&(f->all_fields));
       g_free(field);
     }
   }  
@@ -178,7 +176,7 @@ void generateFacility(LttFacility *f, facility *fac,LttChecksum checksum)
 void constructTypeAndFields(LttFacility * fac,type_descriptor * td, 
                             LttField * fld)
 {
-  int i;
+  int i, flag;
   type_descriptor * tmpTd;
 
   //  if(td->type == LTT_STRING || td->type == LTT_SEQUENCE)
@@ -200,7 +198,6 @@ void constructTypeAndFields(LttFacility * fac,type_descriptor * td,
     fld->field_type->element_type[0] = lookup_named_type(fac, tmpTd);
     fld->child = g_new(LttField*, 1);
     fld->child[0] = g_new(LttField, 1);
-    sequence_push(&(fac->all_fields), fld->child[0]);
     
     fld->child[0]->field_pos = 0;
     fld->child[0]->field_type = fld->field_type->element_type[0];
@@ -217,18 +214,30 @@ void constructTypeAndFields(LttFacility * fac,type_descriptor * td,
     constructTypeAndFields(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(LttType*, 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);
+
+      if(flag)
+	fld->field_type->element_type[i] = lookup_named_type(fac, tmpTd);
       fld->child[i] = g_new(LttField,1); 
-      sequence_push(&(fac->all_fields), fld->child[i]);
 
       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_strdup(((field*)(td->fields.array[i]))->name);
+      }
+
       fld->child[i]->offset_root = -1;
       fld->child[i]->fixed_root = -1;
       fld->child[i]->offset_parent = -1;
@@ -262,11 +271,14 @@ LttType * lookup_named_type(LttFacility *fac, type_descriptor * td)
   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]);
+    for(i=0;i<fac->named_types_number; i++){
+      if(fac->named_types[i] == NULL) break;
+      name = fac->named_types[i]->type_name;
       if(strcmp(name, td->type_name)==0){
-	lttType = (LttType*)(fac->all_named_types.values.array[i]);
-	break;
+	lttType = fac->named_types[i];	
+	//	if(lttType->element_name) g_free(lttType->element_name);
+	//	lttType->element_name = NULL;
+	break;	
       }
     }
   }
@@ -280,14 +292,13 @@ LttType * lookup_named_type(LttFacility *fac, type_descriptor * td)
     lttType->enum_strings = NULL;
     lttType->element_type = NULL;
     lttType->element_number = 0;
+    lttType->element_name = NULL;
     if(td->type_name){
-      name = g_strdup(td->type_name);
-      table_insert(&(fac->all_named_types),name,lttType);
-      lttType->element_name = name;
+      lttType->type_name = g_strdup(td->type_name);
+      fac->named_types[i] = lttType;
     }
     else{
-      sequence_push(&(fac->all_unnamed_types), lttType);
-      lttType->element_name = NULL;
+      lttType->type_name = NULL;
     }
   }
 
@@ -329,13 +340,11 @@ void freeFacility(LttFacility * fac)
   g_free(fac->events);
 
   //free all named types
-  freeAllNamedTypes(&(fac->all_named_types));
-
-  //free all unnamed types
-  freeAllUnamedTypes(&(fac->all_unnamed_types));
-
-  //free all fields
-  freeAllFields(&(fac->all_fields));
+  for(i=0;i<fac->named_types_number;i++){
+    freeLttNamedType(fac->named_types[i]);
+    fac->named_types[i] = NULL;
+  }
+  g_free(fac->named_types);
 
   //free the facility itself
   g_free(fac);
@@ -343,68 +352,73 @@ void freeFacility(LttFacility * fac)
 
 void freeEventtype(LttEventType * evType)
 {
+  LttType * root_type;
   g_free(evType->name);
   if(evType->description)
     g_free(evType->description); 
+  if(evType->root_field){    
+    root_type = evType->root_field->field_type;
+    freeLttField(evType->root_field);
+    freeLttType(&root_type);
+  }
+
   g_free(evType);
 }
 
-void freeAllNamedTypes(table * named_types)
+void freeLttNamedType(LttType * type)
 {
   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((LttType*)(named_types->values.array[i]));
-  }
-  table_dispose(named_types);
+  g_free(type->type_name);
+  type->type_name = NULL;
+  freeLttType(&type);
 }
 
-void freeAllUnamedTypes(sequence * unnamed_types)
+void freeLttType(LttType ** type)
 {
   int i;
-  for(i=0;i<unnamed_types->position;i++){
-    freeLttType((LttType*)(unnamed_types->array[i]));
+  if(*type == NULL) return;
+  if((*type)->type_name){
+    return; //this is a named type
+  }
+  if((*type)->element_name)
+    g_free((*type)->element_name);
+  if((*type)->fmt)
+    g_free((*type)->fmt);
+  if((*type)->enum_strings){
+    for(i=0;i<(*type)->element_number;i++)
+      g_free((*type)->enum_strings[i]);
+    g_free((*type)->enum_strings);
   }
-  sequence_dispose(unnamed_types);
-}
 
-void freeAllFields(sequence * all_fields)
-{
-  int i;
-  for(i=0;i<all_fields->position;i++){
-    freeLttField((LttField*)(all_fields->array[i]));
+  if((*type)->element_type){
+    for(i=0;i<(*type)->element_number;i++)
+      freeLttType(&((*type)->element_type[i]));   
+    g_free((*type)->element_type);
   }
-  sequence_dispose(all_fields);
+  g_free(*type);
+  *type = NULL;
 }
 
-//only free current type, not child types
-void freeLttType(LttType * type)
-{
+void freeLttField(LttField * fld)
+{ 
   int i;
-  if(type->element_name)
-    g_free(type->element_name);
-  if(type->fmt)
-    g_free(type->fmt);
-  if(type->enum_strings){
-    for(i=0;i<type->element_number;i++)
-      g_free(type->enum_strings[i]);
-    g_free(type->enum_strings);
-  }
-
-  if(type->element_type){
-    g_free(type->element_type);
+  int size = 0;
+  
+  if(fld->field_type){
+    if(fld->field_type->type_class == LTT_ARRAY ||
+       fld->field_type->type_class == LTT_SEQUENCE){
+      size = 1;
+    }else if(fld->field_type->type_class == LTT_STRUCT){
+      size = fld->field_type->element_number;
+    }
   }
-  g_free(type);
-}
 
-//only free the current field, not child fields
-void freeLttField(LttField * fld)
-{  
-  if(fld->child)
+  if(fld->child){
+    for(i=0; i<size; i++){
+      if(fld->child[i])freeLttField(fld->child[i]);
+    }
     g_free(fld->child);
+  }
   g_free(fld);
 }