update.

[chise/concord.git] / concord.c

diff --git a/concord.c b/concord.c
index f115960..4e220e9 100644 (file)
--- a/concord.c
+++ b/concord.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003,2004,2005,2006 MORIOKA Tomohiko
+/* Copyright (C) 2003, 2004, 2005, 2006, 2011, 2013 MORIOKA Tomohiko
    This file is part of the CONCORD Library.
 
    The CONCORD Library is free software; you can redistribute it and/or
@@ -21,14 +21,23 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "sysdep.h"
 #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)
@@ -44,14 +53,10 @@ CONCORD_String_data (const CONCORD_String s)
 
 CONCORD_Genre concord_ds_open_genre (CONCORD_DS ds, const char* name);
 
-int concord_close_genre (CONCORD_Genre genre);
-
 
 CONCORD_Feature
 concord_genre_open_feature (CONCORD_Genre genre, const char* name);
 
-int concord_close_feature (CONCORD_Feature feature);
-
 
 CONCORD_INDEX
 concord_genre_open_index (CONCORD_Genre genre, const char* index);
@@ -59,15 +64,14 @@ concord_genre_open_index (CONCORD_Genre genre, const char* index);
 CONCORD_Feature
 concord_genre_get_feature_0 (CONCORD_Genre genre, const char* name);
 
-int concord_close_index (CONCORD_INDEX table);
-
 
 CONCORD_Object
 concord_default_read_object (const unsigned char* string, size_t length);
 
 
-struct CONCORD_DS_Table
+struct COS_DS_ent
 {
+  COS_Object_Header header;
   CONCORD_Backend_Type type;
   char *location;
   CONCORD_NAME_TABLE* genre_names;
@@ -87,14 +91,14 @@ concord_default_read_object (const unsigned char* str, size_t length)
     return NULL;
   strncpy ((char*)buf, (char*)str, length);
   buf[length] = '\0';
-  return buf;
+  return (CONCORD_Object)buf;
 }
 
 CONCORD_DS
 concord_open_ds (CONCORD_Backend_Type type, const char* location,
                 int subtype, int modemask)
 {
-  CONCORD_DS ds = (CONCORD_DS)malloc (sizeof (CONCORD_DS_Table));
+  CONCORD_DS ds = COS_ALLOCATE_OBJECT (DS);
   size_t len = strlen (location);
 
   if (ds == NULL)
@@ -269,8 +273,9 @@ concord_ds_foreach_genre_name (CONCORD_DS ds,
 }
 
 
-struct CONCORD_Genre_Table
+struct COS_Genre_ent
 {
+  COS_Object_Header header;
   CONCORD_DS ds;
   char *name;
   CONCORD_NAME_TABLE* feature_names;
@@ -286,7 +291,7 @@ concord_ds_open_genre (CONCORD_DS ds, const char* name)
   if (ds == NULL)
     return NULL;
 
-  genre = (CONCORD_Genre)malloc (sizeof (CONCORD_Genre_Table));
+  genre = COS_ALLOCATE_OBJECT (Genre);
   if (genre == NULL)
     return NULL;
 
@@ -527,14 +532,6 @@ concord_genre_get_index (CONCORD_Genre genre, const char* name)
 }
 
 
-struct CONCORD_Feature_Table
-{
-  CONCORD_Genre genre;
-  char* name;
-  DB* db;
-  u_int32_t access;
-};
-
 CONCORD_Feature
 concord_genre_open_feature (CONCORD_Genre genre, const char* feature)
 {
@@ -544,7 +541,7 @@ concord_genre_open_feature (CONCORD_Genre genre, const char* feature)
   if (genre == NULL)
     return NULL;
 
-  table = (CONCORD_Feature)malloc (sizeof (CONCORD_Feature_Table));
+  table = COS_ALLOCATE_OBJECT (Feature);
   if (table == NULL)
     return NULL;
 
@@ -558,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;
 }
 
@@ -625,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,
@@ -633,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;
 }
@@ -741,14 +762,6 @@ concord_feature_foreach_obj_string (CONCORD_Feature feature,
 }
 
 
-struct CONCORD_INDEX_Table
-{
-  CONCORD_Genre genre;
-  char *name;
-  DB* db;
-  u_int32_t access;
-};
-
 CONCORD_INDEX
 concord_genre_open_index (CONCORD_Genre genre, const char* index)
 {
@@ -758,7 +771,7 @@ concord_genre_open_index (CONCORD_Genre genre, const char* index)
   if (genre == NULL)
     return NULL;
 
-  table = (CONCORD_INDEX)malloc (sizeof (CONCORD_INDEX_Table));
+  table = COS_ALLOCATE_OBJECT (Feature_INDEX);
   if (table == NULL)
     return NULL;
 
@@ -772,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;
 }
 
@@ -799,6 +814,18 @@ concord_close_index (CONCORD_INDEX table)
   return status;
 }
 
+char*
+concord_index_get_name (CONCORD_INDEX index)
+{
+  return index->name;
+}
+
+CONCORD_Genre
+concord_index_get_genre (CONCORD_INDEX index)
+{
+  return index->genre;
+}
+
 int
 concord_index_setup_db (CONCORD_INDEX index, int writable)
 {
@@ -827,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,
@@ -835,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;
 }