cscvs to tla changeset 124

[onak.git] / keydb_db3.c

diff --git a/keydb_db3.c b/keydb_db3.c
index 56f4bed5a0cc11d60759c5a4ae8837df2bec04fe..e25b94ec9afbc984037d61aec92088ba2c1b2ce5 100644 (file)
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * Copyright 2002 Project Purple
  *

- * $Id: keydb_db3.c,v 1.20 2003/09/30 20:40:10 noodles Exp $
+ * $Id: keydb_db3.c,v 1.25 2004/05/26 17:46:21 noodles Exp $

  */
 
 #include <assert.h>
  */
 
 #include <assert.h>


@@ -58,7 +58,11 @@ static DB_TXN *txn = NULL;
 
 DB *keydb(uint64_t keyid)
 {
 
 DB *keydb(uint64_t keyid)
 {

-       return(dbconns[keyid % numdbs]);
+       uint64_t keytrun;
+
+       keytrun = keyid >> 8;
+
+       return(dbconns[keytrun % numdbs]);

 }
 
 /**
 }
 
 /**


@@ -118,12 +122,13 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
  *     this file are called in order to allow the DB to be initialized ready
  *     for access.
  */
  *     this file are called in order to allow the DB to be initialized ready
  *     for access.
  */

-void initdb(void)
+void initdb(bool readonly)

 {
 {

-       char  buf[1024];
-       FILE *numdb = NULL;
-       int   ret = 0;
-       int   i = 0;
+       char       buf[1024];
+       FILE      *numdb = NULL;
+       int        ret = 0;
+       int        i = 0;
+       u_int32_t  flags = 0;

 
        snprintf(buf, sizeof(buf) - 1, "%s/num_keydb", config.db_dir);
        numdb = fopen(buf, "r");
 
        snprintf(buf, sizeof(buf) - 1, "%s/num_keydb", config.db_dir);
        numdb = fopen(buf, "r");


@@ -132,9 +137,18 @@ void initdb(void)
                        numdbs = atoi(buf);
                }
                fclose(numdb);
                        numdbs = atoi(buf);
                }
                fclose(numdb);

-       } else {
+       } else if (!readonly) {

                logthing(LOGTHING_ERROR, "Couldn't open num_keydb: %s",
                                strerror(errno));
                logthing(LOGTHING_ERROR, "Couldn't open num_keydb: %s",
                                strerror(errno));

+               numdb = fopen(buf, "w");
+               if (numdb != NULL) {
+                       fprintf(numdb, "%d", numdbs);
+                       fclose(numdb);
+               } else {
+                       logthing(LOGTHING_ERROR,
+                               "Couldn't write num_keydb: %s",
+                               strerror(errno));
+               }

        }
 
        dbconns = malloc(sizeof (DB *) * numdbs);
        }
 
        dbconns = malloc(sizeof (DB *) * numdbs);


@@ -170,7 +184,7 @@ void initdb(void)
                        0);
        if (ret != 0) {
                logthing(LOGTHING_CRITICAL,
                        0);
        if (ret != 0) {
                logthing(LOGTHING_CRITICAL,

-                               "Erroring opening db environment: %s (%s)",
+                               "Error opening db environment: %s (%s)",

                                config.db_dir,
                                db_strerror(ret));
                exit(1);
                                config.db_dir,
                                db_strerror(ret));
                exit(1);


@@ -185,10 +199,14 @@ void initdb(void)
                }
 
                snprintf(buf, 1023, "keydb.%d.db", i);
                }
 
                snprintf(buf, 1023, "keydb.%d.db", i);

+               flags = DB_CREATE;
+               if (readonly) {
+                       flags = DB_RDONLY;
+               }

                ret = dbconns[i]->open(dbconns[i], buf,
                        NULL,
                        DB_HASH,
                ret = dbconns[i]->open(dbconns[i], buf,
                        NULL,
                        DB_HASH,

-                       DB_CREATE,
+                       flags,

                        0664);
                if (ret != 0) {
                        logthing(LOGTHING_CRITICAL,
                        0664);
                if (ret != 0) {
                        logthing(LOGTHING_CRITICAL,


@@ -207,7 +225,7 @@ void initdb(void)
        ret = worddb->set_flags(worddb, DB_DUP);
 
        ret = worddb->open(worddb, "worddb", NULL, DB_BTREE,
        ret = worddb->set_flags(worddb, DB_DUP);
 
        ret = worddb->open(worddb, "worddb", NULL, DB_BTREE,

-                       DB_CREATE,
+                       flags,

                        0664);
        if (ret != 0) {
                logthing(LOGTHING_CRITICAL,
                        0664);
        if (ret != 0) {
                logthing(LOGTHING_CRITICAL,