update.

[chise/concord.git] / concord.c

diff --git a/concord.c b/concord.c
index 71d5d4d..4e220e9 100644 (file)
--- a/concord.c
+++ b/concord.c
@@ -25,8 +25,19 @@
 #include "concord.h"
 #include "cos-i.h"
 #include "concord-name.h"
+#include "cos-hash.h"
 #include "concord-bdb.h"
 
+COS_Feature concord_opened_feature_list = NULL;
+COS_Feature concord_opened_feature_list_last = NULL;
+size_t concord_opened_feature_list_length = 0;
+size_t concord_opened_feature_list_limit = 96;
+
+COS_Feature_INDEX concord_opened_index_list = NULL;
+COS_Feature_INDEX concord_opened_index_list_last = NULL;
+size_t concord_opened_index_list_length = 0;
+size_t concord_opened_index_list_limit = 32;
+
 
 int
 CONCORD_String_size (const CONCORD_String s)
@@ -521,15 +532,6 @@ concord_genre_get_index (CONCORD_Genre genre, const char* name)
 }
 
 
-struct COS_Feature_ent
-{
-  COS_Object_Header header;
-  CONCORD_Genre genre;
-  char* name;
-  DB* db;
-  u_int32_t access;
-};
-
 CONCORD_Feature
 concord_genre_open_feature (CONCORD_Genre genre, const char* feature)
 {
@@ -553,6 +555,8 @@ concord_genre_open_feature (CONCORD_Genre genre, const char* feature)
       return NULL;
     }
   strcpy (table->name, feature);
+  table->value_table = NULL;
+  table->next = NULL;
   return table;
 }
 
@@ -620,6 +624,17 @@ concord_feature_setup_db (CONCORD_Feature feature, int writable)
     {
       CONCORD_Genre genre = feature->genre;
 
+      if ( concord_opened_feature_list_length
+          >= concord_opened_feature_list_limit )
+       {
+         CONCORD_Feature top_feature = concord_opened_feature_list;
+
+         CONCORD_BDB_close (top_feature->db);
+         top_feature->db = NULL;
+         concord_opened_feature_list = top_feature->next;
+         top_feature->next = NULL;
+         concord_opened_feature_list_length--;
+       }
       feature->db
        = CONCORD_BDB_open (genre->ds->location, genre->name,
                            "feature", feature->name,
@@ -628,6 +643,17 @@ concord_feature_setup_db (CONCORD_Feature feature, int writable)
       if (feature->db == NULL)
        return -1;
       feature->access = access;
+      if ( concord_opened_feature_list == NULL )
+       {
+         concord_opened_feature_list = feature;
+         concord_opened_feature_list_last = feature;
+       }
+      else
+       {
+         concord_opened_feature_list_last->next = feature;
+         concord_opened_feature_list_last = feature;
+       }
+      concord_opened_feature_list_length++;
     }
   return 0;
 }
@@ -736,15 +762,6 @@ concord_feature_foreach_obj_string (CONCORD_Feature feature,
 }
 
 
-struct COS_Feature_INDEX_ent
-{
-  COS_Object_Header header;
-  CONCORD_Genre genre;
-  char *name;
-  DB* db;
-  u_int32_t access;
-};
-
 CONCORD_INDEX
 concord_genre_open_index (CONCORD_Genre genre, const char* index)
 {
@@ -768,6 +785,8 @@ concord_genre_open_index (CONCORD_Genre genre, const char* index)
       return NULL;
     }
   strcpy (table->name, index);
+  table->decoding_table = NULL;
+  table->next = NULL;
   return table;
 }
 
@@ -835,6 +854,17 @@ concord_index_setup_db (CONCORD_INDEX index, int writable)
     {
       CONCORD_Genre genre = index->genre;
 
+      if ( concord_opened_index_list_length
+          >= concord_opened_index_list_limit )
+       {
+         CONCORD_INDEX top_index = concord_opened_index_list;
+
+         CONCORD_BDB_close (top_index->db);
+         top_index->db = NULL;
+         concord_opened_index_list = top_index->next;
+         top_index->next = NULL;
+         concord_opened_index_list_length--;
+       }
       index->db
        = CONCORD_BDB_open (genre->ds->location, genre->name,
                            "index", index->name,
@@ -843,6 +873,17 @@ concord_index_setup_db (CONCORD_INDEX index, int writable)
       if (index->db == NULL)
        return -1;
       index->access = access;
+      if ( concord_opened_index_list == NULL )
+       {
+         concord_opened_index_list = index;
+         concord_opened_index_list_last = index;
+       }
+      else
+       {
+         concord_opened_index_list_last->next = index;
+         concord_opened_index_list_last = index;
+       }
+      concord_opened_index_list_length++;
     }
   return 0;
 }