Changeset 4

Timestamp:

12/01/04 14:56:41 (4 years ago)

Author:

azrael

Message:

Initial code for using bdb in a environment

Location:

trunk/src

Files:

• opensync_anchor.c (modified) (2 diffs)
• opensync_db.c (modified) (3 diffs)
• opensync_db.h (modified) (2 diffs)
• opensync_env.c (modified) (1 diff)
• opensync_group.c (modified) (3 diffs)
• opensync_hashtable.c (modified) (2 diffs)
• opensync_internals.h (modified) (1 diff)
• opensync_mapping.c (modified) (1 diff)

trunk/src/opensync_anchor.c

@@ -2 +2 @@
 #include "opensync_internals.h"
 
-DB *osync_anchor_load_file(char *file)
+DB *osync_anchor_load_file(char *file, OSyncGroup *group)
 {
-        DB *dbhandle = osync_db_open(file, "Anchor", DB_BTREE);
+        DB *dbhandle = osync_db_open(file, "Anchor", DB_BTREE, group->dbenv);
         return dbhandle;
 }
@@ -12 +12 @@
         g_assert(member);
         char *filename = g_strdup_printf ("%s/anchor.db", member->configdir);
-        DB *dbhandle = osync_anchor_load_file(filename);
+        DB *dbhandle = osync_anchor_load_file(filename, member->group);
         g_free(filename);
         return dbhandle;

trunk/src/opensync_db.c

@@ -2 +2 @@
 #include "opensync_internals.h"
 
-DB *osync_db_open(char *filename, char *dbname, int type)
+DB_ENV *osync_db_setup(char *configdir, FILE *errfp)
+{
+        DB_ENV *dbenv;
+        int ret;
+
+    if ((ret = db_env_create(&dbenv, 0)) != 0) {
+        fprintf(errfp, "opensync: %s\n", db_strerror(ret));
+        return (NULL);
+    }
+    dbenv->set_errfile(dbenv, errfp);
+    dbenv->set_errpfx(dbenv, "opensync");
+
+    if ((ret = dbenv->set_cachesize(dbenv, 0, 5 * 1024 * 1024, 0)) != 0) {
+        dbenv->err(dbenv, ret, "set_cachesize");
+        goto err;
+    }
+    
+    if ((ret = dbenv->set_data_dir(dbenv, "db")) != 0) {
+        dbenv->err(dbenv, ret, "set_data_dir: db");
+        goto err;
+    }
+
+    if ((ret = dbenv->open(dbenv, configdir, DB_CREATE | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_RECOVER | DB_PRIVATE | DB_THREAD, 0)) != 0) {
+        dbenv->err(dbenv, ret, "environment open: %s", configdir);
+        goto err;
+    }
+
+    return (dbenv);
+
+    err:
+        (void)dbenv->close(dbenv, 0);
+        return (NULL);
+}
+
+DB *osync_db_open(char *filename, char *dbname, int type, DB_ENV *dbenv)
 {
         int ret;
         DB *dbp;
-        if ((ret = db_create(&dbp, NULL, 0)) != 0) {
+        if ((ret = db_create(&dbp, dbenv, 0)) != 0) {
                 printf("db_create: %s\n", db_strerror(ret));
                 return NULL;
@@ -63 +97 @@
 }
 
-DB *osync_db_open_secondary(DB *firstdb, char *filename, char *dbname, int (*callback)(DB *, const DBT *, const DBT *, DBT *))
+DB *osync_db_open_secondary(DB *firstdb, char *filename, char *dbname, int (*callback)(DB *, const DBT *, const DBT *, DBT *), DB_ENV *dbenv)
 {
         DB *sdbp = NULL;
@@ -69 +103 @@
         int (*secfunc)(DB *, const DBT *, const DBT *, DBT *);
         
-        if ((ret = db_create(&sdbp, NULL, 0)) != 0) {
+        if ((ret = db_create(&sdbp, dbenv, 0)) != 0) {
                 printf("sec_db_create: %s\n", db_strerror(ret));
                 return NULL;

trunk/src/opensync_db.h

@@ -1 @@
-DB *osync_db_open(char *filename, char *dbname, int type);
+DB *osync_db_open(char *filename, char *dbname, int type, DB_ENV *dbenv);
 osync_bool osync_db_put(DB *dbp, void *key, int keysize, void *data, int datasize);
 osync_bool osync_db_del(DB *dbp, void *key, int keysize);
@@ -8 +8 @@
 void osync_db_cursor_close(DBC *dbcp);
 osync_bool osync_db_cursor_next_sec(DBC *dbcp, void **pkey, void **skey, void **data);
-DB *osync_db_open_secondary(DB *firstdb, char *filename, char *dbname, int (*callback)(DB *, const DBT *, const DBT *, DBT *));
+DB *osync_db_open_secondary(DB *firstdb, char *filename, char *dbname, int (*callback)(DB *, const DBT *, const DBT *, DBT *), DB_ENV *dbenv);
 u_long osync_db_create_unique_id(DB *dbp);
 void osync_db_sync(DB *dbp);
 osync_bool osync_db_put_dbt(DB *dbp, DBT *key, DBT *data);
+DB_ENV *osync_db_setup(char *configdir, FILE *errfp);

trunk/src/opensync_env.c

@@ -21 +21 @@
         os_env->groups = g_list_append(os_env->groups, group);
 }
-
-/*int osync_add_group(OSyncEnv *os_env, OSyncGroup *group)
-{
-        int index;
-        index = g_list_index(os_env->groups, group);
-        if (index == -1) {
-                index = g_list_length(os_env->groups);
-                _osync_append_group(os_env, group);
-                osync_debug("os_env", 3, "Appending group %s to list with index %i", osync_group_get_name(group), index);
-        } else {
-                osync_debug("os_env", 3, "Found group %s in list with index %i", osync_group_get_name(group), index);
-        }
-        return index;
-}*/
 
 osync_bool osync_init(OSyncEnv *os_env)

trunk/src/opensync_group.c

@@ -9 +9 @@
         
         filename = g_strdup_printf("%s/group%i", osync_env_get_configdir(osinfo), g_random_int_range(1, 1000000));
-        //group->name = g_path_get_basename(filename);
         group->configdir = filename;
         group->env = osinfo;
         osync_debug("OSGRP", 3, "Generated new group:");
-        //osync_debug("OSMEM", 3, "Name: %s", group->name);
         osync_debug("OSGRP", 3, "Configdirectory: %s", filename);
         return group;
@@ -46 +44 @@
                 osync_debug("OSGRP", 3, "Creating configdirectory %s", group->configdir);
                 mkdir(group->configdir, 0777);
+                char *dbdir = g_strdup_printf("%s/db", group->configdir);
+                mkdir(dbdir, 0777);
+                g_free(dbdir);
         }
         
@@ -123 +124 @@
                 }
         }
+        char *dbdir = g_strdup_printf("%s/db", group->configdir);
+        char *logfile = g_strdup_printf("%s/group.log", dbdir);
+        FILE *log = fopen(logfile, "rw");
+        group->dbenv = osync_db_setup(dbdir, log);
+        g_free(dbdir);
+        g_free(logfile);
         osync_env_append_group(env, group);
         return group;

trunk/src/opensync_hashtable.c

@@ -22 +22 @@
 }
 
-osync_bool osync_hashtable_load_file(OSyncHashTable *table, char *file)
+osync_bool osync_hashtable_load_file(OSyncHashTable *table, char *file, OSyncGroup *group)
 {
-        table->dbhandle = osync_db_open(file, "Hash", DB_BTREE);
+        table->dbhandle = osync_db_open(file, "Hash", DB_BTREE, group->dbenv);
         g_assert(table->dbhandle);
         return TRUE;
@@ -33 +33 @@
         g_assert(member != NULL);
         char *filename = g_strdup_printf ("%s/hash.table", member->configdir);
-        osync_hashtable_load_file(table, filename);
+        osync_hashtable_load_file(table, filename, member->group);
         g_free(filename);
         return TRUE; //FIXME

trunk/src/opensync_internals.h

@@ -54 +54 @@
         gchar *configdir;
         OSyncEnv *env;
+        DB_ENV *dbenv;
         void *data;
 };

trunk/src/opensync_mapping.c

@@ -275 +275 @@
         g_assert(table->db_path != NULL);
         char *filename = g_strdup_printf("%s/change.db", table->db_path);
-        table->entrytable = osync_db_open(filename, NULL, DB_BTREE);
+        table->entrytable = osync_db_open(filename, NULL, DB_BTREE, table->group->dbenv);
         g_free(filename);
         filename = g_strdup_printf("%s/mapping.db", table->db_path);
-        table->maptable = osync_db_open_secondary(table->entrytable, filename, NULL, getmapid);
+        table->maptable = osync_db_open_secondary(table->entrytable, filename, NULL, getmapid, table->group->dbenv);
         g_free(filename);