X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ffacility.c;h=0b5f1ee7d7ee8bfc0e385ea7f7b4583051bdc5a5;hb=f628823c5712cc8b8bfe10ade63b6c7c2862f5e5;hp=1d9ed5f66fb807b35a848e986017f6889ab02b56;hpb=3aee1200b100fe8063661fd2d8eaa5fbbfc1977f;p=lttv.git

diff --git a/ltt/branches/poly/ltt/facility.c b/ltt/branches/poly/ltt/facility.c
index 1d9ed5f6..0b5f1ee7 100644
--- a/ltt/branches/poly/ltt/facility.c
+++ b/ltt/branches/poly/ltt/facility.c
@@ -44,10 +44,10 @@
 
 /* search for the (named) type in the table, if it does not exist
    create a new one */
-LttType * lookup_named_type(LttFacility *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 construct_types_and_fields(LttFacility * fac,type_descriptor * td, 
+void construct_types_and_fields(LttFacility * fac, type_descriptor_t * td, 
                             LttField * fld);
 
 /* generate the facility according to the events belongin to it */
@@ -75,10 +75,10 @@ void freeLttNamedType(LttType * type);
 int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname)
 {
   gchar *token;
-  parse_file in;
+  parse_file_t in;
   gsize length;
   facility_t * fac;
-  guint32 checksum;
+  unsigned long checksum;
   GError * error = NULL;
   gchar buffer[BUFFER_SIZE];
 
@@ -87,15 +87,17 @@ int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname)
   in.error = error_callback;
   in.name = pathname;
 
-  in.fd = g_open(in.name, O_RDONLY, 0);
-  if(in.fd < 0 ) {
+  //in.fd = g_open(in.name, O_RDONLY, 0);
+  //if(in.fd < 0 ) {
+  in.fp = fopen(in.name, "r");
+  if(in.fp == NULL) {
     g_warning("cannot open facility description file %s",
         in.name);
     return 1;
   }
 
-  in.channel = g_io_channel_unix_new(in.fd);
-  in.pos = 0;
+  //in.channel = g_io_channel_unix_new(in.fd);
+  //in.pos = 0;
 
   while(1){
     token = getToken(&in);
@@ -115,9 +117,9 @@ int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname)
       parseFacility(&in, fac);
 
       //check if any namedType is not defined
-      g_assert(checkNamedTypesImplemented(&fac->named_types) == 0);
+      checkNamedTypesImplemented(&fac->named_types);
     
-      g_assert(generateChecksum(fac->name, &checksum, &fac->events) == 0);
+      generateChecksum(fac->name, &checksum, &fac->events);
 
       generateFacility(f, fac, checksum);
 
@@ -138,13 +140,14 @@ int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname)
   }
 
  parse_error:
-  g_io_channel_shutdown(in.channel, FALSE, &error); /* No flush */
-  if(error != NULL) {
-    g_warning("Can not close file: \n%s\n", error->message);
-    g_error_free(error);
-  }
+  //g_io_channel_shutdown(in.channel, FALSE, &error); /* No flush */
+  //if(error != NULL) {
+  fclose(in.fp);
+  //  g_warning("Can not close file: \n%s\n", error->message);
+  //  g_error_free(error);
+  //}
 
-  g_close(in.fd);
+  //g_close(in.fd);
 }
 
 
@@ -160,7 +163,7 @@ int ltt_facility_open(LttFacility *f, LttTrace * t, gchar * pathname)
 void generateFacility(LttFacility *f, facility_t *fac, guint32 checksum)
 {
   char * facilityName = fac->name;
-  sequence * events = &fac->events;
+  sequence_t * events = &fac->events;
   int i;
   //LttEventType * evType;
   LttEventType * event_type;
@@ -244,24 +247,42 @@ void generateFacility(LttFacility *f, facility_t *fac, guint32 checksum)
  ****************************************************************************/
 
 
-void construct_types_and_fields(LttFacility * fac, type_descriptor * td, 
+void construct_types_and_fields(LttFacility * fac, type_descriptor_t * td, 
                             LttField * fld)
 {
   int i, flag;
-  type_descriptor * tmpTd;
+  type_descriptor_t * tmpTd;
 
   switch(td->type) {
-  case LTT_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])));
-    }
-    break;
-  case LTT_ARRAY:
-    fld->field_type->element_number = (unsigned)td->size;
-  case LTT_SEQUENCE:
+    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);
@@ -280,8 +301,9 @@ void construct_types_and_fields(LttFacility * fac, type_descriptor * td,
     fld->child[0]->current_element = 0;
     construct_types_and_fields(fac, tmpTd, fld->child[0]);
     break;
-  case LTT_STRUCT:
-  case LTT_UNION:
+
+  case STRUCT:
+  case UNION:
     fld->field_type->element_number = td->fields.position;
 
     g_assert(fld->field_type->element_type == NULL);
@@ -289,7 +311,7 @@ void construct_types_and_fields(LttFacility * fac, type_descriptor * td,
 
     fld->child = g_new(LttField*, td->fields.position);      
     for(i=0;i<td->fields.position;i++){
-      tmpTd = ((type_fields*)(td->fields.array[i]))->type;
+      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); 
@@ -298,7 +320,7 @@ void construct_types_and_fields(LttFacility * fac, type_descriptor * td,
       fld->child[i]->field_type = fld->field_type->element_type[i]; 
 
       fld->child[i]->field_type->element_name 
-	          = g_quark_from_string(((type_fields*)(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;
@@ -311,8 +333,8 @@ void construct_types_and_fields(LttFacility * fac, type_descriptor * td,
       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");
   }
@@ -415,17 +437,22 @@ void construct_types_and_fields(LttFacility * fac, type_descriptor * td,
  *                     : either find the named type, or create a new LttType
  ****************************************************************************/
 
-LttType * lookup_named_type(LttFacility *fac, type_descriptor * td)
+LttType * lookup_named_type(LttFacility *fac, type_descriptor_t * td)
 {
-  GQuark name = g_quark_from_string(td->type_name);
+  LttType *type = NULL;
+  GQuark name = 0;
+  
+  if(td->type_name != NULL) {
+    /* Named type */
+    name = g_quark_from_string(td->type_name);
+  
+    type = g_datalist_id_get_data(&fac->named_types, name);
+  }
   
-  LttType *type = g_datalist_id_get_data(&fac->named_types, name);
-
   if(type == NULL){
+    /* Create the type */
     type = g_new(LttType,1);
     type->type_name = name;
-    g_datalist_id_set_data_full(&fac->named_types, name,
-        type, (GDestroyNotify)freeLttNamedType);
     type->type_class = td->type;
     if(td->fmt) type->fmt = g_strdup(td->fmt);
     else type->fmt = NULL;
@@ -433,8 +460,11 @@ LttType * lookup_named_type(LttFacility *fac, type_descriptor * td)
     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 type;
 }
 
@@ -493,6 +523,7 @@ void freeLttType(LttType ** type)
 {
   unsigned int i;
   if(*type == NULL) return;
+  if((*type)->type_name != 0) return; //this is a named type.
   //if((*type)->type_name){
   //  return; //this is a named type
   //}
@@ -602,6 +633,8 @@ guint8 ltt_facility_eventtype_number(LttFacility *f)
 
 LttEventType *ltt_facility_eventtype_get(LttFacility *f, guint8 i)
 {
+  if(!f->exists) return NULL;
+
   g_assert(i < f->events->len);
   return &g_array_index(f->events, LttEventType, i);
 }
@@ -620,6 +653,6 @@ LttEventType *ltt_facility_eventtype_get(LttFacility *f, guint8 i)
 
 LttEventType *ltt_facility_eventtype_get_by_name(LttFacility *f, GQuark name)
 {
-  LttEventType *et = g_datalist_get_data(f->events_by_name, name);
+  LttEventType *et = g_datalist_id_get_data(&f->events_by_name, name);
 }