summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/char/char.c12
-rw-r--r--src/char/int_guild.c4
-rw-r--r--src/char/inter.c2
-rw-r--r--src/common/HPM.c4
-rw-r--r--src/common/HPMi.h4
-rw-r--r--src/common/console.c2
-rw-r--r--src/common/core.c10
-rw-r--r--src/common/db.c2001
-rw-r--r--src/common/db.h123
-rw-r--r--src/common/malloc.c79
-rw-r--r--src/common/malloc.h72
-rw-r--r--src/login/login.c6
-rw-r--r--src/map/atcommand.c8
-rw-r--r--src/map/battleground.c2
-rw-r--r--src/map/chrif.c6
-rw-r--r--src/map/guild.c28
-rw-r--r--src/map/itemdb.c8
-rw-r--r--src/map/map.c14
-rw-r--r--src/map/npc.c14
-rw-r--r--src/map/script.c2
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/storage.c4
22 files changed, 1228 insertions, 1179 deletions
diff --git a/src/char/char.c b/src/char/char.c
index 6e0f5363e..00fc633df 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -187,7 +187,7 @@ static DBData create_online_char_data(DBKey key, va_list args)
character->pincode_enable = -1;
character->fd = -1;
character->waiting_disconnect = INVALID_TIMER;
- return db_ptr2data(character);
+ return DB->ptr2data(character);
}
void set_char_charselect(int account_id)
@@ -321,7 +321,7 @@ void set_char_offline(int char_id, int account_id)
*/
static int char_db_setoffline(DBKey key, DBData *data, va_list ap)
{
- struct online_char_data* character = (struct online_char_data*)db_data2ptr(data);
+ struct online_char_data* character = (struct online_char_data*)DB->data2ptr(data);
int server = va_arg(ap, int);
if (server == -1) {
character->char_id = -1;
@@ -340,7 +340,7 @@ static int char_db_setoffline(DBKey key, DBData *data, va_list ap)
*/
static int char_db_kickoffline(DBKey key, DBData *data, va_list ap)
{
- struct online_char_data* character = (struct online_char_data*)db_data2ptr(data);
+ struct online_char_data* character = (struct online_char_data*)DB->data2ptr(data);
int server_id = va_arg(ap, int);
if (server_id > -1 && character->server != server_id)
@@ -392,7 +392,7 @@ static DBData create_charstatus(DBKey key, va_list args)
struct mmo_charstatus *cp;
cp = (struct mmo_charstatus *) aCalloc(1,sizeof(struct mmo_charstatus));
cp->char_id = key.i;
- return db_ptr2data(cp);
+ return DB->ptr2data(cp);
}
int inventory_to_sql(const struct item items[], int max, int id);
@@ -4450,7 +4450,7 @@ int broadcast_user_count(int tid, unsigned int tick, int id, intptr_t data)
*/
static int send_accounts_tologin_sub(DBKey key, DBData *data, va_list ap)
{
- struct online_char_data* character = db_data2ptr(data);
+ struct online_char_data* character = DB->data2ptr(data);
int* i = va_arg(ap, int*);
if(character->server > -1)
@@ -4532,7 +4532,7 @@ static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr_
*/
static int online_data_cleanup_sub(DBKey key, DBData *data, va_list ap)
{
- struct online_char_data *character= db_data2ptr(data);
+ struct online_char_data *character= DB->data2ptr(data);
if (character->fd != -1)
return 0; //Character still connected
if (character->server == -2) //Unknown server.. set them offline
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index b666cadae..e1e012725 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -57,7 +57,7 @@ static int guild_save_timer(int tid, unsigned int tick, int id, intptr_t data)
if( last_id == 0 ) //Save the first guild in the list.
state = 1;
- for( g = db_data2ptr(iter->first(iter, &key)); dbi_exists(iter); g = db_data2ptr(iter->next(iter, &key)) )
+ for( g = DB->data2ptr(iter->first(iter, &key)); dbi_exists(iter); g = DB->data2ptr(iter->next(iter, &key)) )
{
if( state == 0 && g->guild_id == last_id )
state++; //Save next guild in the list.
@@ -739,7 +739,7 @@ int inter_guild_sql_init(void)
*/
static int guild_db_final(DBKey key, DBData *data, va_list ap)
{
- struct guild *g = db_data2ptr(data);
+ struct guild *g = DB->data2ptr(data);
if (g->save_flag&GS_MASK) {
inter_guild_tosql(g, g->save_flag&GS_MASK);
return 1;
diff --git a/src/char/inter.c b/src/char/inter.c
index 83989271e..a1b075a14 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -935,7 +935,7 @@ int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason)
int check_ttl_wisdata_sub(DBKey key, DBData *data, va_list ap)
{
unsigned long tick;
- struct WisData *wd = db_data2ptr(data);
+ struct WisData *wd = DB->data2ptr(data);
tick = va_arg(ap, unsigned long);
if (DIFF_TICK(tick, wd->tick) > WISDATA_TTL && wis_delnum < WISDELLIST_MAX)
diff --git a/src/common/HPM.c b/src/common/HPM.c
index af06811a5..28ea8f413 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -264,6 +264,8 @@ void hplugins_share_defaults(void) {
HPM->share(&SERVER_TYPE,"SERVER_TYPE");
HPM->share((void*)get_svn_revision,"get_svn_revision");
HPM->share((void*)get_git_hash,"get_git_hash");
+ HPM->share(DB, "DB");
+ HPM->share(malloclib, "malloclib");
/* socket */
HPM->share(RFIFOSKIP,"RFIFOSKIP");
HPM->share(WFIFOSET,"WFIFOSET");
@@ -284,7 +286,7 @@ void hplugins_share_defaults(void) {
HPM->share(add_timer_interval,"add_timer_interval");
HPM->share(add_timer_func_list,"add_timer_func_list");
HPM->share(delete_timer,"delete_timer");
- HPM->share(get_uptime,"get_uptime");
+ HPM->share(get_uptime,"get_uptime");
}
CPCMD(plugins) {
if( HPM->plugin_count == 0 ) {
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index a58eeed38..3cdb804e0 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -57,14 +57,14 @@ enum hp_event_types {
};
/* Hercules Plugin Mananger Include Interface */
-struct HPMi_interface {
+HPExport struct HPMi_interface {
void (*event[HPET_MAX]) (void);
bool (*addCommand) (char *name, bool (*func)(const int fd, struct map_session_data* sd, const char* command, const char* message,struct AtCommandInfo *info));
bool (*addScript) (char *name, char *args, bool (*func)(struct script_state *st));
void (*addCPCommand) (char *name, CParseFunc func);
} HPMi_s;
#ifndef _HPM_H_
- struct HPMi_interface *HPMi;
+ HPExport struct HPMi_interface *HPMi;
#endif
#endif /* _HPMi_H_ */
diff --git a/src/common/console.c b/src/common/console.c
index 248dd7b45..ba93b8e09 100644
--- a/src/common/console.c
+++ b/src/common/console.c
@@ -98,7 +98,7 @@ CPCMD(help) {
}
/* [Ind/Hercules] */
CPCMD(malloc_usage) {
- unsigned int val = (unsigned int)malloc_usage();
+ unsigned int val = (unsigned int)malloclib->usage();
ShowInfo("malloc_usage: %.2f MB\n",(double)(val)/1024);
}
#define CP_DEF_C(x) { #x , NULL , NULL, NULL }
diff --git a/src/common/core.c b/src/common/core.c
index 984815bc2..0959e6fc9 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -284,9 +284,11 @@ void core_defaults(void) {
#endif
console_defaults();
strlib_defaults();
+ malloc_defaults();
#ifndef MINICORE
sql_defaults();
timer_defaults();
+ db_defaults();
#endif
}
/*======================================
@@ -305,7 +307,7 @@ int main (int argc, char **argv) {
}
core_defaults();
- malloc_init();// needed for Show* in display_title() [FlavioJS]
+ malloclib->init();// needed for Show* in display_title() [FlavioJS]
console->display_title();
@@ -320,7 +322,7 @@ int main (int argc, char **argv) {
Sql_Init();
rathread_init();
mempool_init();
- db_init();
+ DB->init();
signals_init();
#ifdef _WIN32
@@ -354,12 +356,12 @@ int main (int argc, char **argv) {
#endif
timer_final();
socket_final();
- db_final();
+ DB->final();
mempool_final();
rathread_final();
#endif
- malloc_final();
+ malloclib->final();
return 0;
}
diff --git a/src/common/db.c b/src/common/db.c
index 7ac9b2dc7..579697a99 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -1,70 +1,70 @@
/*****************************************************************************\
- * Copyright (c) Athena Dev Teams - Licensed under GNU GPL
- * For more information, see LICENCE in the main folder
- *
- * This file is separated in five sections:
- * (1) Private typedefs, enums, structures, defines and gblobal variables
- * (2) Private functions
- * (3) Protected functions used internally
- * (4) Protected functions used in the interface of the database
- * (5) Public functions
- *
- * The databases are structured as a hashtable of RED-BLACK trees.
- *
- * <B>Properties of the RED-BLACK trees being used:</B>
- * 1. The value of any node is greater than the value of its left child and
- * less than the value of its right child.
- * 2. Every node is colored either RED or BLACK.
- * 3. Every red node that is not a leaf has only black children.
- * 4. Every path from the root to a leaf contains the same number of black
- * nodes.
- * 5. The root node is black.
- * An <code>n</code> node in a RED-BLACK tree has the property that its
- * height is <code>O(lg(n))</code>.
- * Another important property is that after adding a node to a RED-BLACK
- * tree, the tree can be readjusted in <code>O(lg(n))</code> time.
- * Similarly, after deleting a node from a RED-BLACK tree, the tree can be
- * readjusted in <code>O(lg(n))</code> time.
- * {@link http://www.cs.mcgill.ca/~cs251/OldCourses/1997/topic18/}
- *
- * <B>How to add new database types:</B>
- * 1. Add the identifier of the new database type to the enum DBType
- * 2. If not already there, add the data type of the key to the union DBKey
- * 3. If the key can be considered NULL, update the function db_is_key_null
- * 4. If the key can be duplicated, update the functions db_dup_key and
- * db_dup_key_free
- * 5. Create a comparator and update the function db_default_cmp
- * 6. Create a hasher and update the function db_default_hash
- * 7. If the new database type requires or does not support some options,
- * update the function db_fix_options
- *
- * TODO:
- * - create test cases to test the database system thoroughly
- * - finish this header describing the database system
- * - create custom database allocator
- * - make the system thread friendly
- * - change the structure of the database to T-Trees
- * - create a db that organizes itself by splaying
- *
- * HISTORY:
- * 2013/04/27 - Added ERS to speed up iterator memory allocation [Ind/Hercules]
- * 2012/03/09 - Added enum for data types (int, uint, void*)
- * 2008/02/19 - Fixed db_obj_get not handling deleted entries correctly.
- * 2007/11/09 - Added an iterator to the database.
- * 2006/12/21 - Added 1-node cache to the database.
- * 2.1 (Athena build #???#) - Portability fix
- * - Fixed the portability of casting to union and added the functions
- * ensure and clear to the database.
- * 2.0 (Athena build 4859) - Transition version
- * - Almost everything recoded with a strategy similar to objects,
- * database structure is maintained.
- * 1.0 (up to Athena build 4706)
- * - Previous database system.
- *
- * @version 2006/12/21
- * @author Athena Dev team
- * @encoding US-ASCII
- * @see #db.h
+* Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+* For more information, see LICENCE in the main folder
+*
+* This file is separated in five sections:
+* (1) Private typedefs, enums, structures, defines and gblobal variables
+* (2) Private functions
+* (3) Protected functions used internally
+* (4) Protected functions used in the interface of the database
+* (5) Public functions
+*
+* The databases are structured as a hashtable of RED-BLACK trees.
+*
+* <B>Properties of the RED-BLACK trees being used:</B>
+* 1. The value of any node is greater than the value of its left child and
+* less than the value of its right child.
+* 2. Every node is colored either RED or BLACK.
+* 3. Every red node that is not a leaf has only black children.
+* 4. Every path from the root to a leaf contains the same number of black
+* nodes.
+* 5. The root node is black.
+* An <code>n</code> node in a RED-BLACK tree has the property that its
+* height is <code>O(lg(n))</code>.
+* Another important property is that after adding a node to a RED-BLACK
+* tree, the tree can be readjusted in <code>O(lg(n))</code> time.
+* Similarly, after deleting a node from a RED-BLACK tree, the tree can be
+* readjusted in <code>O(lg(n))</code> time.
+* {@link http://www.cs.mcgill.ca/~cs251/OldCourses/1997/topic18/}
+*
+* <B>How to add new database types:</B>
+* 1. Add the identifier of the new database type to the enum DBType
+* 2. If not already there, add the data type of the key to the union DBKey
+* 3. If the key can be considered NULL, update the function db_is_key_null
+* 4. If the key can be duplicated, update the functions db_dup_key and
+* db_dup_key_free
+* 5. Create a comparator and update the function db_default_cmp
+* 6. Create a hasher and update the function db_default_hash
+* 7. If the new database type requires or does not support some options,
+* update the function db_fix_options
+*
+* TODO:
+* - create test cases to test the database system thoroughly
+* - finish this header describing the database system
+* - create custom database allocator
+* - make the system thread friendly
+* - change the structure of the database to T-Trees
+* - create a db that organizes itself by splaying
+*
+* HISTORY:
+* 2013/04/27 - Added ERS to speed up iterator memory allocation [Ind/Hercules]
+* 2012/03/09 - Added enum for data types (int, uint, void*)
+* 2008/02/19 - Fixed db_obj_get not handling deleted entries correctly.
+* 2007/11/09 - Added an iterator to the database.
+* 2006/12/21 - Added 1-node cache to the database.
+* 2.1 (Athena build #???#) - Portability fix
+* - Fixed the portability of casting to union and added the functions
+* ensure and clear to the database.
+* 2.0 (Athena build 4859) - Transition version
+* - Almost everything recoded with a strategy similar to objects,
+* database structure is maintained.
+* 1.0 (up to Athena build 4706)
+* - Previous database system.
+*
+* @version 2006/12/21
+* @author Athena Dev team
+* @encoding US-ASCII
+* @see #db.h
\*****************************************************************************/
#include <stdio.h>
#include <stdlib.h>
@@ -77,58 +77,58 @@
#include "../common/strlib.h"
/*****************************************************************************\
- * (1) Private typedefs, enums, structures, defines and global variables of *
- * the database system. *
- * DB_ENABLE_STATS - Define to enable database statistics. *
- * HASH_SIZE - Define with the size of the hashtable. *
- * DBNColor - Enumeration of colors of the nodes. *
- * DBNode - Structure of a node in RED-BLACK trees. *
- * struct db_free - Structure that holds a deleted node to be freed. *
- * DBMap_impl - Struture of the database. *
- * stats - Statistics about the database system. *
+* (1) Private typedefs, enums, structures, defines and global variables of *
+* the database system. *
+* DB_ENABLE_STATS - Define to enable database statistics. *
+* HASH_SIZE - Define with the size of the hashtable. *
+* DBNColor - Enumeration of colors of the nodes. *
+* DBNode - Structure of a node in RED-BLACK trees. *
+* struct db_free - Structure that holds a deleted node to be freed. *
+* DBMap_impl - Struture of the database. *
+* stats - Statistics about the database system. *
\*****************************************************************************/
/**
- * If defined statistics about database nodes, database creating/destruction
- * and function usage are keept and displayed when finalizing the database
- * system.
- * WARNING: This adds overhead to every database operation (not shure how much).
- * @private
- * @see #DBStats
- * @see #stats
- * @see #db_final(void)
- */
+* If defined statistics about database nodes, database creating/destruction
+* and function usage are keept and displayed when finalizing the database
+* system.
+* WARNING: This adds overhead to every database operation (not shure how much).
+* @private
+* @see #DBStats
+* @see #stats
+* @see #db_final(void)
+*/
//#define DB_ENABLE_STATS
/**
- * Size of the hashtable in the database.
- * @private
- * @see DBMap_impl#ht
- */
+* Size of the hashtable in the database.
+* @private
+* @see DBMap_impl#ht
+*/
#define HASH_SIZE (256+27)
/**
- * The color of individual nodes.
- * @private
- * @see struct dbn
- */
+* The color of individual nodes.
+* @private
+* @see struct dbn
+*/
typedef enum node_color {
RED,
BLACK
} node_color;
/**
- * A node in a RED-BLACK tree of the database.
- * @param parent Parent node
- * @param left Left child node
- * @param right Right child node
- * @param key Key of this database entry
- * @param data Data of this database entry
- * @param deleted If the node is deleted
- * @param color Color of the node
- * @private
- * @see DBMap_impl#ht
- */
+* A node in a RED-BLACK tree of the database.
+* @param parent Parent node
+* @param left Left child node
+* @param right Right child node
+* @param key Key of this database entry
+* @param data Data of this database entry
+* @param deleted If the node is deleted
+* @param color Color of the node
+* @private
+* @see DBMap_impl#ht
+*/
typedef struct dbn {
// Tree structure
struct dbn *parent;
@@ -143,39 +143,39 @@ typedef struct dbn {
} *DBNode;
/**
- * Structure that holds a deleted node.
- * @param node Deleted node
- * @param root Address to the root of the tree
- * @private
- * @see DBMap_impl#free_list
- */
+* Structure that holds a deleted node.
+* @param node Deleted node
+* @param root Address to the root of the tree
+* @private
+* @see DBMap_impl#free_list
+*/
struct db_free {
DBNode node;
DBNode *root;
};
/**
- * Complete database structure.
- * @param vtable Interface of the database
- * @param alloc_file File where the database was allocated
- * @param alloc_line Line in the file where the database was allocated
- * @param free_list Array of deleted nodes to be freed
- * @param free_count Number of deleted nodes in free_list
- * @param free_max Current maximum capacity of free_list
- * @param free_lock Lock for freeing the nodes
- * @param nodes Manager of reusable tree nodes
- * @param cmp Comparator of the database
- * @param hash Hasher of the database
- * @param release Releaser of the database
- * @param ht Hashtable of RED-BLACK trees
- * @param type Type of the database
- * @param options Options of the database
- * @param item_count Number of items in the database
- * @param maxlen Maximum length of strings in DB_STRING and DB_ISTRING databases
- * @param global_lock Global lock of the database
- * @private
- * @see #db_alloc(const char*,int,DBType,DBOptions,unsigned short)
- */
+* Complete database structure.
+* @param vtable Interface of the database
+* @param alloc_file File where the database was allocated
+* @param alloc_line Line in the file where the database was allocated
+* @param free_list Array of deleted nodes to be freed
+* @param free_count Number of deleted nodes in free_list
+* @param free_max Current maximum capacity of free_list
+* @param free_lock Lock for freeing the nodes
+* @param nodes Manager of reusable tree nodes
+* @param cmp Comparator of the database
+* @param hash Hasher of the database
+* @param release Releaser of the database
+* @param ht Hashtable of RED-BLACK trees
+* @param type Type of the database
+* @param options Options of the database
+* @param item_count Number of items in the database
+* @param maxlen Maximum length of strings in DB_STRING and DB_ISTRING databases
+* @param global_lock Global lock of the database
+* @private
+* @see #db_alloc(const char*,int,DBType,DBOptions,unsigned short)
+*/
typedef struct DBMap_impl {
// Database interface
struct DBMap vtable;
@@ -202,16 +202,16 @@ typedef struct DBMap_impl {
} DBMap_impl;
/**
- * Complete iterator structure.
- * @param vtable Interface of the iterator
- * @param db Parent database
- * @param ht_index Current index of the hashtable
- * @param node Current node
- * @private
- * @see #DBIterator
- * @see #DBMap_impl
- * @see #DBNode
- */
+* Complete iterator structure.
+* @param vtable Interface of the iterator
+* @param db Parent database
+* @param ht_index Current index of the hashtable
+* @param node Current node
+* @private
+* @see #DBIterator
+* @see #DBMap_impl
+* @see #DBNode
+*/
typedef struct DBIterator_impl {
// Iterator interface
struct DBIterator vtable;
@@ -222,11 +222,11 @@ typedef struct DBIterator_impl {
#if defined(DB_ENABLE_STATS)
/**
- * Structure with what is counted when the database statistics are enabled.
- * @private
- * @see #DB_ENABLE_STATS
- * @see #stats
- */
+* Structure with what is counted when the database statistics are enabled.
+* @private
+* @see #DB_ENABLE_STATS
+* @see #stats
+*/
static struct db_stats {
// Node alloc/free
uint32 db_node_alloc;
@@ -325,30 +325,30 @@ struct eri *db_iterator_ers;
struct eri *db_alloc_ers;
/*****************************************************************************\
- * (2) Section of private functions used by the database system. *
- * db_rotate_left - Rotate a tree node to the left. *
- * db_rotate_right - Rotate a tree node to the right. *
- * db_rebalance - Rebalance the tree. *
- * db_rebalance_erase - Rebalance the tree after a BLACK node was erased. *
- * db_is_key_null - Returns not 0 if the key is considered NULL. *
- * db_dup_key - Duplicate a key for internal use. *
- * db_dup_key_free - Free the duplicated key. *
- * db_free_add - Add a node to the free_list of a database. *
- * db_free_remove - Remove a node from the free_list of a database. *
- * db_free_lock - Increment the free_lock of a database. *
- * db_free_unlock - Decrement the free_lock of a database. *
- * If it was the last lock, frees the nodes in free_list. *
- * NOTE: Keeps the database trees balanced. *
+* (2) Section of private functions used by the database system. *
+* db_rotate_left - Rotate a tree node to the left. *
+* db_rotate_right - Rotate a tree node to the right. *
+* db_rebalance - Rebalance the tree. *
+* db_rebalance_erase - Rebalance the tree after a BLACK node was erased. *
+* db_is_key_null - Returns not 0 if the key is considered NULL. *
+* db_dup_key - Duplicate a key for internal use. *
+* db_dup_key_free - Free the duplicated key. *
+* db_free_add - Add a node to the free_list of a database. *
+* db_free_remove - Remove a node from the free_list of a database. *
+* db_free_lock - Increment the free_lock of a database. *
+* db_free_unlock - Decrement the free_lock of a database. *
+* If it was the last lock, frees the nodes in free_list. *
+* NOTE: Keeps the database trees balanced. *
\*****************************************************************************/
/**
- * Rotate a node to the left.
- * @param node Node to be rotated
- * @param root Pointer to the root of the tree
- * @private
- * @see #db_rebalance(DBNode,DBNode *)
- * @see #db_rebalance_erase(DBNode,DBNode *)
- */
+* Rotate a node to the left.
+* @param node Node to be rotated
+* @param root Pointer to the root of the tree
+* @private
+* @see #db_rebalance(DBNode,DBNode *)
+* @see #db_rebalance_erase(DBNode,DBNode *)
+*/
static void db_rotate_left(DBNode node, DBNode *root)
{
DBNode y = node->right;
@@ -373,13 +373,13 @@ static void db_rotate_left(DBNode node, DBNode *root)
}
/**
- * Rotate a node to the right
- * @param node Node to be rotated
- * @param root Pointer to the root of the tree
- * @private
- * @see #db_rebalance(DBNode,DBNode *)
- * @see #db_rebalance_erase(DBNode,DBNode *)
- */
+* Rotate a node to the right
+* @param node Node to be rotated
+* @param root Pointer to the root of the tree
+* @private
+* @see #db_rebalance(DBNode,DBNode *)
+* @see #db_rebalance_erase(DBNode,DBNode *)
+*/
static void db_rotate_right(DBNode node, DBNode *root)
{
DBNode y = node->left;
@@ -404,15 +404,15 @@ static void db_rotate_right(DBNode node, DBNode *root)
}
/**
- * Rebalance the RED-BLACK tree.
- * Called when the node and it's parent are both RED.
- * @param node Node to be rebalanced
- * @param root Pointer to the root of the tree
- * @private
- * @see #db_rotate_left(DBNode,DBNode *)
- * @see #db_rotate_right(DBNode,DBNode *)
- * @see #db_obj_put(DBMap*,DBKey,DBData)
- */
+* Rebalance the RED-BLACK tree.
+* Called when the node and it's parent are both RED.
+* @param node Node to be rebalanced
+* @param root Pointer to the root of the tree
+* @private
+* @see #db_rotate_left(DBNode,DBNode *)
+* @see #db_rotate_right(DBNode,DBNode *)
+* @see #db_obj_put(DBMap*,DBKey,DBData)
+*/
static void db_rebalance(DBNode node, DBNode *root)
{
DBNode y;
@@ -467,14 +467,14 @@ static void db_rebalance(DBNode node, DBNode *root)
}
/**
- * Erase a node from the RED-BLACK tree, keeping the tree balanced.
- * @param node Node to be erased from the tree
- * @param root Root of the tree
- * @private
- * @see #db_rotate_left(DBNode,DBNode *)
- * @see #db_rotate_right(DBNode,DBNode *)
- * @see #db_free_unlock(DBMap_impl*)
- */
+* Erase a node from the RED-BLACK tree, keeping the tree balanced.
+* @param node Node to be erased from the tree
+* @param root Root of the tree
+* @private
+* @see #db_rotate_left(DBNode,DBNode *)
+* @see #db_rotate_right(DBNode,DBNode *)
+* @see #db_free_unlock(DBMap_impl*)
+*/
static void db_rebalance_erase(DBNode node, DBNode *root)
{
DBNode y = node;
@@ -510,7 +510,7 @@ static void db_rebalance_erase(DBNode node, DBNode *root)
// put the right of 'node' in 'y'
y->right = node->right;
node->right->parent = y;
- // 'y' is a direct child of 'node'
+ // 'y' is a direct child of 'node'
} else {
x_parent = y;
}
@@ -558,9 +558,9 @@ static void db_rebalance_erase(DBNode node, DBNode *root)
}
if ((w->left == NULL || w->left->color == BLACK) &&
(w->right == NULL || w->right->color == BLACK)) {
- w->color = RED;
- x = x_parent;
- x_parent = x_parent->parent;
+ w->color = RED;
+ x = x_parent;
+ x_parent = x_parent->parent;
} else {
if (w->right == NULL || w->right->color == BLACK) {
if (w->left) w->left->color = BLACK;
@@ -584,9 +584,9 @@ static void db_rebalance_erase(DBNode node, DBNode *root)
}
if ((w->right == NULL || w->right->color == BLACK) &&
(w->left == NULL || w->left->color == BLACK)) {
- w->color = RED;
- x = x_parent;
- x_parent = x_parent->parent;
+ w->color = RED;
+ x = x_parent;
+ x_parent = x_parent->parent;
} else {
if (w->left == NULL || w->left->color == BLACK) {
if (w->right) w->right->color = BLACK;
@@ -607,39 +607,39 @@ static void db_rebalance_erase(DBNode node, DBNode *root)
}
/**
- * Returns not 0 if the key is considered to be NULL.
- * @param type Type of database
- * @param key Key being tested
- * @return not 0 if considered NULL, 0 otherwise
- * @private
- * @see #db_obj_get(DBMap*,DBKey)
- * @see #db_obj_put(DBMap*,DBKey,DBData)
- * @see #db_obj_remove(DBMap*,DBKey)
- */
+* Returns not 0 if the key is considered to be NULL.
+* @param type Type of database
+* @param key Key being tested
+* @return not 0 if considered NULL, 0 otherwise
+* @private
+* @see #db_obj_get(DBMap*,DBKey)
+* @see #db_obj_put(DBMap*,DBKey,DBData)
+* @see #db_obj_remove(DBMap*,DBKey)
+*/
static int db_is_key_null(DBType type, DBKey key)
{
DB_COUNTSTAT(db_is_key_null);
switch (type) {
- case DB_STRING:
- case DB_ISTRING:
- return (key.str == NULL);
+ case DB_STRING:
+ case DB_ISTRING:
+ return (key.str == NULL);
- default: // Not a pointer
- return 0;
+ default: // Not a pointer
+ return 0;
}
}
/**
- * Duplicate the key used in the database.
- * @param db Database the key is being used in
- * @param key Key to be duplicated
- * @param Duplicated key
- * @private
- * @see #db_free_add(DBMap_impl*,DBNode,DBNode *)
- * @see #db_free_remove(DBMap_impl*,DBNode)
- * @see #db_obj_put(DBMap*,DBKey,void *)
- * @see #db_dup_key_free(DBMap_impl*,DBKey)
- */
+* Duplicate the key used in the database.
+* @param db Database the key is being used in
+* @param key Key to be duplicated
+* @param Duplicated key
+* @private
+* @see #db_free_add(DBMap_impl*,DBNode,DBNode *)
+* @see #db_free_remove(DBMap_impl*,DBNode)
+* @see #db_obj_put(DBMap*,DBKey,void *)
+* @see #db_dup_key_free(DBMap_impl*,DBKey)
+*/
static DBKey db_dup_key(DBMap_impl* db, DBKey key)
{
char *str;
@@ -647,56 +647,56 @@ static DBKey db_dup_key(DBMap_impl* db, DBKey key)
DB_COUNTSTAT(db_dup_key);
switch (db->type) {
- case DB_STRING:
- case DB_ISTRING:
- len = strnlen(key.str, db->maxlen);
- str = (char*)aMalloc(len + 1);
- memcpy(str, key.str, len);
- str[len] = '\0';
- key.str = str;
- return key;
-
- default:
- return key;
+ case DB_STRING:
+ case DB_ISTRING:
+ len = strnlen(key.str, db->maxlen);
+ str = (char*)aMalloc(len + 1);
+ memcpy(str, key.str, len);
+ str[len] = '\0';
+ key.str = str;
+ return key;
+
+ default:
+ return key;
}
}
/**
- * Free a key duplicated by db_dup_key.
- * @param db Database the key is being used in
- * @param key Key to be freed
- * @private
- * @see #db_dup_key(DBMap_impl*,DBKey)
- */
+* Free a key duplicated by db_dup_key.
+* @param db Database the key is being used in
+* @param key Key to be freed
+* @private
+* @see #db_dup_key(DBMap_impl*,DBKey)
+*/
static void db_dup_key_free(DBMap_impl* db, DBKey key)
{
DB_COUNTSTAT(db_dup_key_free);
switch (db->type) {
- case DB_STRING:
- case DB_ISTRING:
- aFree((char*)key.str);
- return;
+ case DB_STRING:
+ case DB_ISTRING:
+ aFree((char*)key.str);
+ return;
- default:
- return;
+ default:
+ return;
}
}
/**
- * Add a node to the free_list of the database.
- * Marks the node as deleted.
- * If the key isn't duplicated, the key is duplicated and released.
- * @param db Target database
- * @param root Root of the tree from the node
- * @param node Target node
- * @private
- * @see #struct db_free
- * @see DBMap_impl#free_list
- * @see DBMap_impl#free_count
- * @see DBMap_impl#free_max
- * @see #db_obj_remove(DBMap*,DBKey)
- * @see #db_free_remove(DBMap_impl*,DBNode)
- */
+* Add a node to the free_list of the database.
+* Marks the node as deleted.
+* If the key isn't duplicated, the key is duplicated and released.
+* @param db Target database
+* @param root Root of the tree from the node
+* @param node Target node
+* @private
+* @see #struct db_free
+* @see DBMap_impl#free_list
+* @see DBMap_impl#free_count
+* @see DBMap_impl#free_max
+* @see #db_obj_remove(DBMap*,DBKey)
+* @see #db_free_remove(DBMap_impl*,DBNode)
+*/
static void db_free_add(DBMap_impl* db, DBNode node, DBNode *root)
{
DBKey old_key;
@@ -704,8 +704,8 @@ static void db_free_add(DBMap_impl* db, DBNode node, DBNode *root)
DB_COUNTSTAT(db_free_add);
if (db->free_lock == (unsigned int)~0) {
ShowFatalError("db_free_add: free_lock overflow\n"
- "Database allocated at %s:%d\n",
- db->alloc_file, db->alloc_line);
+ "Database allocated at %s:%d\n",
+ db->alloc_file, db->alloc_line);
exit(EXIT_FAILURE);
}
if (!(db->options&DB_OPT_DUP_KEY)) { // Make sure we have a key until the node is freed
@@ -718,8 +718,8 @@ static void db_free_add(DBMap_impl* db, DBNode node, DBNode *root)
if (db->free_max <= db->free_count) {
if (db->free_count == (unsigned int)~0) {
ShowFatalError("db_free_add: free_count overflow\n"
- "Database allocated at %s:%d\n",
- db->alloc_file, db->alloc_line);
+ "Database allocated at %s:%d\n",
+ db->alloc_file, db->alloc_line);
exit(EXIT_FAILURE);
}
db->free_max = (unsigned int)~0;
@@ -734,18 +734,18 @@ static void db_free_add(DBMap_impl* db, DBNode node, DBNode *root)
}
/**
- * Remove a node from the free_list of the database.
- * Marks the node as not deleted.
- * NOTE: Frees the duplicated key of the node.
- * @param db Target database
- * @param node Node being removed from free_list
- * @private
- * @see #struct db_free
- * @see DBMap_impl#free_list
- * @see DBMap_impl#free_count
- * @see #db_obj_put(DBMap*,DBKey,DBData)
- * @see #db_free_add(DBMap_impl*,DBNode*,DBNode)
- */
+* Remove a node from the free_list of the database.
+* Marks the node as not deleted.
+* NOTE: Frees the duplicated key of the node.
+* @param db Target database
+* @param node Node being removed from free_list
+* @private
+* @see #struct db_free
+* @see DBMap_impl#free_list
+* @see DBMap_impl#free_count
+* @see #db_obj_put(DBMap*,DBKey,DBData)
+* @see #db_free_add(DBMap_impl*,DBNode*,DBNode)
+*/
static void db_free_remove(DBMap_impl* db, DBNode node)
{
unsigned int i;
@@ -769,35 +769,35 @@ static void db_free_remove(DBMap_impl* db, DBNode node)
}
/**
- * Increment the free_lock of the database.
- * @param db Target database
- * @private
- * @see DBMap_impl#free_lock
- * @see #db_unlock(DBMap_impl*)
- */
+* Increment the free_lock of the database.
+* @param db Target database
+* @private
+* @see DBMap_impl#free_lock
+* @see #db_unlock(DBMap_impl*)
+*/
static void db_free_lock(DBMap_impl* db)
{
DB_COUNTSTAT(db_free_lock);
if (db->free_lock == (unsigned int)~0) {
ShowFatalError("db_free_lock: free_lock overflow\n"
- "Database allocated at %s:%d\n",
- db->alloc_file, db->alloc_line);
+ "Database allocated at %s:%d\n",
+ db->alloc_file, db->alloc_line);
exit(EXIT_FAILURE);
}
db->free_lock++;
}
/**
- * Decrement the free_lock of the database.
- * If it was the last lock, frees the nodes of the database.
- * Keeps the tree balanced.
- * NOTE: Frees the duplicated keys of the nodes
- * @param db Target database
- * @private
- * @see DBMap_impl#free_lock
- * @see #db_free_dbn(DBNode)
- * @see #db_lock(DBMap_impl*)
- */
+* Decrement the free_lock of the database.
+* If it was the last lock, frees the nodes of the database.
+* Keeps the tree balanced.
+* NOTE: Frees the duplicated keys of the nodes
+* @param db Target database
+* @private
+* @see DBMap_impl#free_lock
+* @see #db_free_dbn(DBNode)
+* @see #db_lock(DBMap_impl*)
+*/
static void db_free_unlock(DBMap_impl* db)
{
unsigned int i;
@@ -805,8 +805,8 @@ static void db_free_unlock(DBMap_impl* db)
DB_COUNTSTAT(db_free_unlock);
if (db->free_lock == 0) {
ShowWarning("db_free_unlock: free_lock was already 0\n"
- "Database allocated at %s:%d\n",
- db->alloc_file, db->alloc_line);
+ "Database allocated at %s:%d\n",
+ db->alloc_file, db->alloc_line);
} else {
db->free_lock--;
}
@@ -823,36 +823,36 @@ static void db_free_unlock(DBMap_impl* db)
}
/*****************************************************************************\
- * (3) Section of protected functions used internally. *
- * NOTE: the protected functions used in the database interface are in the *
- * next section. *
- * db_int_cmp - Default comparator for DB_INT databases. *
- * db_uint_cmp - Default comparator for DB_UINT databases. *
- * db_string_cmp - Default comparator for DB_STRING databases. *
- * db_istring_cmp - Default comparator for DB_ISTRING databases. *
- * db_int_hash - Default hasher for DB_INT databases. *
- * db_uint_hash - Default hasher for DB_UINT databases. *
- * db_string_hash - Default hasher for DB_STRING databases. *
- * db_istring_hash - Default hasher for DB_ISTRING databases. *
- * db_release_nothing - Releaser that releases nothing. *
- * db_release_key - Releaser that only releases the key. *
- * db_release_data - Releaser that only releases the data. *
- * db_release_both - Releaser that releases key and data. *
+* (3) Section of protected functions used internally. *
+* NOTE: the protected functions used in the database interface are in the *
+* next section. *
+* db_int_cmp - Default comparator for DB_INT databases. *
+* db_uint_cmp - Default comparator for DB_UINT databases. *
+* db_string_cmp - Default comparator for DB_STRING databases. *
+* db_istring_cmp - Default comparator for DB_ISTRING databases. *
+* db_int_hash - Default hasher for DB_INT databases. *
+* db_uint_hash - Default hasher for DB_UINT databases. *
+* db_string_hash - Default hasher for DB_STRING databases. *
+* db_istring_hash - Default hasher for DB_ISTRING databases. *
+* db_release_nothing - Releaser that releases nothing. *
+* db_release_key - Releaser that only releases the key. *
+* db_release_data - Releaser that only releases the data. *
+* db_release_both - Releaser that releases key and data. *
\*****************************************************************************/
/**
- * Default comparator for DB_INT databases.
- * Compares key1 to key2.
- * Return 0 if equal, negative if lower and positive if higher.
- * <code>maxlen</code> is ignored.
- * @param key1 Key to be compared
- * @param key2 Key being compared to
- * @param maxlen Maximum length of the key to hash
- * @return 0 if equal, negative if lower and positive if higher
- * @see DBType#DB_INT
- * @see #DBComparator
- * @see #db_default_cmp(DBType)
- */
+* Default comparator for DB_INT databases.
+* Compares key1 to key2.
+* Return 0 if equal, negative if lower and positive if higher.
+* <code>maxlen</code> is ignored.
+* @param key1 Key to be compared
+* @param key2 Key being compared to
+* @param maxlen Maximum length of the key to hash
+* @return 0 if equal, negative if lower and positive if higher
+* @see DBType#DB_INT
+* @see #DBComparator
+* @see #db_default_cmp(DBType)
+*/
static int db_int_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
{
(void)maxlen;//not used
@@ -863,18 +863,18 @@ static int db_int_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
}
/**
- * Default comparator for DB_UINT databases.
- * Compares key1 to key2.
- * Return 0 if equal, negative if lower and positive if higher.
- * <code>maxlen</code> is ignored.
- * @param key1 Key to be compared
- * @param key2 Key being compared to
- * @param maxlen Maximum length of the key to hash
- * @return 0 if equal, negative if lower and positive if higher
- * @see DBType#DB_UINT
- * @see #DBComparator
- * @see #db_default_cmp(DBType)
- */
+* Default comparator for DB_UINT databases.
+* Compares key1 to key2.
+* Return 0 if equal, negative if lower and positive if higher.
+* <code>maxlen</code> is ignored.
+* @param key1 Key to be compared
+* @param key2 Key being compared to
+* @param maxlen Maximum length of the key to hash
+* @return 0 if equal, negative if lower and positive if higher
+* @see DBType#DB_UINT
+* @see #DBComparator
+* @see #db_default_cmp(DBType)
+*/
static int db_uint_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
{
(void)maxlen;//not used
@@ -885,17 +885,17 @@ static int db_uint_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
}
/**
- * Default comparator for DB_STRING databases.
- * Compares key1 to key2.
- * Return 0 if equal, negative if lower and positive if higher.
- * @param key1 Key to be compared
- * @param key2 Key being compared to
- * @param maxlen Maximum length of the key to hash
- * @return 0 if equal, negative if lower and positive if higher
- * @see DBType#DB_STRING
- * @see #DBComparator
- * @see #db_default_cmp(DBType)
- */
+* Default comparator for DB_STRING databases.
+* Compares key1 to key2.
+* Return 0 if equal, negative if lower and positive if higher.
+* @param key1 Key to be compared
+* @param key2 Key being compared to
+* @param maxlen Maximum length of the key to hash
+* @return 0 if equal, negative if lower and positive if higher
+* @see DBType#DB_STRING
+* @see #DBComparator
+* @see #db_default_cmp(DBType)
+*/
static int db_string_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
{
DB_COUNTSTAT(db_string_cmp);
@@ -903,17 +903,17 @@ static int db_string_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
}
/**
- * Default comparator for DB_ISTRING databases.
- * Compares key1 to key2 case insensitively.
- * Return 0 if equal, negative if lower and positive if higher.
- * @param key1 Key to be compared
- * @param key2 Key being compared to
- * @param maxlen Maximum length of the key to hash
- * @return 0 if equal, negative if lower and positive if higher
- * @see DBType#DB_ISTRING
- * @see #DBComparator
- * @see #db_default_cmp(DBType)
- */
+* Default comparator for DB_ISTRING databases.
+* Compares key1 to key2 case insensitively.
+* Return 0 if equal, negative if lower and positive if higher.
+* @param key1 Key to be compared
+* @param key2 Key being compared to
+* @param maxlen Maximum length of the key to hash
+* @return 0 if equal, negative if lower and positive if higher
+* @see DBType#DB_ISTRING
+* @see #DBComparator
+* @see #db_default_cmp(DBType)
+*/
static int db_istring_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
{
DB_COUNTSTAT(db_istring_cmp);
@@ -921,16 +921,16 @@ static int db_istring_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
}
/**
- * Default hasher for DB_INT databases.
- * Returns the value of the key as an unsigned int.
- * <code>maxlen</code> is ignored.
- * @param key Key to be hashed
- * @param maxlen Maximum length of the key to hash
- * @return hash of the key
- * @see DBType#DB_INT
- * @see #DBHasher
- * @see #db_default_hash(DBType)
- */
+* Default hasher for DB_INT databases.
+* Returns the value of the key as an unsigned int.
+* <code>maxlen</code> is ignored.
+* @param key Key to be hashed
+* @param maxlen Maximum length of the key to hash
+* @return hash of the key
+* @see DBType#DB_INT
+* @see #DBHasher
+* @see #db_default_hash(DBType)
+*/
static unsigned int db_int_hash(DBKey key, unsigned short maxlen)
{
(void)maxlen;//not used
@@ -939,16 +939,16 @@ static unsigned int db_int_hash(DBKey key, unsigned short maxlen)
}
/**
- * Default hasher for DB_UINT databases.
- * Just returns the value of the key.
- * <code>maxlen</code> is ignored.
- * @param key Key to be hashed
- * @param maxlen Maximum length of the key to hash
- * @return hash of the key
- * @see DBType#DB_UINT
- * @see #DBHasher
- * @see #db_default_hash(DBType)
- */
+* Default hasher for DB_UINT databases.
+* Just returns the value of the key.
+* <code>maxlen</code> is ignored.
+* @param key Key to be hashed
+* @param maxlen Maximum length of the key to hash
+* @return hash of the key
+* @see DBType#DB_UINT
+* @see #DBHasher
+* @see #db_default_hash(DBType)
+*/
static unsigned int db_uint_hash(DBKey key, unsigned short maxlen)
{
(void)maxlen;//not used
@@ -957,14 +957,14 @@ static unsigned int db_uint_hash(DBKey key, unsigned short maxlen)
}
/**
- * Default hasher for DB_STRING databases.
- * @param key Key to be hashed
- * @param maxlen Maximum length of the key to hash
- * @return hash of the key
- * @see DBType#DB_STRING
- * @see #DBHasher
- * @see #db_default_hash(DBType)
- */
+* Default hasher for DB_STRING databases.
+* @param key Key to be hashed
+* @param maxlen Maximum length of the key to hash
+* @return hash of the key
+* @see DBType#DB_STRING
+* @see #DBHasher
+* @see #db_default_hash(DBType)
+*/
static unsigned int db_string_hash(DBKey key, unsigned short maxlen)
{
const char *k = key.str;
@@ -984,13 +984,13 @@ static unsigned int db_string_hash(DBKey key, unsigned short maxlen)
}
/**
- * Default hasher for DB_ISTRING databases.
- * @param key Key to be hashed
- * @param maxlen Maximum length of the key to hash
- * @return hash of the key
- * @see DBType#DB_ISTRING
- * @see #db_default_hash(DBType)
- */
+* Default hasher for DB_ISTRING databases.
+* @param key Key to be hashed
+* @param maxlen Maximum length of the key to hash
+* @return hash of the key
+* @see DBType#DB_ISTRING
+* @see #db_default_hash(DBType)
+*/
static unsigned int db_istring_hash(DBKey key, unsigned short maxlen)
{
const char *k = key.str;
@@ -1010,14 +1010,14 @@ static unsigned int db_istring_hash(DBKey key, unsigned short maxlen)
}
/**
- * Releaser that releases nothing.
- * @param key Key of the database entry
- * @param data Data of the database entry
- * @param which What is being requested to be released
- * @protected
- * @see #DBReleaser
- * @see #db_default_releaser(DBType,DBOptions)
- */
+* Releaser that releases nothing.
+* @param key Key of the database entry
+* @param data Data of the database entry
+* @param which What is being requested to be released
+* @protected
+* @see #DBReleaser
+* @see #db_default_releaser(DBType,DBOptions)
+*/
static void db_release_nothing(DBKey key, DBData data, DBRelease which)
{
(void)key;(void)data;(void)which;//not used
@@ -1025,14 +1025,14 @@ static void db_release_nothing(DBKey key, DBData data, DBRelease which)
}
/**
- * Releaser that only releases the key.
- * @param key Key of the database entry
- * @param data Data of the database entry
- * @param which What is being requested to be released
- * @protected
- * @see #DBReleaser
- * @see #db_default_release(DBType,DBOptions)
- */
+* Releaser that only releases the key.
+* @param key Key of the database entry
+* @param data Data of the database entry
+* @param which What is being requested to be released
+* @protected
+* @see #DBReleaser
+* @see #db_default_release(DBType,DBOptions)
+*/
static void db_release_key(DBKey key, DBData data, DBRelease which)
{
(void)data;//not used
@@ -1041,16 +1041,16 @@ static void db_release_key(DBKey key, DBData data, DBRelease which)
}
/**
- * Releaser that only releases the data.
- * @param key Key of the database entry
- * @param data Data of the database entry
- * @param which What is being requested to be released
- * @protected
- * @see #DBData
- * @see #DBRelease
- * @see #DBReleaser
- * @see #db_default_release(DBType,DBOptions)
- */
+* Releaser that only releases the data.
+* @param key Key of the database entry
+* @param data Data of the database entry
+* @param which What is being requested to be released
+* @protected
+* @see #DBData
+* @see #DBRelease
+* @see #DBReleaser
+* @see #db_default_release(DBType,DBOptions)
+*/
static void db_release_data(DBKey key, DBData data, DBRelease which)
{
(void)key;//not used
@@ -1059,17 +1059,17 @@ static void db_release_data(DBKey key, DBData data, DBRelease which)
}
/**
- * Releaser that releases both key and data.
- * @param key Key of the database entry
- * @param data Data of the database entry
- * @param which What is being requested to be released
- * @protected
- * @see #DBKey
- * @see #DBData
- * @see #DBRelease
- * @see #DBReleaser
- * @see #db_default_release(DBType,DBOptions)
- */
+* Releaser that releases both key and data.
+* @param key Key of the database entry
+* @param data Data of the database entry
+* @param which What is being requested to be released
+* @protected
+* @see #DBKey
+* @see #DBData
+* @see #DBRelease
+* @see #DBReleaser
+* @see #db_default_release(DBType,DBOptions)
+*/
static void db_release_both(DBKey key, DBData data, DBRelease which)
{
DB_COUNTSTAT(db_release_both);
@@ -1078,52 +1078,52 @@ static void db_release_both(DBKey key, DBData data, DBRelease which)
}
/*****************************************************************************\
- * (4) Section with protected functions used in the interface of the *
- * database and interface of the iterator. *
- * dbit_obj_first - Fetches the first entry from the database. *
- * dbit_obj_last - Fetches the last entry from the database. *
- * dbit_obj_next - Fetches the next entry from the database. *
- * dbit_obj_prev - Fetches the previous entry from the database. *
- * dbit_obj_exists - Returns true if the current entry exists. *
- * dbit_obj_remove - Remove the current entry from the database. *
- * dbit_obj_destroy - Destroys the iterator, unlocking the database and *
- * freeing used memory. *
- * db_obj_iterator - Return a new database iterator. *
- * db_obj_exists - Checks if an entry exists. *
- * db_obj_get - Get the data identified by the key. *
- * db_obj_vgetall - Get the data of the matched entries. *
- * db_obj_getall - Get the data of the matched entries. *
- * db_obj_vensure - Get the data identified by the key, creating if it *
- * doesn't exist yet. *
- * db_obj_ensure - Get the data identified by the key, creating if it *
- * doesn't exist yet. *
- * db_obj_put - Put data identified by the key in the database. *
- * db_obj_remove - Remove an entry from the database. *
- * db_obj_vforeach - Apply a function to every entry in the database. *
- * db_obj_foreach - Apply a function to every entry in the database. *
- * db_obj_vclear - Remove all entries from the database. *
- * db_obj_clear - Remove all entries from the database. *
- * db_obj_vdestroy - Destroy the database, freeing all the used memory. *
- * db_obj_destroy - Destroy the database, freeing all the used memory. *
- * db_obj_size - Return the size of the database. *
- * db_obj_type - Return the type of the database. *
- * db_obj_options - Return the options of the database. *
+* (4) Section with protected functions used in the interface of the *
+* database and interface of the iterator. *
+* dbit_obj_first - Fetches the first entry from the database. *
+* dbit_obj_last - Fetches the last entry from the database. *
+* dbit_obj_next - Fetches the next entry from the database. *
+* dbit_obj_prev - Fetches the previous entry from the database. *
+* dbit_obj_exists - Returns true if the current entry exists. *
+* dbit_obj_remove - Remove the current entry from the database. *
+* dbit_obj_destroy - Destroys the iterator, unlocking the database and *
+* freeing used memory. *
+* db_obj_iterator - Return a new database iterator. *
+* db_obj_exists - Checks if an entry exists. *
+* db_obj_get - Get the data identified by the key. *
+* db_obj_vgetall - Get the data of the matched entries. *
+* db_obj_getall - Get the data of the matched entries. *
+* db_obj_vensure - Get the data identified by the key, creating if it *
+* doesn't exist yet. *
+* db_obj_ensure - Get the data identified by the key, creating if it *
+* doesn't exist yet. *
+* db_obj_put - Put data identified by the key in the database. *
+* db_obj_remove - Remove an entry from the database. *
+* db_obj_vforeach - Apply a function to every entry in the database. *
+* db_obj_foreach - Apply a function to every entry in the database. *
+* db_obj_vclear - Remove all entries from the database. *
+* db_obj_clear - Remove all entries from the database. *
+* db_obj_vdestroy - Destroy the database, freeing all the used memory. *
+* db_obj_destroy - Destroy the database, freeing all the used memory. *
+* db_obj_size - Return the size of the database. *
+* db_obj_type - Return the type of the database. *
+* db_obj_options - Return the options of the database. *
\*****************************************************************************/
/**
- * Fetches the first entry in the database.
- * Returns the data of the entry.
- * Puts the key in out_key, if out_key is not NULL.
- * @param self Iterator
- * @param out_key Key of the entry
- * @return Data of the entry
- * @protected
- * @see DBIterator#first
- */
+* Fetches the first entry in the database.
+* Returns the data of the entry.
+* Puts the key in out_key, if out_key is not NULL.
+* @param self Iterator
+* @param out_key Key of the entry
+* @return Data of the entry
+* @protected
+* @see DBIterator#first
+*/
DBData* dbit_obj_first(DBIterator* self, DBKey* out_key)
{
DBIterator_impl* it = (DBIterator_impl*)self;
-
+
DB_COUNTSTAT(dbit_first);
// position before the first entry
it->ht_index = -1;
@@ -1133,19 +1133,19 @@ DBData* dbit_obj_first(DBIterator* self, DBKey* out_key)
}
/**
- * Fetches the last entry in the database.
- * Returns the data of the entry.
- * Puts the key in out_key, if out_key is not NULL.
- * @param self Iterator
- * @param out_key Key of the entry
- * @return Data of the entry
- * @protected
- * @see DBIterator#last
- */
+* Fetches the last entry in the database.
+* Returns the data of the entry.
+* Puts the key in out_key, if out_key is not NULL.
+* @param self Iterator
+* @param out_key Key of the entry
+* @return Data of the entry
+* @protected
+* @see DBIterator#last
+*/
DBData* dbit_obj_last(DBIterator* self, DBKey* out_key)
{
DBIterator_impl* it = (DBIterator_impl*)self;
-
+
DB_COUNTSTAT(dbit_last);
// position after the last entry
it->ht_index = HASH_SIZE;
@@ -1155,15 +1155,15 @@ DBData* dbit_obj_last(DBIterator* self, DBKey* out_key)
}
/**
- * Fetches the next entry in the database.
- * Returns the data of the entry.
- * Puts the key in out_key, if out_key is not NULL.
- * @param self Iterator
- * @param out_key Key of the entry
- * @return Data of the entry
- * @protected
- * @see DBIterator#next
- */
+* Fetches the next entry in the database.
+* Returns the data of the entry.
+* Puts the key in out_key, if out_key is not NULL.
+* @param self Iterator
+* @param out_key Key of the entry
+* @return Data of the entry
+* @protected
+* @see DBIterator#next
+*/
DBData* dbit_obj_next(DBIterator* self, DBKey* out_key)
{
DBIterator_impl* it = (DBIterator_impl*)self;
@@ -1231,15 +1231,15 @@ DBData* dbit_obj_next(DBIterator* self, DBKey* out_key)
}
/**
- * Fetches the previous entry in the database.
- * Returns the data of the entry.
- * Puts the key in out_key, if out_key is not NULL.
- * @param self Iterator
- * @param out_key Key of the entry
- * @return Data of the entry
- * @protected
- * @see DBIterator#prev
- */
+* Fetches the previous entry in the database.
+* Returns the data of the entry.
+* Puts the key in out_key, if out_key is not NULL.
+* @param self Iterator
+* @param out_key Key of the entry
+* @return Data of the entry
+* @protected
+* @see DBIterator#prev
+*/
DBData* dbit_obj_prev(DBIterator* self, DBKey* out_key)
{
DBIterator_impl* it = (DBIterator_impl*)self;
@@ -1267,7 +1267,7 @@ DBData* dbit_obj_prev(DBIterator* self, DBKey* out_key)
node = &fake;
}
-
+
while( node )
{// next node
if( node->left )
@@ -1308,14 +1308,14 @@ DBData* dbit_obj_prev(DBIterator* self, DBKey* out_key)
}
/**
- * Returns true if the fetched entry exists.
- * The databases entries might have NULL data, so use this to to test if
- * the iterator is done.
- * @param self Iterator
- * @return true if the entry exists
- * @protected
- * @see DBIterator#exists
- */
+* Returns true if the fetched entry exists.
+* The databases entries might have NULL data, so use this to to test if
+* the iterator is done.
+* @param self Iterator
+* @return true if the entry exists
+* @protected
+* @see DBIterator#exists
+*/
bool dbit_obj_exists(DBIterator* self)
{
DBIterator_impl* it = (DBIterator_impl*)self;
@@ -1325,17 +1325,17 @@ bool dbit_obj_exists(DBIterator* self)
}
/**
- * Removes the current entry from the database.
- * NOTE: {@link DBIterator#exists} will return false until another entry
- * is fetched
- * Puts data of the removed entry in out_data, if out_data is not NULL.
- * @param self Iterator
- * @param out_data Data of the removed entry.
- * @return 1 if entry was removed, 0 otherwise
- * @protected
- * @see DBMap#remove
- * @see DBIterator#remove
- */
+* Removes the current entry from the database.
+* NOTE: {@link DBIterator#exists} will return false until another entry
+* is fetched
+* Puts data of the removed entry in out_data, if out_data is not NULL.
+* @param self Iterator
+* @param out_data Data of the removed entry.
+* @return 1 if entry was removed, 0 otherwise
+* @protected
+* @see DBMap#remove
+* @see DBIterator#remove
+*/
int dbit_obj_remove(DBIterator* self, DBData *out_data)
{
DBIterator_impl* it = (DBIterator_impl*)self;
@@ -1359,10 +1359,10 @@ int dbit_obj_remove(DBIterator* self, DBData *out_data)
}
/**
- * Destroys this iterator and unlocks the database.
- * @param self Iterator
- * @protected
- */
+* Destroys this iterator and unlocks the database.
+* @param self Iterator
+* @protected
+*/
void dbit_obj_destroy(DBIterator* self)
{
DBIterator_impl* it = (DBIterator_impl*)self;
@@ -1375,14 +1375,14 @@ void dbit_obj_destroy(DBIterator* self)
}
/**
- * Returns a new iterator for this database.
- * The iterator keeps the database locked until it is destroyed.
- * The database will keep functioning normally but will only free internal
- * memory when unlocked, so destroy the iterator as soon as possible.
- * @param self Database
- * @return New iterator
- * @protected
- */
+* Returns a new iterator for this database.
+* The iterator keeps the database locked until it is destroyed.
+* The database will keep functioning normally but will only free internal
+* memory when unlocked, so destroy the iterator as soon as possible.
+* @param self Database
+* @return New iterator
+* @protected
+*/
static DBIterator* db_obj_iterator(DBMap* self)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -1408,13 +1408,13 @@ static DBIterator* db_obj_iterator(DBMap* self)
}
/**
- * Returns true if the entry exists.
- * @param self Interface of the database
- * @param key Key that identifies the entry
- * @return true is the entry exists
- * @protected
- * @see DBMap#exists
- */
+* Returns true if the entry exists.
+* @param self Interface of the database
+* @param key Key that identifies the entry
+* @return true is the entry exists
+* @protected
+* @see DBMap#exists
+*/
static bool db_obj_exists(DBMap* self, DBKey key)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -1459,13 +1459,13 @@ static bool db_obj_exists(DBMap* self, DBKey key)
}
/**
- * Get the data of the entry identified by the key.
- * @param self Interface of the database
- * @param key Key that identifies the entry
- * @return Data of the entry or NULL if not found
- * @protected
- * @see DBMap#get
- */
+* Get the data of the entry identified by the key.
+* @param self Interface of the database
+* @param key Key that identifies the entry
+* @return Data of the entry or NULL if not found
+* @protected
+* @see DBMap#get
+*/
static DBData* db_obj_get(DBMap* self, DBKey key)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -1511,21 +1511,21 @@ static DBData* db_obj_get(DBMap* self, DBKey key)
}
/**
- * Get the data of the entries matched by <code>match</code>.
- * It puts a maximum of <code>max</code> entries into <code>buf</code>.
- * If <code>buf</code> is NULL, it only counts the matches.
- * Returns the number of entries that matched.
- * NOTE: if the value returned is greater than <code>max</code>, only the
- * first <code>max</code> entries found are put into the buffer.
- * @param self Interface of the database
- * @param buf Buffer to put the data of the matched entries
- * @param max Maximum number of data entries to be put into buf
- * @param match Function that matches the database entries
- * @param ... Extra arguments for match
- * @return The number of entries that matched
- * @protected
- * @see DBMap#vgetall
- */
+* Get the data of the entries matched by <code>match</code>.
+* It puts a maximum of <code>max</code> entries into <code>buf</code>.
+* If <code>buf</code> is NULL, it only counts the matches.
+* Returns the number of entries that matched.
+* NOTE: if the value returned is greater than <code>max</code>, only the
+* first <code>max</code> entries found are put into the buffer.
+* @param self Interface of the database
+* @param buf Buffer to put the data of the matched entries
+* @param max Maximum number of data entries to be put into buf
+* @param match Function that matches the database entries
+* @param ... Extra arguments for match
+* @return The number of entries that matched
+* @protected
+* @see DBMap#vgetall
+*/
static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max, DBMatcher match, va_list args)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -1554,17 +1554,17 @@ static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max,
}
va_end(argscopy);
}
-
+
if (node->left) {
node = node->left;
continue;
}
-
+
if (node->right) {
node = node->right;
continue;
}
-
+
while (node) {
parent = node->parent;
if (parent && parent->right && parent->left == node) {
@@ -1581,23 +1581,23 @@ static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max,
}
/**
- * Just calls {@link DBMap#vgetall}.
- * Get the data of the entries matched by <code>match</code>.
- * It puts a maximum of <code>max</code> entries into <code>buf</code>.
- * If <code>buf</code> is NULL, it only counts the matches.
- * Returns the number of entries that matched.
- * NOTE: if the value returned is greater than <code>max</code>, only the
- * first <code>max</code> entries found are put into the buffer.
- * @param self Interface of the database
- * @param buf Buffer to put the data of the matched entries
- * @param max Maximum number of data entries to be put into buf
- * @param match Function that matches the database entries
- * @param ... Extra arguments for match
- * @return The number of entries that matched
- * @protected
- * @see DBMap#vgetall
- * @see DBMap#getall
- */
+* Just calls {@link DBMap#vgetall}.
+* Get the data of the entries matched by <code>match</code>.
+* It puts a maximum of <code>max</code> entries into <code>buf</code>.
+* If <code>buf</code> is NULL, it only counts the matches.
+* Returns the number of entries that matched.
+* NOTE: if the value returned is greater than <code>max</code>, only the
+* first <code>max</code> entries found are put into the buffer.
+* @param self Interface of the database
+* @param buf Buffer to put the data of the matched entries
+* @param max Maximum number of data entries to be put into buf
+* @param match Function that matches the database entries
+* @param ... Extra arguments for match
+* @return The number of entries that matched
+* @protected
+* @see DBMap#vgetall
+* @see DBMap#getall
+*/
static unsigned int db_obj_getall(DBMap* self, DBData **buf, unsigned int max, DBMatcher match, ...)
{
va_list args;
@@ -1613,17 +1613,17 @@ static unsigned int db_obj_getall(DBMap* self, DBData **buf, unsigned int max, D
}
/**
- * Get the data of the entry identified by the key.
- * If the entry does not exist, an entry is added with the data returned by
- * <code>create</code>.
- * @param self Interface of the database
- * @param key Key that identifies the entry
- * @param create Function used to create the data if the entry doesn't exist
- * @param args Extra arguments for create
- * @return Data of the entry
- * @protected
- * @see DBMap#vensure
- */
+* Get the data of the entry identified by the key.
+* If the entry does not exist, an entry is added with the data returned by
+* <code>create</code>.
+* @param self Interface of the database
+* @param key Key that identifies the entry
+* @param create Function used to create the data if the entry doesn't exist
+* @param args Extra arguments for create
+* @return Data of the entry
+* @protected
+* @see DBMap#vensure
+*/
static DBData* db_obj_vensure(DBMap* self, DBKey key, DBCreateData create, va_list args)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -1666,9 +1666,9 @@ static DBData* db_obj_vensure(DBMap* self, DBKey key, DBCreateData create, va_li
va_list argscopy;
if (db->item_count == UINT32_MAX) {
ShowError("db_vensure: item_count overflow, aborting item insertion.\n"
- "Database allocated at %s:%d",
- db->alloc_file, db->alloc_line);
- return NULL;
+ "Database allocated at %s:%d",
+ db->alloc_file, db->alloc_line);
+ return NULL;
}
DB_COUNTSTAT(db_node_alloc);
node = ers_alloc(db->nodes, struct dbn);
@@ -1711,19 +1711,19 @@ static DBData* db_obj_vensure(DBMap* self, DBKey key, DBCreateData create, va_li
}
/**
- * Just calls {@link DBMap#vensure}.
- * Get the data of the entry identified by the key.
- * If the entry does not exist, an entry is added with the data returned by
- * <code>create</code>.
- * @param self Interface of the database
- * @param key Key that identifies the entry
- * @param create Function used to create the data if the entry doesn't exist
- * @param ... Extra arguments for create
- * @return Data of the entry
- * @protected
- * @see DBMap#vensure
- * @see DBMap#ensure
- */
+* Just calls {@link DBMap#vensure}.
+* Get the data of the entry identified by the key.
+* If the entry does not exist, an entry is added with the data returned by
+* <code>create</code>.
+* @param self Interface of the database
+* @param key Key that identifies the entry
+* @param create Function used to create the data if the entry doesn't exist
+* @param ... Extra arguments for create
+* @return Data of the entry
+* @protected
+* @see DBMap#vensure
+* @see DBMap#ensure
+*/
static DBData* db_obj_ensure(DBMap* self, DBKey key, DBCreateData create, ...)
{
va_list args;
@@ -1739,18 +1739,18 @@ static DBData* db_obj_ensure(DBMap* self, DBKey key, DBCreateData create, ...)
}
/**
- * Put the data identified by the key in the database.
- * Puts the previous data in out_data, if out_data is not NULL.
- * NOTE: Uses the new key, the old one is released.
- * @param self Interface of the database
- * @param key Key that identifies the data
- * @param data Data to be put in the database
- * @param out_data Previous data if the entry exists
- * @return 1 if if the entry already exists, 0 otherwise
- * @protected
- * @see #db_malloc_dbn(void)
- * @see DBMap#put
- */
+* Put the data identified by the key in the database.
+* Puts the previous data in out_data, if out_data is not NULL.
+* NOTE: Uses the new key, the old one is released.
+* @param self Interface of the database
+* @param key Key that identifies the data
+* @param data Data to be put in the database
+* @param out_data Previous data if the entry exists
+* @return 1 if if the entry already exists, 0 otherwise
+* @protected
+* @see #db_malloc_dbn(void)
+* @see DBMap#put
+*/
static int db_obj_put(DBMap* self, DBKey key, DBData data, DBData *out_data)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -1763,8 +1763,8 @@ static int db_obj_put(DBMap* self, DBKey key, DBData data, DBData *out_data)
if (db == NULL) return 0; // nullpo candidate
if (db->global_lock) {
ShowError("db_put: Database is being destroyed, aborting entry insertion.\n"
- "Database allocated at %s:%d\n",
- db->alloc_file, db->alloc_line);
+ "Database allocated at %s:%d\n",
+ db->alloc_file, db->alloc_line);
return 0; // nullpo candidate
}
if (!(db->options&DB_OPT_ALLOW_NULL_KEY) && db_is_key_null(db->type, key)) {
@@ -1778,8 +1778,8 @@ static int db_obj_put(DBMap* self, DBKey key, DBData data, DBData *out_data)
if (db->item_count == UINT32_MAX) {
ShowError("db_put: item_count overflow, aborting item insertion.\n"
- "Database allocated at %s:%d",
- db->alloc_file, db->alloc_line);
+ "Database allocated at %s:%d",
+ db->alloc_file, db->alloc_line);
return 0;
}
// search for an equal node
@@ -1845,17 +1845,17 @@ static int db_obj_put(DBMap* self, DBKey key, DBData data, DBData *out_data)
}
/**
- * Remove an entry from the database.
- * Puts the previous data in out_data, if out_data is not NULL.
- * NOTE: The key (of the database) is released in {@link #db_free_add(DBMap_impl*,DBNode,DBNode *)}.
- * @param self Interface of the database
- * @param key Key that identifies the entry
- * @param out_data Previous data if the entry exists
- * @return 1 if if the entry already exists, 0 otherwise
- * @protected
- * @see #db_free_add(DBMap_impl*,DBNode,DBNode *)
- * @see DBMap#remove
- */
+* Remove an entry from the database.
+* Puts the previous data in out_data, if out_data is not NULL.
+* NOTE: The key (of the database) is released in {@link #db_free_add(DBMap_impl*,DBNode,DBNode *)}.
+* @param self Interface of the database
+* @param key Key that identifies the entry
+* @param out_data Previous data if the entry exists
+* @return 1 if if the entry already exists, 0 otherwise
+* @protected
+* @see #db_free_add(DBMap_impl*,DBNode,DBNode *)
+* @see DBMap#remove
+*/
static int db_obj_remove(DBMap* self, DBKey key, DBData *out_data)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -1867,8 +1867,8 @@ static int db_obj_remove(DBMap* self, DBKey key, DBData *out_data)
if (db == NULL) return 0; // nullpo candidate
if (db->global_lock) {
ShowError("db_remove: Database is being destroyed. Aborting entry deletion.\n"
- "Database allocated at %s:%d\n",
- db->alloc_file, db->alloc_line);
+ "Database allocated at %s:%d\n",
+ db->alloc_file, db->alloc_line);
return 0; // nullpo candidate
}
if (!(db->options&DB_OPT_ALLOW_NULL_KEY) && db_is_key_null(db->type, key)) {
@@ -1902,15 +1902,15 @@ static int db_obj_remove(DBMap* self, DBKey key, DBData *out_data)
}
/**
- * Apply <code>func</code> to every entry in the database.
- * Returns the sum of values returned by func.
- * @param self Interface of the database
- * @param func Function to be applied
- * @param args Extra arguments for func
- * @return Sum of the values returned by func
- * @protected
- * @see DBMap#vforeach
- */
+* Apply <code>func</code> to every entry in the database.
+* Returns the sum of values returned by func.
+* @param self Interface of the database
+* @param func Function to be applied
+* @param args Extra arguments for func
+* @return Sum of the values returned by func
+* @protected
+* @see DBMap#vforeach
+*/
static int db_obj_vforeach(DBMap* self, DBApply func, va_list args)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -1960,17 +1960,17 @@ static int db_obj_vforeach(DBMap* self, DBApply func, va_list args)
}
/**
- * Just calls {@link DBMap#vforeach}.
- * Apply <code>func</code> to every entry in the database.
- * Returns the sum of values returned by func.
- * @param self Interface of the database
- * @param func Function to be applyed
- * @param ... Extra arguments for func
- * @return Sum of the values returned by func
- * @protected
- * @see DBMap#vforeach
- * @see DBMap#foreach
- */
+* Just calls {@link DBMap#vforeach}.
+* Apply <code>func</code> to every entry in the database.
+* Returns the sum of values returned by func.
+* @param self Interface of the database
+* @param func Function to be applyed
+* @param ... Extra arguments for func
+* @return Sum of the values returned by func
+* @protected
+* @see DBMap#vforeach
+* @see DBMap#foreach
+*/
static int db_obj_foreach(DBMap* self, DBApply func, ...)
{
va_list args;
@@ -1986,17 +1986,17 @@ static int db_obj_foreach(DBMap* self, DBApply func, ...)
}
/**
- * Removes all entries from the database.
- * Before deleting an entry, func is applied to it.
- * Releases the key and the data.
- * Returns the sum of values returned by func, if it exists.
- * @param self Interface of the database
- * @param func Function to be applied to every entry before deleting
- * @param args Extra arguments for func
- * @return Sum of values returned by func
- * @protected
- * @see DBMap#vclear
- */
+* Removes all entries from the database.
+* Before deleting an entry, func is applied to it.
+* Releases the key and the data.
+* Returns the sum of values returned by func, if it exists.
+* @param self Interface of the database
+* @param func Function to be applied to every entry before deleting
+* @param args Extra arguments for func
+* @return Sum of values returned by func
+* @protected
+* @see DBMap#vclear
+*/
static int db_obj_vclear(DBMap* self, DBApply func, va_list args)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -2056,21 +2056,21 @@ static int db_obj_vclear(DBMap* self, DBApply func, va_list args)
}
/**
- * Just calls {@link DBMap#vclear}.
- * Removes all entries from the database.
- * Before deleting an entry, func is applied to it.
- * Releases the key and the data.
- * Returns the sum of values returned by func, if it exists.
- * NOTE: This locks the database globally. Any attempt to insert or remove
- * a database entry will give an error and be aborted (except for clearing).
- * @param self Interface of the database
- * @param func Function to be applied to every entry before deleting
- * @param ... Extra arguments for func
- * @return Sum of values returned by func
- * @protected
- * @see DBMap#vclear
- * @see DBMap#clear
- */
+* Just calls {@link DBMap#vclear}.
+* Removes all entries from the database.
+* Before deleting an entry, func is applied to it.
+* Releases the key and the data.
+* Returns the sum of values returned by func, if it exists.
+* NOTE: This locks the database globally. Any attempt to insert or remove
+* a database entry will give an error and be aborted (except for clearing).
+* @param self Interface of the database
+* @param func Function to be applied to every entry before deleting
+* @param ... Extra arguments for func
+* @return Sum of values returned by func
+* @protected
+* @see DBMap#vclear
+* @see DBMap#clear
+*/
static int db_obj_clear(DBMap* self, DBApply func, ...)
{
va_list args;
@@ -2086,18 +2086,18 @@ static int db_obj_clear(DBMap* self, DBApply func, ...)
}
/**
- * Finalize the database, feeing all the memory it uses.
- * Before deleting an entry, func is applied to it.
- * Returns the sum of values returned by func, if it exists.
- * NOTE: This locks the database globally. Any attempt to insert or remove
- * a database entry will give an error and be aborted (except for clearing).
- * @param self Interface of the database
- * @param func Function to be applied to every entry before deleting
- * @param args Extra arguments for func
- * @return Sum of values returned by func
- * @protected
- * @see DBMap#vdestroy
- */
+* Finalize the database, feeing all the memory it uses.
+* Before deleting an entry, func is applied to it.
+* Returns the sum of values returned by func, if it exists.
+* NOTE: This locks the database globally. Any attempt to insert or remove
+* a database entry will give an error and be aborted (except for clearing).
+* @param self Interface of the database
+* @param func Function to be applied to every entry before deleting
+* @param args Extra arguments for func
+* @return Sum of values returned by func
+* @protected
+* @see DBMap#vdestroy
+*/
static int db_obj_vdestroy(DBMap* self, DBApply func, va_list args)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -2107,21 +2107,21 @@ static int db_obj_vdestroy(DBMap* self, DBApply func, va_list args)
if (db == NULL) return 0; // nullpo candidate
if (db->global_lock) {
ShowError("db_vdestroy: Database is already locked for destruction. Aborting second database destruction.\n"
- "Database allocated at %s:%d\n",
- db->alloc_file, db->alloc_line);
+ "Database allocated at %s:%d\n",
+ db->alloc_file, db->alloc_line);
return 0;
}
if (db->free_lock)
ShowWarning("db_vdestroy: Database is still in use, %u lock(s) left. Continuing database destruction.\n"
- "Database allocated at %s:%d\n",
- db->free_lock, db->alloc_file, db->alloc_line);
+ "Database allocated at %s:%d\n",
+ db->free_lock, db->alloc_file, db->alloc_line);
#ifdef DB_ENABLE_STATS
switch (db->type) {
- case DB_INT: DB_COUNTSTAT(db_int_destroy); break;
- case DB_UINT: DB_COUNTSTAT(db_uint_destroy); break;
- case DB_STRING: DB_COUNTSTAT(db_string_destroy); break;
- case DB_ISTRING: DB_COUNTSTAT(db_istring_destroy); break;
+ case DB_INT: DB_COUNTSTAT(db_int_destroy); break;
+ case DB_UINT: DB_COUNTSTAT(db_uint_destroy); break;
+ case DB_STRING: DB_COUNTSTAT(db_string_destroy); break;
+ case DB_ISTRING: DB_COUNTSTAT(db_istring_destroy); break;
}
#endif /* DB_ENABLE_STATS */
db_free_lock(db);
@@ -2137,21 +2137,21 @@ static int db_obj_vdestroy(DBMap* self, DBApply func, va_list args)
}
/**
- * Just calls {@link DBMap#db_vdestroy}.
- * Finalize the database, feeing all the memory it uses.
- * Before deleting an entry, func is applied to it.
- * Releases the key and the data.
- * Returns the sum of values returned by func, if it exists.
- * NOTE: This locks the database globally. Any attempt to insert or remove
- * a database entry will give an error and be aborted.
- * @param self Database
- * @param func Function to be applied to every entry before deleting
- * @param ... Extra arguments for func
- * @return Sum of values returned by func
- * @protected
- * @see DBMap#vdestroy
- * @see DBMap#destroy
- */
+* Just calls {@link DBMap#db_vdestroy}.
+* Finalize the database, feeing all the memory it uses.
+* Before deleting an entry, func is applied to it.
+* Releases the key and the data.
+* Returns the sum of values returned by func, if it exists.
+* NOTE: This locks the database globally. Any attempt to insert or remove
+* a database entry will give an error and be aborted.
+* @param self Database
+* @param func Function to be applied to every entry before deleting
+* @param ... Extra arguments for func
+* @return Sum of values returned by func
+* @protected
+* @see DBMap#vdestroy
+* @see DBMap#destroy
+*/
static int db_obj_destroy(DBMap* self, DBApply func, ...)
{
va_list args;
@@ -2167,13 +2167,13 @@ static int db_obj_destroy(DBMap* self, DBApply func, ...)
}
/**
- * Return the size of the database (number of items in the database).
- * @param self Interface of the database
- * @return Size of the database
- * @protected
- * @see DBMap_impl#item_count
- * @see DBMap#size
- */
+* Return the size of the database (number of items in the database).
+* @param self Interface of the database
+* @return Size of the database
+* @protected
+* @see DBMap_impl#item_count
+* @see DBMap#size
+*/
static unsigned int db_obj_size(DBMap* self)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -2190,13 +2190,13 @@ static unsigned int db_obj_size(DBMap* self)
}
/**
- * Return the type of database.
- * @param self Interface of the database
- * @return Type of the database
- * @protected
- * @see DBMap_impl#type
- * @see DBMap#type
- */
+* Return the type of database.
+* @param self Interface of the database
+* @return Type of the database
+* @protected
+* @see DBMap_impl#type
+* @see DBMap#type
+*/
static DBType db_obj_type(DBMap* self)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -2213,13 +2213,13 @@ static DBType db_obj_type(DBMap* self)
}
/**
- * Return the options of the database.
- * @param self Interface of the database
- * @return Options of the database
- * @protected
- * @see DBMap_impl#options
- * @see DBMap#options
- */
+* Return the options of the database.
+* @param self Interface of the database
+* @return Options of the database
+* @protected
+* @see DBMap_impl#options
+* @see DBMap#options
+*/
static DBOptions db_obj_options(DBMap* self)
{
DBMap_impl* db = (DBMap_impl*)self;
@@ -2236,120 +2236,121 @@ static DBOptions db_obj_options(DBMap* self)
}
/*****************************************************************************\
- * (5) Section with public functions.
- * db_fix_options - Apply database type restrictions to the options.
- * db_default_cmp - Get the default comparator for a type of database.
- * db_default_hash - Get the default hasher for a type of database.
- * db_default_release - Get the default releaser for a type of database with the specified options.
- * db_custom_release - Get a releaser that behaves a certains way.
- * db_alloc - Allocate a new database.
- * db_i2key - Manual cast from 'int' to 'DBKey'.
- * db_ui2key - Manual cast from 'unsigned int' to 'DBKey'.
- * db_str2key - Manual cast from 'unsigned char *' to 'DBKey'.
- * db_i2data - Manual cast from 'int' to 'DBData'.
- * db_ui2data - Manual cast from 'unsigned int' to 'DBData'.
- * db_ptr2data - Manual cast from 'void*' to 'DBData'.
- * db_data2i - Gets 'int' value from 'DBData'.
- * db_data2ui - Gets 'unsigned int' value from 'DBData'.
- * db_data2ptr - Gets 'void*' value from 'DBData'.
- * db_init - Initializes the database system.
- * db_final - Finalizes the database system.
+* (5) Section with public functions.
+* db_fix_options - Apply database type restrictions to the options.
+* db_default_cmp - Get the default comparator for a type of database.
+* db_default_hash - Get the default hasher for a type of database.
+* db_default_release - Get the default releaser for a type of database with the specified options.
+* db_custom_release - Get a releaser that behaves a certains way.
+* db_alloc - Allocate a new database.
+* db_i2key - Manual cast from 'int' to 'DBKey'.
+* db_ui2key - Manual cast from 'unsigned int' to 'DBKey'.
+* db_str2key - Manual cast from 'unsigned char *' to 'DBKey'.
+* db_i2data - Manual cast from 'int' to 'DBData'.
+* db_ui2data - Manual cast from 'unsigned int' to 'DBData'.
+* db_ptr2data - Manual cast from 'void*' to 'DBData'.
+* db_data2i - Gets 'int' value from 'DBData'.
+* db_data2ui - Gets 'unsigned int' value from 'DBData'.
+* db_data2ptr - Gets 'void*' value from 'DBData'.
+* db_init - Initializes the database system.
+* db_final - Finalizes the database system.
\*****************************************************************************/
/**
- * Returns the fixed options according to the database type.
- * Sets required options and unsets unsupported options.
- * For numeric databases DB_OPT_DUP_KEY and DB_OPT_RELEASE_KEY are unset.
- * @param type Type of the database
- * @param options Original options of the database
- * @return Fixed options of the database
- * @private
- * @see #db_default_release(DBType,DBOptions)
- * @see #db_alloc(const char *,int,DBType,DBOptions,unsigned short)
- */
+* Returns the fixed options according to the database type.
+* Sets required options and unsets unsupported options.
+* For numeric databases DB_OPT_DUP_KEY and DB_OPT_RELEASE_KEY are unset.
+* @param type Type of the database
+* @param options Original options of the database
+* @return Fixed options of the database
+* @private
+* @see #db_default_release(DBType,DBOptions)
+* @see #db_alloc(const char *,int,DBType,DBOptions,unsigned short)
+*/
DBOptions db_fix_options(DBType type, DBOptions options)
{
DB_COUNTSTAT(db_fix_options);
switch (type) {
- case DB_INT:
- case DB_UINT: // Numeric database, do nothing with the keys
- return (DBOptions)(options&~(DB_OPT_DUP_KEY|DB_OPT_RELEASE_KEY));
-
- default:
- ShowError("db_fix_options: Unknown database type %u with options %x\n", type, options);
- case DB_STRING:
- case DB_ISTRING: // String databases, no fix required
- return options;
+ case DB_INT:
+ case DB_UINT: // Numeric database, do nothing with the keys
+ return (DBOptions)(options&~(DB_OPT_DUP_KEY|DB_OPT_RELEASE_KEY));
+
+ default:
+ ShowError("db_fix_options: Unknown database type %u with options %x\n", type, options);
+ case DB_STRING:
+ case DB_ISTRING: // String databases, no fix required
+ return options;
}
}
+
/**
- * Returns the default comparator for the specified type of database.
- * @param type Type of database
- * @return Comparator for the type of database or NULL if unknown database
- * @public
- * @see #db_int_cmp(DBKey,DBKey,unsigned short)
- * @see #db_uint_cmp(DBKey,DBKey,unsigned short)
- * @see #db_string_cmp(DBKey,DBKey,unsigned short)
- * @see #db_istring_cmp(DBKey,DBKey,unsigned short)
- */
+* Returns the default comparator for the specified type of database.
+* @param type Type of database
+* @return Comparator for the type of database or NULL if unknown database
+* @public
+* @see #db_int_cmp(DBKey,DBKey,unsigned short)
+* @see #db_uint_cmp(DBKey,DBKey,unsigned short)
+* @see #db_string_cmp(DBKey,DBKey,unsigned short)
+* @see #db_istring_cmp(DBKey,DBKey,unsigned short)
+*/
DBComparator db_default_cmp(DBType type)
{
DB_COUNTSTAT(db_default_cmp);
switch (type) {
- case DB_INT: return &db_int_cmp;
- case DB_UINT: return &db_uint_cmp;
- case DB_STRING: return &db_string_cmp;
- case DB_ISTRING: return &db_istring_cmp;
- default:
- ShowError("db_default_cmp: Unknown database type %u\n", type);
- return NULL;
+ case DB_INT: return &db_int_cmp;
+ case DB_UINT: return &db_uint_cmp;
+ case DB_STRING: return &db_string_cmp;
+ case DB_ISTRING: return &db_istring_cmp;
+ default:
+ ShowError("db_default_cmp: Unknown database type %u\n", type);
+ return NULL;
}
}
/**
- * Returns the default hasher for the specified type of database.
- * @param type Type of database
- * @return Hasher of the type of database or NULL if unknown database
- * @public
- * @see #db_int_hash(DBKey,unsigned short)
- * @see #db_uint_hash(DBKey,unsigned short)
- * @see #db_string_hash(DBKey,unsigned short)
- * @see #db_istring_hash(DBKey,unsigned short)
- */
+* Returns the default hasher for the specified type of database.
+* @param type Type of database
+* @return Hasher of the type of database or NULL if unknown database
+* @public
+* @see #db_int_hash(DBKey,unsigned short)
+* @see #db_uint_hash(DBKey,unsigned short)
+* @see #db_string_hash(DBKey,unsigned short)
+* @see #db_istring_hash(DBKey,unsigned short)
+*/
DBHasher db_default_hash(DBType type)
{
DB_COUNTSTAT(db_default_hash);
switch (type) {
- case DB_INT: return &db_int_hash;
- case DB_UINT: return &db_uint_hash;
- case DB_STRING: return &db_string_hash;
- case DB_ISTRING: return &db_istring_hash;
- default:
- ShowError("db_default_hash: Unknown database type %u\n", type);
- return NULL;
+ case DB_INT: return &db_int_hash;
+ case DB_UINT: return &db_uint_hash;
+ case DB_STRING: return &db_string_hash;
+ case DB_ISTRING: return &db_istring_hash;
+ default:
+ ShowError("db_default_hash: Unknown database type %u\n", type);
+ return NULL;
}
}
/**
- * Returns the default releaser for the specified type of database with the
- * specified options.
- * NOTE: the options are fixed with {@link #db_fix_options(DBType,DBOptions)}
- * before choosing the releaser.
- * @param type Type of database
- * @param options Options of the database
- * @return Default releaser for the type of database with the specified options
- * @public
- * @see #db_release_nothing(DBKey,DBData,DBRelease)
- * @see #db_release_key(DBKey,DBData,DBRelease)
- * @see #db_release_data(DBKey,DBData,DBRelease)
- * @see #db_release_both(DBKey,DBData,DBRelease)
- * @see #db_custom_release(DBRelease)
- */
+* Returns the default releaser for the specified type of database with the
+* specified options.
+* NOTE: the options are fixed with {@link #db_fix_options(DBType,DBOptions)}
+* before choosing the releaser.
+* @param type Type of database
+* @param options Options of the database
+* @return Default releaser for the type of database with the specified options
+* @public
+* @see #db_release_nothing(DBKey,DBData,DBRelease)
+* @see #db_release_key(DBKey,DBData,DBRelease)
+* @see #db_release_data(DBKey,DBData,DBRelease)
+* @see #db_release_both(DBKey,DBData,DBRelease)
+* @see #db_custom_release(DBRelease)
+*/
DBReleaser db_default_release(DBType type, DBOptions options)
{
DB_COUNTSTAT(db_default_release);
- options = db_fix_options(type, options);
+ options = DB->fix_options(type, options);
if (options&DB_OPT_RELEASE_DATA) { // Release data, what about the key?
if (options&(DB_OPT_DUP_KEY|DB_OPT_RELEASE_KEY))
return &db_release_both; // Release both key and data
@@ -2361,45 +2362,45 @@ DBReleaser db_default_release(DBType type, DBOptions options)
}
/**
- * Returns the releaser that releases the specified release options.
- * @param which Options that specified what the releaser releases
- * @return Releaser for the specified release options
- * @public
- * @see #db_release_nothing(DBKey,DBData,DBRelease)
- * @see #db_release_key(DBKey,DBData,DBRelease)
- * @see #db_release_data(DBKey,DBData,DBRelease)
- * @see #db_release_both(DBKey,DBData,DBRelease)
- * @see #db_default_release(DBType,DBOptions)
- */
+* Returns the releaser that releases the specified release options.
+* @param which Options that specified what the releaser releases
+* @return Releaser for the specified release options
+* @public
+* @see #db_release_nothing(DBKey,DBData,DBRelease)
+* @see #db_release_key(DBKey,DBData,DBRelease)
+* @see #db_release_data(DBKey,DBData,DBRelease)
+* @see #db_release_both(DBKey,DBData,DBRelease)
+* @see #db_default_release(DBType,DBOptions)
+*/
DBReleaser db_custom_release(DBRelease which)
{
DB_COUNTSTAT(db_custom_release);
switch (which) {
- case DB_RELEASE_NOTHING: return &db_release_nothing;
- case DB_RELEASE_KEY: return &db_release_key;
- case DB_RELEASE_DATA: return &db_release_data;
- case DB_RELEASE_BOTH: return &db_release_both;
- default:
- ShowError("db_custom_release: Unknown release options %u\n", which);
- return NULL;
+ case DB_RELEASE_NOTHING: return &db_release_nothing;
+ case DB_RELEASE_KEY: return &db_release_key;
+ case DB_RELEASE_DATA: return &db_release_data;
+ case DB_RELEASE_BOTH: return &db_release_both;
+ default:
+ ShowError("db_custom_release: Unknown release options %u\n", which);
+ return NULL;
}
}
/**
- * Allocate a new database of the specified type.
- * NOTE: the options are fixed by {@link #db_fix_options(DBType,DBOptions)}
- * before creating the database.
- * @param file File where the database is being allocated
- * @param line Line of the file where the database is being allocated
- * @param type Type of database
- * @param options Options of the database
- * @param maxlen Maximum length of the string to be used as key in string
- * databases. If 0, the maximum number of maxlen is used (64K).
- * @return The interface of the database
- * @public
- * @see #DBMap_impl
- * @see #db_fix_options(DBType,DBOptions)
- */
+* Allocate a new database of the specified type.
+* NOTE: the options are fixed by {@link #db_fix_options(DBType,DBOptions)}
+* before creating the database.
+* @param file File where the database is being allocated
+* @param line Line of the file where the database is being allocated
+* @param type Type of database
+* @param options Options of the database
+* @param maxlen Maximum length of the string to be used as key in string
+* databases. If 0, the maximum number of maxlen is used (64K).
+* @return The interface of the database
+* @public
+* @see #DBMap_impl
+* @see #db_fix_options(DBType,DBOptions)
+*/
DBMap* db_alloc(const char *file, int line, DBType type, DBOptions options, unsigned short maxlen)
{
DBMap_impl* db;
@@ -2408,15 +2409,15 @@ DBMap* db_alloc(const char *file, int line, DBType type, DBOptions options, unsi
#ifdef DB_ENABLE_STATS
DB_COUNTSTAT(db_alloc);
switch (type) {
- case DB_INT: DB_COUNTSTAT(db_int_alloc); break;
- case DB_UINT: DB_COUNTSTAT(db_uint_alloc); break;
- case DB_STRING: DB_COUNTSTAT(db_string_alloc); break;
- case DB_ISTRING: DB_COUNTSTAT(db_istring_alloc); break;
+ case DB_INT: DB_COUNTSTAT(db_int_alloc); break;
+ case DB_UINT: DB_COUNTSTAT(db_uint_alloc); break;
+ case DB_STRING: DB_COUNTSTAT(db_string_alloc); break;
+ case DB_ISTRING: DB_COUNTSTAT(db_istring_alloc); break;
}
#endif /* DB_ENABLE_STATS */
db = ers_alloc(db_alloc_ers, struct DBMap_impl);
- options = db_fix_options(type, options);
+ options = DB->fix_options(type, options);
/* Interface of the database */
db->vtable.iterator = db_obj_iterator;
db->vtable.exists = db_obj_exists;
@@ -2446,9 +2447,9 @@ DBMap* db_alloc(const char *file, int line, DBType type, DBOptions options, unsi
db->free_lock = 0;
/* Other */
db->nodes = ers_new(sizeof(struct dbn),"db.c::db_alloc",ERS_OPT_NONE);
- db->cmp = db_default_cmp(type);
- db->hash = db_default_hash(type);
- db->release = db_default_release(type, options);
+ db->cmp = DB->default_cmp(type);
+ db->hash = DB->default_hash(type);
+ db->release = DB->default_release(type, options);
for (i = 0; i < HASH_SIZE; i++)
db->ht[i] = NULL;
db->cache = NULL;
@@ -2465,11 +2466,11 @@ DBMap* db_alloc(const char *file, int line, DBType type, DBOptions options, unsi
}
/**
- * Manual cast from 'int' to the union DBKey.
- * @param key Key to be casted
- * @return The key as a DBKey union
- * @public
- */
+* Manual cast from 'int' to the union DBKey.
+* @param key Key to be casted
+* @return The key as a DBKey union
+* @public
+*/
DBKey db_i2key(int key)
{
DBKey ret;
@@ -2480,11 +2481,11 @@ DBKey db_i2key(int key)
}
/**
- * Manual cast from 'unsigned int' to the union DBKey.
- * @param key Key to be casted
- * @return The key as a DBKey union
- * @public
- */
+* Manual cast from 'unsigned int' to the union DBKey.
+* @param key Key to be casted
+* @return The key as a DBKey union
+* @public
+*/
DBKey db_ui2key(unsigned int key)
{
DBKey ret;
@@ -2495,11 +2496,11 @@ DBKey db_ui2key(unsigned int key)
}
/**
- * Manual cast from 'const char *' to the union DBKey.
- * @param key Key to be casted
- * @return The key as a DBKey union
- * @public
- */
+* Manual cast from 'const char *' to the union DBKey.
+* @param key Key to be casted
+* @return The key as a DBKey union
+* @public
+*/
DBKey db_str2key(const char *key)
{
DBKey ret;
@@ -2510,11 +2511,11 @@ DBKey db_str2key(const char *key)
}
/**
- * Manual cast from 'int' to the struct DBData.
- * @param data Data to be casted
- * @return The data as a DBData struct
- * @public
- */
+* Manual cast from 'int' to the struct DBData.
+* @param data Data to be casted
+* @return The data as a DBData struct
+* @public
+*/
DBData db_i2data(int data)
{
DBData ret;
@@ -2526,11 +2527,11 @@ DBData db_i2data(int data)
}
/**
- * Manual cast from 'unsigned int' to the struct DBData.
- * @param data Data to be casted
- * @return The data as a DBData struct
- * @public
- */
+* Manual cast from 'unsigned int' to the struct DBData.
+* @param data Data to be casted
+* @return The data as a DBData struct
+* @public
+*/
DBData db_ui2data(unsigned int data)
{
DBData ret;
@@ -2542,11 +2543,11 @@ DBData db_ui2data(unsigned int data)
}
/**
- * Manual cast from 'void *' to the struct DBData.
- * @param data Data to be casted
- * @return The data as a DBData struct
- * @public
- */
+* Manual cast from 'void *' to the struct DBData.
+* @param data Data to be casted
+* @return The data as a DBData struct
+* @public
+*/
DBData db_ptr2data(void *data)
{
DBData ret;
@@ -2558,12 +2559,12 @@ DBData db_ptr2data(void *data)
}
/**
- * Gets int type data from struct DBData.
- * If data is not int type, returns 0.
- * @param data Data
- * @return Integer value of the data.
- * @public
- */
+* Gets int type data from struct DBData.
+* If data is not int type, returns 0.
+* @param data Data
+* @return Integer value of the data.
+* @public
+*/
int db_data2i(DBData *data)
{
DB_COUNTSTAT(db_data2i);
@@ -2573,12 +2574,12 @@ int db_data2i(DBData *data)
}
/**
- * Gets unsigned int type data from struct DBData.
- * If data is not unsigned int type, returns 0.
- * @param data Data
- * @return Unsigned int value of the data.
- * @public
- */
+* Gets unsigned int type data from struct DBData.
+* If data is not unsigned int type, returns 0.
+* @param data Data
+* @return Unsigned int value of the data.
+* @public
+*/
unsigned int db_data2ui(DBData *data)
{
DB_COUNTSTAT(db_data2ui);
@@ -2588,12 +2589,12 @@ unsigned int db_data2ui(DBData *data)
}
/**
- * Gets void* type data from struct DBData.
- * If data is not void* type, returns NULL.
- * @param data Data
- * @return Void* value of the data.
- * @public
- */
+* Gets void* type data from struct DBData.
+* If data is not void* type, returns NULL.
+* @param data Data
+* @return Void* value of the data.
+* @public
+*/
void* db_data2ptr(DBData *data)
{
DB_COUNTSTAT(db_data2ptr);
@@ -2603,10 +2604,10 @@ void* db_data2ptr(DBData *data)
}
/**
- * Initializes the database system.
- * @public
- * @see #db_final(void)
- */
+* Initializes the database system.
+* @public
+* @see #db_final(void)
+*/
void db_init(void) {
db_iterator_ers = ers_new(sizeof(struct DBIterator_impl),"db.c::db_iterator_ers",ERS_OPT_NONE);
db_alloc_ers = ers_new(sizeof(struct DBMap_impl),"db.c::db_alloc_ers",ERS_OPT_NONE);
@@ -2614,93 +2615,93 @@ void db_init(void) {
}
/**
- * Finalizes the database system.
- * @public
- * @see #db_init(void)
- */
+* Finalizes the database system.
+* @public
+* @see #db_init(void)
+*/
void db_final(void)
{
#ifdef DB_ENABLE_STATS
DB_COUNTSTAT(db_final);
ShowInfo(CL_WHITE"Database nodes"CL_RESET":\n"
- "allocated %u, freed %u\n",
- stats.db_node_alloc, stats.db_node_free);
+ "allocated %u, freed %u\n",
+ stats.db_node_alloc, stats.db_node_free);
ShowInfo(CL_WHITE"Database types"CL_RESET":\n"
- "DB_INT : allocated %10u, destroyed %10u\n"
- "DB_UINT : allocated %10u, destroyed %10u\n"
- "DB_STRING : allocated %10u, destroyed %10u\n"
- "DB_ISTRING : allocated %10u, destroyed %10u\n",
- stats.db_int_alloc, stats.db_int_destroy,
- stats.db_uint_alloc, stats.db_uint_destroy,
- stats.db_string_alloc, stats.db_string_destroy,
- stats.db_istring_alloc, stats.db_istring_destroy);
+ "DB_INT : allocated %10u, destroyed %10u\n"
+ "DB_UINT : allocated %10u, destroyed %10u\n"
+ "DB_STRING : allocated %10u, destroyed %10u\n"
+ "DB_ISTRING : allocated %10u, destroyed %10u\n",
+ stats.db_int_alloc, stats.db_int_destroy,
+ stats.db_uint_alloc, stats.db_uint_destroy,
+ stats.db_string_alloc, stats.db_string_destroy,
+ stats.db_istring_alloc, stats.db_istring_destroy);
ShowInfo(CL_WHITE"Database function counters"CL_RESET":\n"
- "db_rotate_left %10u, db_rotate_right %10u,\n"
- "db_rebalance %10u, db_rebalance_erase %10u,\n"
- "db_is_key_null %10u,\n"
- "db_dup_key %10u, db_dup_key_free %10u,\n"
- "db_free_add %10u, db_free_remove %10u,\n"
- "db_free_lock %10u, db_free_unlock %10u,\n"
- "db_int_cmp %10u, db_uint_cmp %10u,\n"
- "db_string_cmp %10u, db_istring_cmp %10u,\n"
- "db_int_hash %10u, db_uint_hash %10u,\n"
- "db_string_hash %10u, db_istring_hash %10u,\n"
- "db_release_nothing %10u, db_release_key %10u,\n"
- "db_release_data %10u, db_release_both %10u,\n"
- "dbit_first %10u, dbit_last %10u,\n"
- "dbit_next %10u, dbit_prev %10u,\n"
- "dbit_exists %10u, dbit_remove %10u,\n"
- "dbit_destroy %10u, db_iterator %10u,\n"
- "db_exits %10u, db_get %10u,\n"
- "db_getall %10u, db_vgetall %10u,\n"
- "db_ensure %10u, db_vensure %10u,\n"
- "db_put %10u, db_remove %10u,\n"
- "db_foreach %10u, db_vforeach %10u,\n"
- "db_clear %10u, db_vclear %10u,\n"
- "db_destroy %10u, db_vdestroy %10u,\n"
- "db_size %10u, db_type %10u,\n"
- "db_options %10u, db_fix_options %10u,\n"
- "db_default_cmp %10u, db_default_hash %10u,\n"
- "db_default_release %10u, db_custom_release %10u,\n"
- "db_alloc %10u, db_i2key %10u,\n"
- "db_ui2key %10u, db_str2key %10u,\n"
- "db_i2data %10u, db_ui2data %10u,\n"
- "db_ptr2data %10u, db_data2i %10u,\n"
- "db_data2ui %10u, db_data2ptr %10u,\n"
- "db_init %10u, db_final %10u\n",
- stats.db_rotate_left, stats.db_rotate_right,
- stats.db_rebalance, stats.db_rebalance_erase,
- stats.db_is_key_null,
- stats.db_dup_key, stats.db_dup_key_free,
- stats.db_free_add, stats.db_free_remove,
- stats.db_free_lock, stats.db_free_unlock,
- stats.db_int_cmp, stats.db_uint_cmp,
- stats.db_string_cmp, stats.db_istring_cmp,
- stats.db_int_hash, stats.db_uint_hash,
- stats.db_string_hash, stats.db_istring_hash,
- stats.db_release_nothing, stats.db_release_key,
- stats.db_release_data, stats.db_release_both,
- stats.dbit_first, stats.dbit_last,
- stats.dbit_next, stats.dbit_prev,
- stats.dbit_exists, stats.dbit_remove,
- stats.dbit_destroy, stats.db_iterator,
- stats.db_exists, stats.db_get,
- stats.db_getall, stats.db_vgetall,
- stats.db_ensure, stats.db_vensure,
- stats.db_put, stats.db_remove,
- stats.db_foreach, stats.db_vforeach,
- stats.db_clear, stats.db_vclear,
- stats.db_destroy, stats.db_vdestroy,
- stats.db_size, stats.db_type,
- stats.db_options, stats.db_fix_options,
- stats.db_default_cmp, stats.db_default_hash,
- stats.db_default_release, stats.db_custom_release,
- stats.db_alloc, stats.db_i2key,
- stats.db_ui2key, stats.db_str2key,
- stats.db_i2data, stats.db_ui2data,
- stats.db_ptr2data, stats.db_data2i,
- stats.db_data2ui, stats.db_data2ptr,
- stats.db_init, stats.db_final);
+ "db_rotate_left %10u, db_rotate_right %10u,\n"
+ "db_rebalance %10u, db_rebalance_erase %10u,\n"
+ "db_is_key_null %10u,\n"
+ "db_dup_key %10u, db_dup_key_free %10u,\n"
+ "db_free_add %10u, db_free_remove %10u,\n"
+ "db_free_lock %10u, db_free_unlock %10u,\n"
+ "db_int_cmp %10u, db_uint_cmp %10u,\n"
+ "db_string_cmp %10u, db_istring_cmp %10u,\n"
+ "db_int_hash %10u, db_uint_hash %10u,\n"
+ "db_string_hash %10u, db_istring_hash %10u,\n"
+ "db_release_nothing %10u, db_release_key %10u,\n"
+ "db_release_data %10u, db_release_both %10u,\n"
+ "dbit_first %10u, dbit_last %10u,\n"
+ "dbit_next %10u, dbit_prev %10u,\n"
+ "dbit_exists %10u, dbit_remove %10u,\n"
+ "dbit_destroy %10u, db_iterator %10u,\n"
+ "db_exits %10u, db_get %10u,\n"
+ "db_getall %10u, db_vgetall %10u,\n"
+ "db_ensure %10u, db_vensure %10u,\n"
+ "db_put %10u, db_remove %10u,\n"
+ "db_foreach %10u, db_vforeach %10u,\n"
+ "db_clear %10u, db_vclear %10u,\n"
+ "db_destroy %10u, db_vdestroy %10u,\n"
+ "db_size %10u, db_type %10u,\n"
+ "db_options %10u, db_fix_options %10u,\n"
+ "db_default_cmp %10u, db_default_hash %10u,\n"
+ "db_default_release %10u, db_custom_release %10u,\n"
+ "db_alloc %10u, db_i2key %10u,\n"
+ "db_ui2key %10u, db_str2key %10u,\n"
+ "db_i2data %10u, db_ui2data %10u,\n"
+ "db_ptr2data %10u, db_data2i %10u,\n"
+ "db_data2ui %10u, db_data2ptr %10u,\n"
+ "db_init %10u, db_final %10u\n",
+ stats.db_rotate_left, stats.db_rotate_right,
+ stats.db_rebalance, stats.db_rebalance_erase,
+ stats.db_is_key_null,
+ stats.db_dup_key, stats.db_dup_key_free,
+ stats.db_free_add, stats.db_free_remove,
+ stats.db_free_lock, stats.db_free_unlock,
+ stats.db_int_cmp, stats.db_uint_cmp,
+ stats.db_string_cmp, stats.db_istring_cmp,
+ stats.db_int_hash, stats.db_uint_hash,
+ stats.db_string_hash, stats.db_istring_hash,
+ stats.db_release_nothing, stats.db_release_key,
+ stats.db_release_data, stats.db_release_both,
+ stats.dbit_first, stats.dbit_last,
+ stats.dbit_next, stats.dbit_prev,
+ stats.dbit_exists, stats.dbit_remove,
+ stats.dbit_destroy, stats.db_iterator,
+ stats.db_exists, stats.db_get,
+ stats.db_getall, stats.db_vgetall,
+ stats.db_ensure, stats.db_vensure,
+ stats.db_put, stats.db_remove,
+ stats.db_foreach, stats.db_vforeach,
+ stats.db_clear, stats.db_vclear,
+ stats.db_destroy, stats.db_vdestroy,
+ stats.db_size, stats.db_type,
+ stats.db_options, stats.db_fix_options,
+ stats.db_default_cmp, stats.db_default_hash,
+ stats.db_default_release, stats.db_custom_release,
+ stats.db_alloc, stats.db_i2key,
+ stats.db_ui2key, stats.db_str2key,
+ stats.db_i2data, stats.db_ui2data,
+ stats.db_ptr2data, stats.db_data2i,
+ stats.db_data2ui, stats.db_data2ptr,
+ stats.db_init, stats.db_final);
#endif /* DB_ENABLE_STATS */
ers_destroy(db_iterator_ers);
ers_destroy(db_alloc_ers);
@@ -2828,3 +2829,25 @@ void linkdb_final( struct linkdb_node** head )
}
*head = NULL;
}
+
+void db_defaults(void)
+{
+ DB = &DB_s;
+ DB->alloc = db_alloc;
+ DB->custom_release = db_custom_release;
+ DB->data2i = db_data2i;
+ DB->data2ptr = db_data2ptr;
+ DB->data2ui = db_data2ui;
+ DB->default_cmp = db_default_cmp;
+ DB->default_hash = db_default_hash;
+ DB->default_release = db_default_release;
+ DB->final = db_final;
+ DB->fix_options = db_fix_options;
+ DB->i2data = db_i2data;
+ DB->i2key = db_i2key;
+ DB->init = db_init;
+ DB->ptr2data = db_ptr2data;
+ DB->str2key = db_str2key;
+ DB->ui2data = db_ui2data;
+ DB->ui2key = db_ui2key;
+} \ No newline at end of file
diff --git a/src/common/db.h b/src/common/db.h
index 4fe6a93d6..f1f6146be 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -599,73 +599,73 @@ struct DBMap {
// For easy access to the common functions.
#define db_exists(db,k) ( (db)->exists((db),(k)) )
-#define idb_exists(db,k) ( (db)->exists((db),db_i2key(k)) )
-#define uidb_exists(db,k) ( (db)->exists((db),db_ui2key(k)) )
-#define strdb_exists(db,k) ( (db)->exists((db),db_str2key(k)) )
+#define idb_exists(db,k) ( (db)->exists((db),DB->i2key(k)) )
+#define uidb_exists(db,k) ( (db)->exists((db),DB->ui2key(k)) )
+#define strdb_exists(db,k) ( (db)->exists((db),DB->str2key(k)) )
// Get pointer-type data from DBMaps of various key types
-#define db_get(db,k) ( db_data2ptr((db)->get((db),(k))) )
-#define idb_get(db,k) ( db_data2ptr((db)->get((db),db_i2key(k))) )
-#define uidb_get(db,k) ( db_data2ptr((db)->get((db),db_ui2key(k))) )
-#define strdb_get(db,k) ( db_data2ptr((db)->get((db),db_str2key(k))) )
+#define db_get(db,k) ( DB->data2ptr((db)->get((db),(k))) )
+#define idb_get(db,k) ( DB->data2ptr((db)->get((db),DB->i2key(k))) )
+#define uidb_get(db,k) ( DB->data2ptr((db)->get((db),DB->ui2key(k))) )
+#define strdb_get(db,k) ( DB->data2ptr((db)->get((db),DB->str2key(k))) )
// Get int-type data from DBMaps of various key types
-#define db_iget(db,k) ( db_data2i((db)->get((db),(k))) )
-#define idb_iget(db,k) ( db_data2i((db)->get((db),db_i2key(k))) )
-#define uidb_iget(db,k) ( db_data2i((db)->get((db),db_ui2key(k))) )
-#define strdb_iget(db,k) ( db_data2i((db)->get((db),db_str2key(k))) )
+#define db_iget(db,k) ( DB->data2i((db)->get((db),(k))) )
+#define idb_iget(db,k) ( DB->data2i((db)->get((db),DB->i2key(k))) )
+#define uidb_iget(db,k) ( DB->data2i((db)->get((db),DB->ui2key(k))) )
+#define strdb_iget(db,k) ( DB->data2i((db)->get((db),DB->str2key(k))) )
// Get uint-type data from DBMaps of various key types
-#define db_uiget(db,k) ( db_data2ui((db)->get((db),(k))) )
-#define idb_uiget(db,k) ( db_data2ui((db)->get((db),db_i2key(k))) )
-#define uidb_uiget(db,k) ( db_data2ui((db)->get((db),db_ui2key(k))) )
-#define strdb_uiget(db,k) ( db_data2ui((db)->get((db),db_str2key(k))) )
+#define db_uiget(db,k) ( DB->data2ui((db)->get((db),(k))) )
+#define idb_uiget(db,k) ( DB->data2ui((db)->get((db),DB->i2key(k))) )
+#define uidb_uiget(db,k) ( DB->data2ui((db)->get((db),DB->ui2key(k))) )
+#define strdb_uiget(db,k) ( DB->data2ui((db)->get((db),DB->str2key(k))) )
// Put pointer-type data into DBMaps of various key types
-#define db_put(db,k,d) ( (db)->put((db),(k),db_ptr2data(d),NULL) )
-#define idb_put(db,k,d) ( (db)->put((db),db_i2key(k),db_ptr2data(d),NULL) )
-#define uidb_put(db,k,d) ( (db)->put((db),db_ui2key(k),db_ptr2data(d),NULL) )
-#define strdb_put(db,k,d) ( (db)->put((db),db_str2key(k),db_ptr2data(d),NULL) )
+#define db_put(db,k,d) ( (db)->put((db),(k),DB->ptr2data(d),NULL) )
+#define idb_put(db,k,d) ( (db)->put((db),DB->i2key(k),DB->ptr2data(d),NULL) )
+#define uidb_put(db,k,d) ( (db)->put((db),DB->ui2key(k),DB->ptr2data(d),NULL) )
+#define strdb_put(db,k,d) ( (db)->put((db),DB->str2key(k),DB->ptr2data(d),NULL) )
// Put int-type data into DBMaps of various key types
-#define db_iput(db,k,d) ( (db)->put((db),(k),db_i2data(d),NULL) )
-#define idb_iput(db,k,d) ( (db)->put((db),db_i2key(k),db_i2data(d),NULL) )
-#define uidb_iput(db,k,d) ( (db)->put((db),db_ui2key(k),db_i2data(d),NULL) )
-#define strdb_iput(db,k,d) ( (db)->put((db),db_str2key(k),db_i2data(d),NULL) )
+#define db_iput(db,k,d) ( (db)->put((db),(k),DB->i2data(d),NULL) )
+#define idb_iput(db,k,d) ( (db)->put((db),DB->i2key(k),DB->i2data(d),NULL) )
+#define uidb_iput(db,k,d) ( (db)->put((db),DB->ui2key(k),DB->i2data(d),NULL) )
+#define strdb_iput(db,k,d) ( (db)->put((db),DB->str2key(k),DB->i2data(d),NULL) )
// Put uint-type data into DBMaps of various key types
-#define db_uiput(db,k,d) ( (db)->put((db),(k),db_ui2data(d),NULL) )
-#define idb_uiput(db,k,d) ( (db)->put((db),db_i2key(k),db_ui2data(d),NULL) )
-#define uidb_uiput(db,k,d) ( (db)->put((db),db_ui2key(k),db_ui2data(d),NULL) )
-#define strdb_uiput(db,k,d) ( (db)->put((db),db_str2key(k),db_ui2data(d),NULL) )
+#define db_uiput(db,k,d) ( (db)->put((db),(k),DB->ui2data(d),NULL) )
+#define idb_uiput(db,k,d) ( (db)->put((db),DB->i2key(k),DB->ui2data(d),NULL) )
+#define uidb_uiput(db,k,d) ( (db)->put((db),DB->ui2key(k),DB->ui2data(d),NULL) )
+#define strdb_uiput(db,k,d) ( (db)->put((db),DB->str2key(k),DB->ui2data(d),NULL) )
// Remove entry from DBMaps of various key types
#define db_remove(db,k) ( (db)->remove((db),(k),NULL) )
-#define idb_remove(db,k) ( (db)->remove((db),db_i2key(k),NULL) )
-#define uidb_remove(db,k) ( (db)->remove((db),db_ui2key(k),NULL) )
-#define strdb_remove(db,k) ( (db)->remove((db),db_str2key(k),NULL) )
+#define idb_remove(db,k) ( (db)->remove((db),DB->i2key(k),NULL) )
+#define uidb_remove(db,k) ( (db)->remove((db),DB->ui2key(k),NULL) )
+#define strdb_remove(db,k) ( (db)->remove((db),DB->str2key(k),NULL) )
//These are discarding the possible vargs you could send to the function, so those
//that require vargs must not use these defines.
-#define db_ensure(db,k,f) ( db_data2ptr((db)->ensure((db),(k),(f))) )
-#define idb_ensure(db,k,f) ( db_data2ptr((db)->ensure((db),db_i2key(k),(f))) )
-#define uidb_ensure(db,k,f) ( db_data2ptr((db)->ensure((db),db_ui2key(k),(f))) )
-#define strdb_ensure(db,k,f) ( db_data2ptr((db)->ensure((db),db_str2key(k),(f))) )
+#define db_ensure(db,k,f) ( DB->data2ptr((db)->ensure((db),(k),(f))) )
+#define idb_ensure(db,k,f) ( DB->data2ptr((db)->ensure((db),DB->i2key(k),(f))) )
+#define uidb_ensure(db,k,f) ( DB->data2ptr((db)->ensure((db),DB->ui2key(k),(f))) )
+#define strdb_ensure(db,k,f) ( DB->data2ptr((db)->ensure((db),DB->str2key(k),(f))) )
// Database creation and destruction macros
-#define idb_alloc(opt) db_alloc(__FILE__,__LINE__,DB_INT,(opt),sizeof(int))
-#define uidb_alloc(opt) db_alloc(__FILE__,__LINE__,DB_UINT,(opt),sizeof(unsigned int))
-#define strdb_alloc(opt,maxlen) db_alloc(__FILE__,__LINE__,DB_STRING,(opt),(maxlen))
-#define stridb_alloc(opt,maxlen) db_alloc(__FILE__,__LINE__,DB_ISTRING,(opt),(maxlen))
+#define idb_alloc(opt) DB->alloc(__FILE__,__LINE__,DB_INT,(opt),sizeof(int))
+#define uidb_alloc(opt) DB->alloc(__FILE__,__LINE__,DB_UINT,(opt),sizeof(unsigned int))
+#define strdb_alloc(opt,maxlen) DB->alloc(__FILE__,__LINE__,DB_STRING,(opt),(maxlen))
+#define stridb_alloc(opt,maxlen) DB->alloc(__FILE__,__LINE__,DB_ISTRING,(opt),(maxlen))
#define db_destroy(db) ( (db)->destroy((db),NULL) )
// Other macros
#define db_clear(db) ( (db)->clear(db,NULL) )
#define db_size(db) ( (db)->size(db) )
#define db_iterator(db) ( (db)->iterator(db) )
-#define dbi_first(dbi) ( db_data2ptr((dbi)->first(dbi,NULL)) )
-#define dbi_last(dbi) ( db_data2ptr((dbi)->last(dbi,NULL)) )
-#define dbi_next(dbi) ( db_data2ptr((dbi)->next(dbi,NULL)) )
-#define dbi_prev(dbi) ( db_data2ptr((dbi)->prev(dbi,NULL)) )
+#define dbi_first(dbi) ( DB->data2ptr((dbi)->first(dbi,NULL)) )
+#define dbi_last(dbi) ( DB->data2ptr((dbi)->last(dbi,NULL)) )
+#define dbi_next(dbi) ( DB->data2ptr((dbi)->next(dbi,NULL)) )
+#define dbi_prev(dbi) ( DB->data2ptr((dbi)->prev(dbi,NULL)) )
#define dbi_remove(dbi) ( (dbi)->remove(dbi,NULL) )
#define dbi_exists(dbi) ( (dbi)->exists(dbi) )
#define dbi_destroy(dbi) ( (dbi)->destroy(dbi) )
@@ -692,6 +692,7 @@ struct DBMap {
* db_final - Finalizes the database system. *
\*****************************************************************************/
+struct db_interface {
/**
* Returns the fixed options according to the database type.
* Sets required options and unsets unsupported options.
@@ -704,7 +705,7 @@ struct DBMap {
* @see #DBOptions
* @see #db_default_release(DBType,DBOptions)
*/
-DBOptions db_fix_options(DBType type, DBOptions options);
+DBOptions (*fix_options) (DBType type, DBOptions options);
/**
* Returns the default comparator for the type of database.
@@ -714,7 +715,7 @@ DBOptions db_fix_options(DBType type, DBOptions options);
* @see #DBType
* @see #DBComparator
*/
-DBComparator db_default_cmp(DBType type);
+DBComparator (*default_cmp) (DBType type);
/**
* Returns the default hasher for the specified type of database.
@@ -724,7 +725,7 @@ DBComparator db_default_cmp(DBType type);
* @see #DBType
* @see #DBHasher
*/
-DBHasher db_default_hash(DBType type);
+DBHasher (*default_hash) (DBType type);
/**
* Returns the default releaser for the specified type of database with the
@@ -741,7 +742,7 @@ DBHasher db_default_hash(DBType type);
* @see #db_fix_options(DBType,DBOptions)
* @see #db_custom_release(DBRelease)
*/
-DBReleaser db_default_release(DBType type, DBOptions options);
+DBReleaser (*default_release) (DBType type, DBOptions options);
/**
* Returns the releaser that behaves as <code>which</code> specifies.
@@ -752,7 +753,7 @@ DBReleaser db_default_release(DBType type, DBOptions options);
* @see #DBReleaser
* @see #db_default_release(DBType,DBOptions)
*/
-DBReleaser db_custom_release(DBRelease which);
+DBReleaser (*custom_release) (DBRelease which);
/**
* Allocate a new database of the specified type.
@@ -775,7 +776,7 @@ DBReleaser db_custom_release(DBRelease which);
* @see #db_default_release(DBType,DBOptions)
* @see #db_fix_options(DBType,DBOptions)
*/
-DBMap* db_alloc(const char *file, int line, DBType type, DBOptions options, unsigned short maxlen);
+DBMap* (*alloc) (const char *file, int line, DBType type, DBOptions options, unsigned short maxlen);
/**
* Manual cast from 'int' to the union DBKey.
@@ -783,7 +784,7 @@ DBMap* db_alloc(const char *file, int line, DBType type, DBOptions options, unsi
* @return The key as a DBKey union
* @public
*/
-DBKey db_i2key(int key);
+DBKey (*i2key) (int key);
/**
* Manual cast from 'unsigned int' to the union DBKey.
@@ -791,7 +792,7 @@ DBKey db_i2key(int key);
* @return The key as a DBKey union
* @public
*/
-DBKey db_ui2key(unsigned int key);
+DBKey (*ui2key) (unsigned int key);
/**
* Manual cast from 'unsigned char *' to the union DBKey.
@@ -799,7 +800,7 @@ DBKey db_ui2key(unsigned int key);
* @return The key as a DBKey union
* @public
*/
-DBKey db_str2key(const char *key);
+DBKey (*str2key) (const char *key);
/**
* Manual cast from 'int' to the struct DBData.
@@ -807,7 +808,7 @@ DBKey db_str2key(const char *key);
* @return The data as a DBData struct
* @public
*/
-DBData db_i2data(int data);
+DBData (*i2data) (int data);
/**
* Manual cast from 'unsigned int' to the struct DBData.
@@ -815,7 +816,7 @@ DBData db_i2data(int data);
* @return The data as a DBData struct
* @public
*/
-DBData db_ui2data(unsigned int data);
+DBData (*ui2data) (unsigned int data);
/**
* Manual cast from 'void *' to the struct DBData.
@@ -823,7 +824,7 @@ DBData db_ui2data(unsigned int data);
* @return The data as a DBData struct
* @public
*/
-DBData db_ptr2data(void *data);
+DBData (*ptr2data) (void *data);
/**
* Gets int type data from struct DBData.
@@ -832,7 +833,7 @@ DBData db_ptr2data(void *data);
* @return Integer value of the data.
* @public
*/
-int db_data2i(DBData *data);
+int (*data2i) (DBData *data);
/**
* Gets unsigned int type data from struct DBData.
@@ -841,7 +842,7 @@ int db_data2i(DBData *data);
* @return Unsigned int value of the data.
* @public
*/
-unsigned int db_data2ui(DBData *data);
+unsigned int (*data2ui) (DBData *data);
/**
* Gets void* type data from struct DBData.
@@ -850,14 +851,14 @@ unsigned int db_data2ui(DBData *data);
* @return Void* value of the data.
* @public
*/
-void* db_data2ptr(DBData *data);
+void* (*data2ptr) (DBData *data);
/**
* Initialize the database system.
* @public
* @see #db_final(void)
*/
-void db_init(void);
+void (*init) (void);
/**
* Finalize the database system.
@@ -865,8 +866,12 @@ void db_init(void);
* @public
* @see #db_init(void)
*/
-void db_final(void);
+void (*final) (void);
+} DB_s;
+struct db_interface *DB;
+
+void db_defaults(void);
// Link DB System - From jAthena
struct linkdb_node {
struct linkdb_node *next;
diff --git a/src/common/malloc.c b/src/common/malloc.c
index d8799b2a1..77eef2508 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -130,21 +130,21 @@ void aFree_(void *p, const char *file, int line, const char *func)
/* USE_MEMMGR */
/*
- * Memory manager
- * able to handle malloc and free efficiently
- * Since the complex processing, I might be slightly heavier.
- *
- * (I'm sorry for the poor description ^ ^;) such as data structures
- * Divided into "blocks" of a plurality of memory, "unit" of a plurality of blocks further
- * I have to divide. Size of the unit, a plurality of distribution equal to the capacity of one block
- * That's what you have. For example, if one unit of 32KB, one block 1 Yu 32Byte
- * Knit, or are able to gather 1024, gathered 512 units 64Byte
- * I can be or have. (Excluding padding, the unit_head)
- *
- * Lead-linked list (block_prev, block_next) in each other is the same size block
- * Linked list (hash_prev, hash_nect) even among such one in the block with the figure
- * I like to have. Thus, reuse of memory no longer needed can be performed efficiently.
- */
+* Memory manager
+* able to handle malloc and free efficiently
+* Since the complex processing, I might be slightly heavier.
+*
+* (I'm sorry for the poor description ^ ^;) such as data structures
+* Divided into "blocks" of a plurality of memory, "unit" of a plurality of blocks further
+* I have to divide. Size of the unit, a plurality of distribution equal to the capacity of one block
+* That's what you have. For example, if one unit of 32KB, one block 1 Yu 32Byte
+* Knit, or are able to gather 1024, gathered 512 units 64Byte
+* I can be or have. (Excluding padding, the unit_head)
+*
+* Lead-linked list (block_prev, block_next) in each other is the same size block
+* Linked list (hash_prev, hash_nect) even among such one in the block with the figure
+* I like to have. Thus, reuse of memory no longer needed can be performed efficiently.
+*/
/* Alignment of the block */
#define BLOCK_ALIGNMENT1 16
@@ -210,7 +210,7 @@ static unsigned short size2hash( size_t size )
return (unsigned short)(size + BLOCK_ALIGNMENT1 - 1) / BLOCK_ALIGNMENT1;
} else if( size <= BLOCK_DATA_SIZE ){
return (unsigned short)(size - BLOCK_DATA_SIZE1 + BLOCK_ALIGNMENT2 - 1) / BLOCK_ALIGNMENT2
- + BLOCK_DATA_COUNT1;
+ + BLOCK_DATA_COUNT1;
} else {
return 0xffff; // If it exceeds the block length hash I do not
}
@@ -235,7 +235,7 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func )
ShowError("_mmalloc: %d\n", size);
return NULL;
}
-
+
if(size == 0) {
return NULL;
}
@@ -332,7 +332,7 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func )
void* _mcalloc(size_t num, size_t size, const char *file, int line, const char *func )
{
- void *p = _mmalloc(num * size,file,line,func);
+ void *p = malloclib->malloc(num * size,file,line,func);
memset(p,0,num * size);
return p;
}
@@ -341,7 +341,7 @@ void* _mrealloc(void *memblock, size_t size, const char *file, int line, const c
{
size_t old_size;
if(memblock == NULL) {
- return _mmalloc(size,file,line,func);
+ return malloclib->malloc(size,file,line,func);
}
old_size = ((struct unit_head *)((char *)memblock - sizeof(struct unit_head) + sizeof(long)))->size;
@@ -353,11 +353,11 @@ void* _mrealloc(void *memblock, size_t size, const char *file, int line, const c
return memblock;
} else {
// Size Large
- void *p = _mmalloc(size,file,line,func);
+ void *p = malloclib->malloc(size,file,line,func);
if(p != NULL) {
memcpy(p,memblock,old_size);
}
- _mfree(memblock,file,line,func);
+ malloclib->free(memblock,file,line,func);
return p;
}
}
@@ -368,7 +368,7 @@ char* _mstrdup(const char *p, const char *file, int line, const char *func )
return NULL;
} else {
size_t len = strlen(p);
- char *string = (char *)_mmalloc(len + 1,file,line,func);
+ char *string = (char *)malloclib->malloc(len + 1,file,line,func);
memcpy(string,p,len+1);
return string;
}
@@ -544,7 +544,7 @@ static void memmgr_log (char *buf)
t = localtime(&raw);
fprintf(log_fp, "\nMemory manager: Memory leaks found at %d/%02d/%02d %02dh%02dm%02ds (rev %s).\n",
(t->tm_year+1900), (t->tm_mon+1), t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec,
- git[0] != HERC_UNKNOWN_VER ? git : svn[0] != HERC_UNKNOWN_VER ? svn : "Unknown");
+ git[0] != HERC_UNKNOWN_VER ? git : svn[0] != HERC_UNKNOWN_VER ? svn : "Unknown");
}
fprintf(log_fp, "%s", buf);
return;
@@ -621,7 +621,7 @@ static void memmgr_final (void)
memmgr_log (buf);
#endif /* LOG_MEMMGR */
// get block pointer and free it [celest]
- _mfree(ptr, ALC_MARK);
+ malloclib->free(ptr, ALC_MARK);
}
}
}
@@ -663,9 +663,9 @@ static void memmgr_init (void)
/*======================================
- * Initialise
- *--------------------------------------
- */
+* Initialise
+*--------------------------------------
+*/
/// Tests the memory for errors and memory leaks.
@@ -719,3 +719,28 @@ void malloc_init (void)
memmgr_init ();
#endif
}
+
+void malloc_defaults()
+{
+ malloclib = &malloclib_s;
+ malloclib->init = malloc_init;
+ malloclib->final = malloc_final;
+ malloclib->memory_check = malloc_memory_check;
+ malloclib->usage = malloc_usage;
+ malloclib->verify_ptr = malloc_verify_ptr;
+
+// Athena's built-in Memory Manager
+#ifdef USE_MEMMGR
+ malloclib->malloc = _mmalloc;
+ malloclib->calloc = _mcalloc;
+ malloclib->realloc = _mrealloc;
+ malloclib->strdup = _mstrdup;
+ malloclib->free = _mfree;
+#else
+ malloclib->malloc = aMalloc_;
+ malloclib->calloc = aCalloc_;
+ malloclib->realloc = aRealloc_;
+ malloclib->strdup = aStrdup_;
+ malloclib->free = aFree_;
+#endif
+}
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 6b4e8e5c4..2e745481f 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -22,9 +22,6 @@
//////////////////////////////////////////////////////////////////////
-// Athena's built-in Memory Manager
-#ifdef USE_MEMMGR
-
// Enable memory manager logging by default
#define LOG_MEMMGR
@@ -33,46 +30,24 @@
#undef LOG_MEMMGR
#endif
-# define aMalloc(n) _mmalloc(n,ALC_MARK)
-# define aCalloc(m,n) _mcalloc(m,n,ALC_MARK)
-# define aRealloc(p,n) _mrealloc(p,n,ALC_MARK)
-# define aStrdup(p) _mstrdup(p,ALC_MARK)
-# define aFree(p) _mfree(p,ALC_MARK)
-
- void* _mmalloc (size_t size, const char *file, int line, const char *func);
- void* _mcalloc (size_t num, size_t size, const char *file, int line, const char *func);
- void* _mrealloc (void *p, size_t size, const char *file, int line, const char *func);
- char* _mstrdup (const char *p, const char *file, int line, const char *func);
- void _mfree (void *p, const char *file, int line, const char *func);
-
-#else
-
-# define aMalloc(n) aMalloc_((n),ALC_MARK)
-# define aCalloc(m,n) aCalloc_((m),(n),ALC_MARK)
-# define aRealloc(p,n) aRealloc_(p,n,ALC_MARK)
-# define aStrdup(p) aStrdup_(p,ALC_MARK)
-# define aFree(p) aFree_(p,ALC_MARK)
-
- void* aMalloc_ (size_t size, const char *file, int line, const char *func);
- void* aCalloc_ (size_t num, size_t size, const char *file, int line, const char *func);
- void* aRealloc_ (void *p, size_t size, const char *file, int line, const char *func);
- char* aStrdup_ (const char *p, const char *file, int line, const char *func);
- void aFree_ (void *p, const char *file, int line, const char *func);
-
-#endif
+# define aMalloc(n) malloclib->malloc (n,ALC_MARK)
+# define aCalloc(m,n) malloclib->calloc (m,n,ALC_MARK)
+# define aRealloc(p,n) malloclib->realloc (p,n,ALC_MARK)
+# define aStrdup(p) malloclib->strdup (p,ALC_MARK)
+# define aFree(p) malloclib->free (p,ALC_MARK)
/////////////// Buffer Creation /////////////////
// Full credit for this goes to Shinomori [Ajarn]
#ifdef __GNUC__ // GCC has variable length arrays
- #define CREATE_BUFFER(name, type, size) type name[size]
- #define DELETE_BUFFER(name)
+#define CREATE_BUFFER(name, type, size) type name[size]
+#define DELETE_BUFFER(name)
#else // others don't, so we emulate them
- #define CREATE_BUFFER(name, type, size) type *name = (type *) aCalloc (size, sizeof(type))
- #define DELETE_BUFFER(name) aFree(name)
+#define CREATE_BUFFER(name, type, size) type *name = (type *) aCalloc (size, sizeof(type))
+#define DELETE_BUFFER(name) aFree(name)
#endif
@@ -83,10 +58,27 @@
////////////////////////////////////////////////
-void malloc_memory_check(void);
-bool malloc_verify_ptr(void* ptr);
-size_t malloc_usage (void);
-void malloc_init (void);
-void malloc_final (void);
-
+//void malloc_memory_check(void);
+//bool malloc_verify_ptr(void* ptr);
+//size_t malloc_usage (void);
+//void malloc_init (void);
+//void malloc_final (void);
+
+void malloc_defaults(void);
+
+struct malloc_interface {
+ void* (*malloc )(size_t size, const char *file, int line, const char *func);
+ void* (*calloc )(size_t num, size_t size, const char *file, int line, const char *func);
+ void* (*realloc )(void *p, size_t size, const char *file, int line, const char *func);
+ char* (*strdup )(const char *p, const char *file, int line, const char *func);
+ void (*free ) (void *p, const char *file, int line, const char *func);
+
+ void (*memory_check)(void);
+ bool (*verify_ptr)(void* ptr);
+ size_t (*usage) (void);
+ void (*init) (void);
+ void (*final) (void);
+} malloclib_s;
+
+struct malloc_interface *malloclib;
#endif /* _MALLOC_H_ */
diff --git a/src/login/login.c b/src/login/login.c
index 09dd938db..8dd5ce20a 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -109,7 +109,7 @@ static DBData create_online_user(DBKey key, va_list args)
p->account_id = key.i;
p->char_server = -1;
p->waiting_disconnect = INVALID_TIMER;
- return db_ptr2data(p);
+ return DB->ptr2data(p);
}
struct online_login_data* add_online_user(int char_server, int account_id)
@@ -154,7 +154,7 @@ static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr_t
*/
static int online_db_setoffline(DBKey key, DBData *data, va_list ap)
{
- struct online_login_data* p = db_data2ptr(data);
+ struct online_login_data* p = DB->data2ptr(data);
int server = va_arg(ap, int);
if( server == -1 )
{
@@ -175,7 +175,7 @@ static int online_db_setoffline(DBKey key, DBData *data, va_list ap)
*/
static int online_data_cleanup_sub(DBKey key, DBData *data, va_list ap)
{
- struct online_login_data *character= db_data2ptr(data);
+ struct online_login_data *character= DB->data2ptr(data);
if (character->char_server == -2) //Unknown server.. set them offline
remove_online_user(character->account_id);
return 0;
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 8a6399568..d923027dd 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -5350,12 +5350,12 @@ ACMD(skillid) {
iter = db_iterator(skilldb_name2id);
for( data = iter->first(iter,&key); iter->exists(iter); data = iter->next(iter,&key) ) {
- idx = skill->get_index(db_data2i(data));
+ idx = skill->get_index(DB->data2i(data));
if (strnicmp(key.str, message, skillen) == 0 || strnicmp(skill_db[idx].desc, message, skillen) == 0) {
- sprintf(atcmd_output, msg_txt(1164), db_data2i(data), skill_db[idx].desc, key.str); // skill %d: %s (%s)
+ sprintf(atcmd_output, msg_txt(1164), DB->data2i(data), skill_db[idx].desc, key.str); // skill %d: %s (%s)
clif->message(fd, atcmd_output);
} else if ( found < MAX_SKILLID_PARTIAL_RESULTS && ( stristr(key.str,message) || stristr(skill_db[idx].desc,message) ) ) {
- snprintf(partials[found++], MAX_SKILLID_PARTIAL_RESULTS_LEN, msg_txt(1164), db_data2i(data), skill_db[idx].desc, key.str);
+ snprintf(partials[found++], MAX_SKILLID_PARTIAL_RESULTS_LEN, msg_txt(1164), DB->data2i(data), skill_db[idx].desc, key.str);
}
}
@@ -9206,7 +9206,7 @@ ACMD(channel) {
iter = db_iterator(channel->banned);
for( data = iter->first(iter,&key); iter->exists(iter); data = iter->next(iter,&key) ) {
- struct hChSysBanEntry * entry = db_data2ptr(data);
+ struct hChSysBanEntry * entry = DB->data2ptr(data);
if( !isA )
sprintf(atcmd_output, msg_txt(1444), entry->name);// - %s %s
diff --git a/src/map/battleground.c b/src/map/battleground.c
index fa4db436a..618679406 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -222,7 +222,7 @@ int bg_send_message(struct map_session_data *sd, const char *mes, int len)
*/
int bg_send_xy_timer_sub(DBKey key, DBData *data, va_list ap)
{
- struct battleground_data *bg = db_data2ptr(data);
+ struct battleground_data *bg = DB->data2ptr(data);
struct map_session_data *sd;
int i;
nullpo_ret(bg);
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 05f56029b..efe976942 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -479,7 +479,7 @@ int chrif_connectack(int fd) {
* @see DBApply
*/
static int chrif_reconnect(DBKey key, DBData *data, va_list ap) {
- struct auth_node *node = db_data2ptr(data);
+ struct auth_node *node = DB->data2ptr(data);
switch (node->state) {
case ST_LOGIN:
@@ -687,7 +687,7 @@ void chrif_authfail(int fd) {/* HELLO WORLD. ip in RFIFOL 15 is not being used (
* @see DBApply
*/
int auth_db_cleanup_sub(DBKey key, DBData *data, va_list ap) {
- struct auth_node *node = db_data2ptr(data);
+ struct auth_node *node = DB->data2ptr(data);
const char* states[] = { "Login", "Logout", "Map change" };
if(DIFF_TICK(gettick(),node->node_created)>60000) {
@@ -1596,7 +1596,7 @@ void chrif_send_report(char* buf, int len) {
* @see DBApply
*/
int auth_db_final(DBKey key, DBData *data, va_list ap) {
- struct auth_node *node = db_data2ptr(data);
+ struct auth_node *node = DB->data2ptr(data);
if (node->char_dat)
aFree(node->char_dat);
diff --git a/src/map/guild.c b/src/map/guild.c
index 9e7dc9b0f..b83f05f00 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -296,7 +296,7 @@ int guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap) {
struct guild_expcache *c;
struct guild *g;
- c = db_data2ptr(data);
+ c = DB->data2ptr(data);
if (
(g = guild->search(c->guild_id)) == NULL ||
@@ -331,7 +331,7 @@ int guild_payexp_timer(int tid, unsigned int tick, int id, intptr_t data)
*/
int guild_send_xy_timer_sub(DBKey key, DBData *data, va_list ap)
{
- struct guild *g = db_data2ptr(data);
+ struct guild *g = DB->data2ptr(data);
int i;
nullpo_ret(g);
@@ -439,8 +439,8 @@ int guild_npc_request_info(int guild_id,const char *event)
ev=(struct eventlist *)aCalloc(sizeof(struct eventlist),1);
memcpy(ev->name,event,strlen(event));
//The one in the db (if present) becomes the next event from this.
- if (guild_infoevent_db->put(guild_infoevent_db, db_i2key(guild_id), db_ptr2data(ev), &prev))
- ev->next = db_data2ptr(&prev);
+ if (guild_infoevent_db->put(guild_infoevent_db, DB->i2key(guild_id), DB->ptr2data(ev), &prev))
+ ev->next = DB->data2ptr(&prev);
}
return guild->request_info(guild_id);
@@ -615,8 +615,8 @@ int guild_recv_info(struct guild *sg) {
}
//Occurrence of an event
- if (guild_infoevent_db->remove(guild_infoevent_db, db_i2key(sg->guild_id), &data)) {
- struct eventlist *ev = db_data2ptr(&data), *ev2;
+ if (guild_infoevent_db->remove(guild_infoevent_db, DB->i2key(sg->guild_id), &data)) {
+ struct eventlist *ev = DB->data2ptr(&data), *ev2;
while(ev) {
npc_event_do(ev->name);
ev2=ev->next;
@@ -1243,7 +1243,7 @@ static DBData create_expcache(DBKey key, va_list args)
c->account_id = sd->status.account_id;
c->char_id = sd->status.char_id;
c->exp = 0;
- return db_ptr2data(c);
+ return DB->ptr2data(c);
}
/*====================================================
@@ -1269,7 +1269,7 @@ unsigned int guild_payexp(struct map_session_data *sd,unsigned int exp) {
exp = exp * per / 100;
//Otherwise tax everything.
- c = db_data2ptr(guild_expcache_db->ensure(guild_expcache_db, db_i2key(sd->status.char_id), create_expcache, sd));
+ c = DB->data2ptr(guild_expcache_db->ensure(guild_expcache_db, DB->i2key(sd->status.char_id), create_expcache, sd));
if (c->exp > UINT64_MAX - exp)
c->exp = UINT64_MAX;
@@ -1292,7 +1292,7 @@ int guild_getexp(struct map_session_data *sd,int exp)
if (sd->status.guild_id == 0 || sd->guild == NULL)
return 0;
- c = db_data2ptr(guild_expcache_db->ensure(guild_expcache_db, db_i2key(sd->status.char_id), create_expcache, sd));
+ c = DB->data2ptr(guild_expcache_db->ensure(guild_expcache_db, DB->i2key(sd->status.char_id), create_expcache, sd));
if (c->exp > UINT64_MAX - exp)
c->exp = UINT64_MAX;
else
@@ -1692,7 +1692,7 @@ int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id
*/
int guild_broken_sub(DBKey key, DBData *data, va_list ap)
{
- struct guild *g = db_data2ptr(data);
+ struct guild *g = DB->data2ptr(data);
int guild_id=va_arg(ap,int);
int i,j;
struct map_session_data *sd=NULL;
@@ -1717,7 +1717,7 @@ int guild_broken_sub(DBKey key, DBData *data, va_list ap)
*/
int castle_guild_broken_sub(DBKey key, DBData *data, va_list ap)
{
- struct guild_castle *gc = db_data2ptr(data);
+ struct guild_castle *gc = DB->data2ptr(data);
int guild_id = va_arg(ap, int);
nullpo_ret(gc);
@@ -2145,7 +2145,7 @@ void guild_flag_remove(struct npc_data *nd) {
*/
static int eventlist_db_final(DBKey key, DBData *data, va_list ap) {
struct eventlist *next = NULL;
- struct eventlist *current = db_data2ptr(data);
+ struct eventlist *current = DB->data2ptr(data);
while (current != NULL) {
next = current->next;
aFree(current);
@@ -2158,7 +2158,7 @@ static int eventlist_db_final(DBKey key, DBData *data, va_list ap) {
* @see DBApply
*/
static int guild_expcache_db_final(DBKey key, DBData *data, va_list ap) {
- ers_free(expcache_ers, db_data2ptr(data));
+ ers_free(expcache_ers, DB->data2ptr(data));
return 0;
}
@@ -2166,7 +2166,7 @@ static int guild_expcache_db_final(DBKey key, DBData *data, va_list ap) {
* @see DBApply
*/
static int guild_castle_db_final(DBKey key, DBData *data, va_list ap) {
- struct guild_castle* gc = db_data2ptr(data);
+ struct guild_castle* gc = DB->data2ptr(data);
if( gc->temp_guardians )
aFree(gc->temp_guardians);
aFree(gc);
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 590a0cf57..2a5fa48de 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -30,7 +30,7 @@ struct item_data dummy_item; //This is the default dummy item used for non-exist
*/
static int itemdb_searchname_sub(DBKey key, DBData *data, va_list ap)
{
- struct item_data *item = db_data2ptr(data), **dst, **dst2;
+ struct item_data *item = DB->data2ptr(data), **dst, **dst2;
char *str;
str=va_arg(ap,char *);
dst=va_arg(ap,struct item_data **);
@@ -83,7 +83,7 @@ struct item_data* itemdb_searchname(const char *str)
*/
static int itemdb_searchname_array_sub(DBKey key, DBData data, va_list ap)
{
- struct item_data *item = db_data2ptr(&data);
+ struct item_data *item = DB->data2ptr(&data);
char *str;
str=va_arg(ap,char *);
if (item == &dummy_item)
@@ -127,7 +127,7 @@ int itemdb_searchname_array(struct item_data** data, int size, const char *str)
size -= count;
db_count = itemdb_other->getall(itemdb_other, (DBData**)&db_data, size, itemdb_searchname_array_sub, str);
for (i = 0; i < db_count; i++)
- data[count++] = db_data2ptr(db_data[i]);
+ data[count++] = DB->data2ptr(db_data[i]);
count += db_count;
}
return count;
@@ -1376,7 +1376,7 @@ static void destroy_item_data(struct item_data* self, int free_self)
*/
static int itemdb_final_sub(DBKey key, DBData *data, va_list ap)
{
- struct item_data *id = db_data2ptr(data);
+ struct item_data *id = DB->data2ptr(data);
if( id != &dummy_item )
destroy_item_data(id, 1);
diff --git a/src/map/map.c b/src/map/map.c
index 49aef6c4c..6f61375fe 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1479,7 +1479,7 @@ static DBData create_charid2nick(DBKey key, va_list args)
{
struct charid2nick *p;
CREATE(p, struct charid2nick, 1);
- return db_ptr2data(p);
+ return DB->ptr2data(p);
}
/// Adds(or replaces) the nick of charid to nick_db and fullfils pending requests.
@@ -1515,7 +1515,7 @@ void map_delnickdb(int charid, const char* name)
struct map_session_data* sd;
DBData data;
- if (!nick_db->remove(nick_db, db_i2key(charid), &data) || (p = db_data2ptr(&data)) == NULL)
+ if (!nick_db->remove(nick_db, DB->i2key(charid), &data) || (p = DB->data2ptr(&data)) == NULL)
return;
while( p->requests ) {
@@ -2703,7 +2703,7 @@ static DBData create_map_data_other_server(DBKey key, va_list args)
mdos=(struct map_data_other_server *)aCalloc(1,sizeof(struct map_data_other_server));
mdos->index = mapindex;
memcpy(mdos->name, mapindex_id2name(mapindex), MAP_NAME_LENGTH);
- return db_ptr2data(mdos);
+ return DB->ptr2data(mdos);
}
/*==========================================
@@ -2733,7 +2733,7 @@ int map_setipport(unsigned short mapindex, uint32 ip, uint16 port)
*/
int map_eraseallipport_sub(DBKey key, DBData *data, va_list va)
{
- struct map_data_other_server *mdos = db_data2ptr(data);
+ struct map_data_other_server *mdos = DB->data2ptr(data);
if(mdos->cell == NULL) {
db_remove(map_db,key);
aFree(mdos);
@@ -4854,7 +4854,7 @@ void read_map_zone_db(void) {
*/
int map_db_final(DBKey key, DBData *data, va_list ap)
{
- struct map_data_other_server *mdos = db_data2ptr(data);
+ struct map_data_other_server *mdos = DB->data2ptr(data);
if(mdos && mdos->cell == NULL)
aFree(mdos);
return 0;
@@ -4865,7 +4865,7 @@ int map_db_final(DBKey key, DBData *data, va_list ap)
*/
int nick_db_final(DBKey key, DBData *data, va_list args)
{
- struct charid2nick* p = db_data2ptr(data);
+ struct charid2nick* p = DB->data2ptr(data);
struct charid_request* req;
if( p == NULL )
@@ -4913,7 +4913,7 @@ int cleanup_sub(struct block_list *bl, va_list ap)
*/
static int cleanup_db_sub(DBKey key, DBData *data, va_list va)
{
- return cleanup_sub(db_data2ptr(data), va);
+ return cleanup_sub(DB->data2ptr(data), va);
}
/*==========================================
diff --git a/src/map/npc.c b/src/map/npc.c
index 77ee8d486..090c03e58 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -353,7 +353,7 @@ int npc_event_doall_sub(DBKey key, DBData *data, va_list ap)
const char* name;
int rid;
- nullpo_ret(ev = db_data2ptr(data));
+ nullpo_ret(ev = DB->data2ptr(data));
nullpo_ret(c = va_arg(ap, int *));
nullpo_ret(name = va_arg(ap, const char *));
rid = va_arg(ap, int);
@@ -381,7 +381,7 @@ static int npc_event_do_sub(DBKey key, DBData *data, va_list ap)
int* c;
const char* name;
- nullpo_ret(ev = db_data2ptr(data));
+ nullpo_ret(ev = DB->data2ptr(data));
nullpo_ret(c = va_arg(ap, int *));
nullpo_ret(name = va_arg(ap, const char *));
@@ -1785,7 +1785,7 @@ int npc_remove_map(struct npc_data* nd)
*/
static int npc_unload_ev(DBKey key, DBData *data, va_list ap)
{
- struct event_data* ev = db_data2ptr(data);
+ struct event_data* ev = DB->data2ptr(data);
char* npcname = va_arg(ap, char *);
if(strcmp(ev->nd->exname,npcname)==0){
@@ -2302,7 +2302,7 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const
int npc_convertlabel_db(DBKey key, DBData *data, va_list ap)
{
const char* lname = (const char*)key.str;
- int lpos = db_data2i(data);
+ int lpos = DB->data2i(data);
struct npc_label_list** label_list;
int* label_list_num;
const char* filepath;
@@ -2972,9 +2972,9 @@ static const char* npc_parse_function(char* w1, char* w2, char* w3, char* w4, co
return end;
func_db = script_get_userfunc_db();
- if (func_db->put(func_db, db_str2key(w3), db_ptr2data(script), &old_data))
+ if (func_db->put(func_db, DB->str2key(w3), DB->ptr2data(script), &old_data))
{
- struct script_code *oldscript = (struct script_code*)db_data2ptr(&old_data);
+ struct script_code *oldscript = (struct script_code*)DB->data2ptr(&old_data);
ShowInfo("npc_parse_function: Overwriting user function [%s] (%s:%d)\n", w3, filepath, strline(buffer,start-buffer));
script_free_vars(oldscript->script_vars);
aFree(oldscript->script_buf);
@@ -3776,7 +3776,7 @@ void npc_read_event_script(void)
for( data = iter->first(iter,&key); iter->exists(iter); data = iter->next(iter,&key) )
{
const char* p = key.str;
- struct event_data* ed = db_data2ptr(data);
+ struct event_data* ed = DB->data2ptr(data);
unsigned char count = script_event[i].event_count;
if( count >= ARRAYLENGTH(script_event[i].event) )
diff --git a/src/map/script.c b/src/map/script.c
index 76092f4ce..41f8e7472 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3658,7 +3658,7 @@ int script_config_read(char *cfgName)
*/
static int db_script_free_code_sub(DBKey key, DBData *data, va_list ap)
{
- struct script_code *code = db_data2ptr(data);
+ struct script_code *code = DB->data2ptr(data);
if (code)
script_free_code(code);
return 0;
diff --git a/src/map/skill.c b/src/map/skill.c
index bbc88d9d2..06bfca5f8 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -15363,7 +15363,7 @@ int skill_unit_timer_sub_onplace (struct block_list* bl, va_list ap) {
* @see DBApply
*/
int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
- struct skill_unit* unit = db_data2ptr(data);
+ struct skill_unit* unit = DB->data2ptr(data);
struct skill_unit_group* group = unit->group;
unsigned int tick = va_arg(ap,unsigned int);
bool dissonance;
diff --git a/src/map/storage.c b/src/map/storage.c
index fda80735a..01da53907 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -73,7 +73,7 @@ void do_final_storage(void) // by [MC Cameri]
*/
static int storage_reconnect_sub(DBKey key, DBData *data, va_list ap)
{
- struct guild_storage *stor = db_data2ptr(data);
+ struct guild_storage *stor = DB->data2ptr(data);
if (stor->dirty && stor->storage_status == 0) //Save closed storages.
storage_guild_storagesave(0, stor->guild_id,0);
@@ -352,7 +352,7 @@ static DBData create_guildstorage(DBKey key, va_list args)
struct guild_storage *gs = NULL;
gs = (struct guild_storage *) aCalloc(sizeof(struct guild_storage), 1);
gs->guild_id=key.i;
- return db_ptr2data(gs);
+ return DB->ptr2data(gs);
}
struct guild_storage *guild2storage(int guild_id)