branch for major stability breakage

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@1440 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 23 insertions, 2 deletions

diff --git a/src/common/db.h b/src/common/db.h
index ea9aceab0..6980099cf 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -13,6 +13,14 @@ struct dbn {
 	int color;
 	void *key;
 	void *data;
+	int deleted;	// 削除済みフラグ(db_foreach)
+	struct dbn *next;
+	struct dbn *prev;
+};
+
+struct db_free {
+  struct dbn *z;
+  struct dbn **root;
 };
 
 struct dbt {
@@ -22,6 +30,15 @@ struct dbt {
 	void (*release)(struct dbn*,int which);
 	int maxlen;
 	struct dbn *ht[HASH_SIZE];
+	int item_count; // vf?
+	const char* alloc_file; // DB?t@C
+	int alloc_line; // DB?s
+	// db_foreach 内部でdb_erase される対策として、
+	// db_foreach が終わるまでロックすることにする
+	struct db_free *free_list;
+	int free_count;
+	int free_max;
+	int free_lock;
 };
 
 #define strdb_search(t,k)   db_search((t),(void*)(k))
@@ -34,14 +51,18 @@ struct dbt {
 #define numdb_erase(t,k)    db_erase ((t),(void*)(k))
 #define numdb_foreach       db_foreach
 #define numdb_final         db_final
+#define strdb_init(a)       strdb_init_(a,__FILE__,__LINE__)
+#define numdb_init()        numdb_init_(__FILE__,__LINE__)
+
+struct dbt* strdb_init_(int maxlen,const char *file,int line);
+struct dbt* numdb_init_(const char *file,int line);
 
-struct dbt* strdb_init(int maxlen);
-struct dbt* numdb_init(void);
 void* db_search(struct dbt *table,void* key);
 void* db_search2(struct dbt *table, const char *key); // [MouseJstr]
 struct dbn* db_insert(struct dbt *table,void* key,void* data);
 void* db_erase(struct dbt *table,void* key);
 void db_foreach(struct dbt*,int(*)(void*,void*,va_list),...);
 void db_final(struct dbt*,int(*)(void*,void*,va_list),...);
+void exit_dbn(void);
 
 #endif