Happy New Year

[openldap] / libraries / liblmdb / mtest.c

diff --git a/libraries/liblmdb/mtest.c b/libraries/liblmdb/mtest.c
index 01579950b1b0a3b61b45fbb785d06b420e469ab2..6fc5840c3f870db893adc5e342136a27343860cd 100644 (file)
--- a/libraries/liblmdb/mtest.c
+++ b/libraries/liblmdb/mtest.c
@@ -1,6 +1,6 @@
 /* mtest.c - memory-mapped database tester/toy */
 /*
- * Copyright 2011 Howard Chu, Symas Corp.
+ * Copyright 2011-2018 Howard Chu, Symas Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,6 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-#define _XOPEN_SOURCE 500              /* srandom(), random() */
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -36,29 +35,32 @@ int main(int argc,char * argv[])
        int *values;
        char sval[32] = "";
 
-       srandom(time(NULL));
+       srand(time(NULL));
 
-           count = (random()%384) + 64;
+           count = (rand()%384) + 64;
            values = (int *)malloc(count*sizeof(int));
 
            for(i = 0;i<count;i++) {
-                       values[i] = random()%1024;
+                       values[i] = rand()%1024;
            }
     
                E(mdb_env_create(&env));
+               E(mdb_env_set_maxreaders(env, 1));
                E(mdb_env_set_mapsize(env, 10485760));
                E(mdb_env_open(env, "./testdb", MDB_FIXEDMAP /*|MDB_NOSYNC*/, 0664));
+
                E(mdb_txn_begin(env, NULL, 0, &txn));
-               E(mdb_open(txn, NULL, 0, &dbi));
+               E(mdb_dbi_open(txn, NULL, 0, &dbi));
    
                key.mv_size = sizeof(int);
                key.mv_data = sval;
-               data.mv_size = sizeof(sval);
-               data.mv_data = sval;
 
                printf("Adding %d values\n", count);
            for (i=0;i<count;i++) {     
                        sprintf(sval, "%03x %d foo bar", values[i], values[i]);
+                       /* Set <data> in each iteration, since MDB_NOOVERWRITE may modify it */
+                       data.mv_size = sizeof(sval);
+                       data.mv_data = sval;
                        if (RES(MDB_KEYEXIST, mdb_put(txn, dbi, &key, &data, MDB_NOOVERWRITE))) {
                                j++;
                                data.mv_size = sizeof(sval);
@@ -69,7 +71,7 @@ int main(int argc,char * argv[])
                E(mdb_txn_commit(txn));
                E(mdb_env_stat(env, &mst));
 
-               E(mdb_txn_begin(env, NULL, 1, &txn));
+               E(mdb_txn_begin(env, NULL, MDB_RDONLY, &txn));
                E(mdb_cursor_open(txn, dbi, &cursor));
                while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
                        printf("key: %p %.*s, data: %p %.*s\n",
@@ -82,7 +84,7 @@ int main(int argc,char * argv[])
 
                j=0;
                key.mv_data = sval;
-           for (i= count - 1; i > -1; i-= (random()%5)) {      
+           for (i= count - 1; i > -1; i-= (rand()%5)) {
                        j++;
                        txn=NULL;
                        E(mdb_txn_begin(env, NULL, 0, &txn));
@@ -98,7 +100,7 @@ int main(int argc,char * argv[])
                printf("Deleted %d values\n", j);
 
                E(mdb_env_stat(env, &mst));
-               E(mdb_txn_begin(env, NULL, 1, &txn));
+               E(mdb_txn_begin(env, NULL, MDB_RDONLY, &txn));
                E(mdb_cursor_open(txn, dbi, &cursor));
                printf("Cursor next\n");
                while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
@@ -129,6 +131,7 @@ int main(int argc,char * argv[])
                                (int) key.mv_size,  (char *) key.mv_data,
                                (int) data.mv_size, (char *) data.mv_data);
 
+               mdb_cursor_close(cursor);
                mdb_txn_abort(txn);
 
                printf("Deleting with cursor\n");
@@ -165,9 +168,9 @@ int main(int argc,char * argv[])
                                data.mv_data, (int) data.mv_size, (char *) data.mv_data);
                }
                mdb_cursor_close(cursor);
-               mdb_close(env, dbi);
-
                mdb_txn_abort(txn);
+
+               mdb_dbi_close(env, dbi);
                mdb_env_close(env);
 
        return 0;