[ViewVC] Diff of: cvs/BDB/BDB.xs

Comparing BDB/BDB.xs (file contents):
Revision 1.12 by root, Sun Jul 8 09:16:19 2007 UTC vs.
Revision 1.44 by root, Wed Jul 9 21:00:13 2008 UTC

 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
+// perl stupidly defines these as macros, breaking
+// lots and lots of code.
+#undef open
+#undef close
+#undef abort
+#undef malloc
+#undef free
+#undef send
 #include <stddef.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <limits.h>
-#include <unistd.h>
 #include <fcntl.h>
+#ifndef _WIN32
+# include <sys/time.h>
+# include <unistd.h>
+#endif
 #include <db.h>
-#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 5)
+#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 4)
-# error you need Berkeley DB 4.5 or newer installed
+# error you need Berkeley DB 4.4 or newer installed
 #endif
 /* number of seconds after which idle threads exit */
 #define IDLE_TIMEOUT 10
 typedef DB_TXN      DB_TXN_ornull;
 typedef DBC         DBC_ornull;
 typedef DB          DB_ornull;
 typedef DB_SEQUENCE DB_SEQUENCE_ornull;
+typedef DB_ENV      DB_ENV_ornuked;
+typedef DB_TXN      DB_TXN_ornuked;
+typedef DBC         DBC_ornuked;
+typedef DB          DB_ornuked;
+typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
 typedef SV SV8; /* byte-sv, used for argument-checking */
-typedef char *octetstring;
+typedef char *bdb_filename;
 static SV *prepare_cb;
+#if DB_VERSION_MINOR >= 6
+# define c_close close
+# define c_count count
+# define c_del   del
+# define c_dup   dup
+# define c_get   get
+# define c_pget  pget
+# define c_put   put
+#endif
-static inline char *
+static char *
+get_bdb_filename (SV *sv)
+{
+  if (!SvOK (sv))
+    return 0;
+#if _WIN32
+  /* win32 madness + win32 perl absolutely brokenness make for horrible hacks */
+  {
+    STRLEN len;
+    char *src = SvPVbyte (sv, len);
+    SV *t1 = sv_newmortal ();
+    SV *t2 = sv_newmortal ();
+    sv_upgrade (t1, SVt_PV); SvPOK_only (t1); SvGROW (t1, len * 16 + 1);
+    sv_upgrade (t2, SVt_PV); SvPOK_only (t2); SvGROW (t2, len * 16 + 1);
+    len = MultiByteToWideChar (CP_ACP, 0, src, len, (WCHAR *)SvPVX (t1), SvLEN (t1) / sizeof (WCHAR));
+    len = WideCharToMultiByte (CP_UTF8, 0, (WCHAR *)SvPVX (t1), len, SvPVX (t2), SvLEN (t2), 0, 0);
+    SvPOK_only (t2);
+    SvPVX (t2)[len] = 0;
+    SvCUR_set (t2, len);
+    return SvPVX (t2);
+  }
+#else
+  return SvPVbyte_nolen (sv);
+#endif
+}
+static void
+debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
+{
+  printf ("err[%s]\n", msg);
+}
+static void
+debug_msgcall (const DB_ENV *dbenv, const char *msg)
+{
+  printf ("msg[%s]\n", msg);
+}
+static char *
 strdup_ornull (const char *s)
 {
   return s ? strdup (s) : 0;
 }
-static inline void
+static void
 sv_to_dbt (DBT *dbt, SV *sv)
 {
   STRLEN len;
   char *data = SvPVbyte (sv, len);
   memcpy (dbt->data, data, len);
   dbt->size = len;
   dbt->flags = DB_DBT_REALLOC;
 }
-static inline void
+static void
 dbt_to_sv (SV *sv, DBT *dbt)
 {
   if (sv)
     {
       SvREADONLY_off (sv);
 }
 enum {
   REQ_QUIT,
   REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
-  REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
+  REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
-  REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC,
+  REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
   REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
-  REQ_TXN_COMMIT, REQ_TXN_ABORT,
+  REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
   REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
   REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
 };
-typedef struct aio_cb
+typedef struct bdb_cb
 {
-  struct aio_cb *volatile next;
+  struct bdb_cb *volatile next;
   SV *callback;
   int type, pri, result;
   DB_ENV *env;
   DB *db;
   DBC *dbc;
   UV uv1;
   int int1, int2;
   U32 uint1, uint2;
-  char *buf1, *buf2;
+  char *buf1, *buf2, *buf3;
   SV *sv1, *sv2, *sv3;
   DBT dbt1, dbt2, dbt3;
   DB_KEY_RANGE key_range;
   DB_SEQUENCE *seq;
   db_seq_t seq_t;
-} aio_cb;
+} bdb_cb;
-typedef aio_cb *aio_req;
+typedef bdb_cb *bdb_req;
 enum {
   PRI_MIN     = -4,
   PRI_MAX     =  4,
   NUM_PRI     = PRI_MAX + PRI_BIAS + 1,
 };
 #define AIO_TICKS ((1000000 + 1023) >> 10)
+static SV *on_next_submit;
 static unsigned int max_poll_time = 0;
 static unsigned int max_poll_reqs = 0;
 /* calculcate time difference in ~1/AIO_TICKS of a second */
 static int tvdiff (struct timeval *tv1, struct timeval *tv2)
   struct worker *prev, *next;
   thread_t tid;
   /* locked by reslock, reqlock or wrklock */
-  aio_req req; /* currently processed request */
+  bdb_req req; /* currently processed request */
   void *dbuf;
   DIR *dirp;
 } worker;
 static worker wrk_first = { &wrk_first, &wrk_first, 0 };
 }
 static volatile unsigned int nreqs, nready, npending;
 static volatile unsigned int max_idle = 4;
 static volatile unsigned int max_outstanding = 0xffffffff;
-static int respipe [2];
+static int respipe_osf [2], respipe [2] = { -1, -1 };
 static mutex_t reslock = X_MUTEX_INIT;
 static mutex_t reqlock = X_MUTEX_INIT;
 static cond_t  reqwait = X_COND_INIT;
 #if WORDACCESS_UNSAFE
-static unsigned int get_nready ()
+static unsigned int get_nready (void)
 {
   unsigned int retval;
   X_LOCK   (reqlock);
   retval = nready;
   X_UNLOCK (reqlock);
   return retval;
 }
-static unsigned int get_npending ()
+static unsigned int get_npending (void)
 {
   unsigned int retval;
   X_LOCK   (reslock);
   retval = npending;
   X_UNLOCK (reslock);
   return retval;
 }
-static unsigned int get_nthreads ()
+static unsigned int get_nthreads (void)
 {
   unsigned int retval;
   X_LOCK   (wrklock);
   retval = started;
  * a somewhat faster data structure might be nice, but
  * with 8 priorities this actually needs <20 insns
  * per shift, the most expensive operation.
  */
 typedef struct {
-  aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
+  bdb_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
   int size;
 } reqq;
 static reqq req_queue;
 static reqq res_queue;
-int reqq_push (reqq *q, aio_req req)
+int reqq_push (reqq *q, bdb_req req)
 {
   int pri = req->pri;
   req->next = 0;
   if (q->qe[pri])
     q->qe[pri] = q->qs[pri] = req;
   return q->size++;
 }
-aio_req reqq_shift (reqq *q)
+bdb_req reqq_shift (reqq *q)
 {
   int pri;
   if (!q->size)
     return 0;
   --q->size;
   for (pri = NUM_PRI; pri--; )
     {
-      aio_req req = q->qs[pri];
+      bdb_req req = q->qs[pri];
       if (req)
         {
           if (!(q->qs[pri] = req->next))
             q->qe[pri] = 0;
     }
   abort ();
 }
-static int poll_cb ();
+static int poll_cb (void);
-static void req_free (aio_req req);
+static void req_free (bdb_req req);
-static void req_cancel (aio_req req);
+static void req_cancel (bdb_req req);
-static int req_invoke (aio_req req)
+static int req_invoke (bdb_req req)
 {
   dSP;
-  if (SvOK (req->callback))
+  if (req->callback)
     {
       ENTER;
       SAVETMPS;
       PUSHMARK (SP);
             dbt_to_sv (req->sv1, &req->dbt1);
             dbt_to_sv (req->sv2, &req->dbt2);
             dbt_to_sv (req->sv3, &req->dbt3);
             break;
+          case REQ_DB_PUT:
+          case REQ_C_PUT:
+            dbt_to_sv (0, &req->dbt1);
+            dbt_to_sv (0, &req->dbt2);
+            break;
           case REQ_DB_KEY_RANGE:
             {
               AV *av = newAV ();
               av_push (av, newSVnv (req->key_range.less));
           case REQ_SEQ_GET:
             SvREADONLY_off (req->sv1);
             if (sizeof (IV) > 4)
-              sv_setiv_mg (req->sv1, req->seq_t);
+              sv_setiv_mg (req->sv1, (IV)req->seq_t);
             else
-              sv_setnv_mg (req->sv1, req->seq_t);
+              sv_setnv_mg (req->sv1, (NV)req->seq_t);
             SvREFCNT_dec (req->sv1);
             break;
         }
     }
   return !SvTRUE (ERRSV);
 }
-static void req_free (aio_req req)
+static void req_free (bdb_req req)
 {
+  SvREFCNT_dec (req->callback);
   free (req->buf1);
   free (req->buf2);
+  free (req->buf3);
   Safefree (req);
 }
-static void *aio_proc (void *arg);
+#ifdef USE_SOCKETS_AS_HANDLES
+# define TO_SOCKET(x) (win32_get_osfhandle (x))
+#else
+# define TO_SOCKET(x) (x)
+#endif
+static void
+create_respipe (void)
+{
+#ifdef _WIN32
+  int arg; /* argg */
+#endif
+  int old_readfd = respipe [0];
+  if (respipe [1] >= 0)
+    respipe_close (TO_SOCKET (respipe [1]));
+#ifdef _WIN32
+  if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
+#else
+  if (pipe (respipe))
+#endif
+    croak ("unable to initialize result pipe");
+  if (old_readfd >= 0)
+    {
+      if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
+        croak ("unable to initialize result pipe(2)");
+      respipe_close (respipe [0]);
+      respipe [0] = old_readfd;
+    }
+#ifdef _WIN32
+  arg = 1;
+  if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
+      || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
+#else
+  if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
+      || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
+#endif
+    croak ("unable to initialize result pipe(3)");
+  respipe_osf [0] = TO_SOCKET (respipe [0]);
+  respipe_osf [1] = TO_SOCKET (respipe [1]);
+}
+X_THREAD_PROC (bdb_proc);
 static void start_thread (void)
 {
   worker *wrk = calloc (1, sizeof (worker));
   if (!wrk)
     croak ("unable to allocate worker thread data");
   X_LOCK (wrklock);
-  if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
+  if (thread_create (&wrk->tid, bdb_proc, (void *)wrk))
     {
       wrk->prev = &wrk_first;
       wrk->next = wrk_first.next;
       wrk_first.next->prev = wrk;
       wrk_first.next = wrk;
     free (wrk);
   X_UNLOCK (wrklock);
 }
-static void maybe_start_thread ()
+static void maybe_start_thread (void)
 {
   if (get_nthreads () >= wanted)
     return;
   /* todo: maybe use idle here, but might be less exact */
     return;
   start_thread ();
 }
-static void req_send (aio_req req)
+static void req_send (bdb_req req)
 {
   SV *wait_callback = 0;
+  if (on_next_submit)
+    {
+      dSP;
+      SV *cb = sv_2mortal (on_next_submit);
+      on_next_submit = 0;
+      PUSHMARK (SP);
+      PUTBACK;
+      call_sv (cb, G_DISCARD | G_EVAL);
+    }
   // synthesize callback if none given
-  if (!SvOK (req->callback))
+  if (!req->callback)
     {
+      int count;
       dSP;
       PUSHMARK (SP);
       PUTBACK;
-      int count = call_sv (prepare_cb, G_ARRAY);
+      count = call_sv (prepare_cb, G_ARRAY);
       SPAGAIN;
       if (count != 2)
         croak ("prepare callback must return exactly two values\n");
-      wait_callback = SvREFCNT_inc (POPs);
+      wait_callback = POPs;
       SvREFCNT_dec (req->callback);
       req->callback = SvREFCNT_inc (POPs);
     }
   ++nreqs;
     {
       dSP;
       PUSHMARK (SP);
       PUTBACK;
       call_sv (wait_callback, G_DISCARD);
-      SvREFCNT_dec (wait_callback);
     }
 }
 static void end_thread (void)
 {
-  aio_req req;
+  bdb_req req;
-  Newz (0, req, 1, aio_cb);
+  Newz (0, req, 1, bdb_cb);
   req->type = REQ_QUIT;
   req->pri  = PRI_MAX + PRI_BIAS;
   X_LOCK (reqlock);
   while (started > wanted)
     end_thread ();
 }
-static void poll_wait ()
+static void poll_wait (void)
 {
   fd_set rfd;
   while (nreqs)
     {
       if (size)
         return;
       maybe_start_thread ();
-      FD_ZERO(&rfd);
+      FD_ZERO (&rfd);
-      FD_SET(respipe [0], &rfd);
+      FD_SET (respipe [0], &rfd);
-      select (respipe [0] + 1, &rfd, 0, 0, 0);
+      PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
     }
 }
-static int poll_cb ()
+static int poll_cb (void)
 {
   dSP;
   int count = 0;
   int maxreqs = max_poll_reqs;
   int do_croak = 0;
   struct timeval tv_start, tv_now;
-  aio_req req;
+  bdb_req req;
   if (max_poll_time)
     gettimeofday (&tv_start, 0);
   for (;;)
               if (!res_queue.size)
                 {
                   /* read any signals sent by the worker threads */
                   char buf [4];
-                  while (read (respipe [0], buf, 4) == 4)
+                  while (respipe_read (respipe [0], buf, 4) == 4)
                     ;
                 }
             }
           X_UNLOCK (reslock);
   return count;
 }
 /*****************************************************************************/
-static void *aio_proc (void *thr_arg)
+X_THREAD_PROC (bdb_proc)
 {
-  aio_req req;
+  bdb_req req;
   struct timespec ts;
   worker *self = (worker *)thr_arg;
   /* try to distribute timeouts somewhat evenly */
-  ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
+  ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
-               * (1000000000UL / 1024UL);
   for (;;)
     {
       ts.tv_sec  = time (0) + IDLE_TIMEOUT;
       X_UNLOCK (reqlock);
       switch (req->type)
         {
           case REQ_QUIT:
+            req->result = ENOSYS;
             goto quit;
           case REQ_ENV_OPEN:
             req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1);
             break;
           case REQ_ENV_MEMP_TRICKLE:
             req->result = req->env->memp_trickle (req->env, req->int1, &req->int2);
             break;
+          case REQ_ENV_DBREMOVE:
+            req->result = req->env->dbremove (req->env, req->txn, req->buf1, req->buf2, req->uint1);
+            break;
+          case REQ_ENV_DBRENAME:
+            req->result = req->env->dbrename (req->env, req->txn, req->buf1, req->buf2, req->buf3, req->uint1);
+            break;
           case REQ_DB_OPEN:
             req->result = req->db->open (req->db, req->txn, req->buf1, req->buf2, req->int1, req->uint1, req->int2);
             break;
           case REQ_DB_CLOSE:
           case REQ_DB_SYNC:
             req->result = req->db->sync (req->db, req->uint1);
             break;
+          case REQ_DB_UPGRADE:
+            req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
+            break;
           case REQ_DB_PUT:
             req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
             break;
           case REQ_DB_GET:
             req->result = req->txn->commit (req->txn, req->uint1);
             break;
           case REQ_TXN_ABORT:
             req->result = req->txn->abort (req->txn);
+            break;
+          case REQ_TXN_FINISH:
+            if (req->txn->flags & TXN_DEADLOCK)
+              {
+                req->result = req->txn->abort (req->txn);
+                if (!req->result)
+                  req->result = DB_LOCK_DEADLOCK;
+              }
+            else
+              req->result = req->txn->commit (req->txn, req->uint1);
             break;
           case REQ_C_CLOSE:
             req->result = req->dbc->c_close (req->dbc);
             break;
           default:
             req->result = ENOSYS;
             break;
         }
+      if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED))
+        req->txn->flags |= TXN_DEADLOCK;
       X_LOCK (reslock);
       ++npending;
       if (!reqq_push (&res_queue, req))
         /* write a dummy byte to the pipe so fh becomes ready */
-        write (respipe [1], &respipe, 1);
+        respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
       self->req = 0;
       worker_clear (self);
       X_UNLOCK (reslock);
   X_UNLOCK (wrklock);
 }
 static void atfork_child (void)
 {
-  aio_req prv;
+  bdb_req prv;
   while (prv = reqq_shift (&req_queue))
     req_free (prv);
   while (prv = reqq_shift (&res_queue))
   idle     = 0;
   nreqs    = 0;
   nready   = 0;
   npending = 0;
-  close (respipe [0]);
+  create_respipe ();
-  close (respipe [1]);
-  if (!create_pipe (respipe))
-    croak ("unable to initialize result pipe");
   atfork_parent ();
 }
 #define dREQ(reqtype)						\
-  aio_req req;							\
+  bdb_req req;							\
   int req_pri = next_pri;					\
   next_pri = DEFAULT_PRI + PRI_BIAS;				\
 								\
-  if (SvOK (callback) && !SvROK (callback))			\
+  if (callback && SvOK (callback))				\
-    croak ("callback must be undef or of reference type");	\
+    croak ("callback has illegal type or extra arguments");	\
 								\
-  Newz (0, req, 1, aio_cb);	        			\
+  Newz (0, req, 1, bdb_cb);	        			\
   if (!req)							\
-    croak ("out of memory during aio_req allocation");		\
+    croak ("out of memory during bdb_req allocation");		\
 								\
-  req->callback = newSVsv (callback);				\
+  req->callback = cb ? SvREFCNT_inc (cb) : 0;			\
   req->type = (reqtype); 					\
   req->pri = req_pri
 #define REQ_SEND						\
   req_send (req)
-#define SvPTR(var, arg, type, class, nullok)                    		\
+#define SvPTR(var, arg, type, class, nullok)                   			\
   if (!SvOK (arg))								\
     {										\
-      if (!nullok)								\
+      if (nullok != 1)								\
         croak (# var " must be a " # class " object, not undef");		\
 										\
       (var) = 0;								\
     }										\
   else if (sv_derived_from ((arg), # class))                    		\
     {                                                           		\
       IV tmp = SvIV ((SV*) SvRV (arg));                         		\
       (var) = INT2PTR (type, tmp);                              		\
-      if (!var)									\
+      if (!var && nullok != 2)									\
         croak (# var " is not a valid " # class " object anymore");		\
     }                                                           		\
   else                                                          		\
-    croak (# var " is not of type " # class);					\
+    croak (# var " is not of type " # class);
-										\
 static void
 ptr_nuke (SV *sv)
 {
   assert (SvROK (sv));
   sv_setiv (SvRV (sv), 0);
 }
+static int
+errno_get (pTHX_ SV *sv, MAGIC *mg)
+{
+  if (*mg->mg_ptr == '!') // should always be the case
+    if (-30999 <= errno && errno <= -30800)
+      {
+        sv_setnv (sv, (NV)errno);
+        sv_setpv (sv, db_strerror (errno));
+        SvNOK_on (sv); /* what a wonderful hack! */
+                       // ^^^ copied from perl sources
+        return 0;
+      }
+  return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
+}
+static MGVTBL vtbl_errno;
+// this wonderful hack :( patches perl's $! variable to support our errno values
+static void
+patch_errno (void)
+{
+  SV *sv;
+  MAGIC *mg;
+  if (!(sv = get_sv ("!", 1)))
+    return;
+  if (!(mg = mg_find (sv, PERL_MAGIC_sv)))
+    return;
+  if (mg->mg_virtual != &PL_vtbl_sv)
+    return;
+  vtbl_errno = PL_vtbl_sv;
+  vtbl_errno.svt_get = errno_get;
+  mg->mg_virtual = &vtbl_errno;
+}
+#if __GNUC__ >= 4
+# define noinline                   __attribute__ ((noinline))
+#else
+# define noinline
+#endif
+static noinline SV *
+pop_callback (I32 *ritems, SV *sv)
+{
+  if (SvROK (sv))
+    {
+      HV *st;
+      GV *gvp;
+      CV *cv;
+      const char *name;
+      /* forgive me */
+      if (SvTYPE (SvRV (sv)) == SVt_PVMG
+          && (st = SvSTASH (SvRV (sv)))
+          && (name = HvNAME_get (st))
+          && (name [0] == 'B' && name [1] == 'D' && name [2] == 'B' && name [3] == ':'))
+        return 0;
+      if ((cv = sv_2cv (sv, &st, &gvp, 0)))
+        {
+          --*ritems;
+          return (SV *)cv;
+        }
+    }
+  return 0;
+}
+#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
 MODULE = BDB                PACKAGE = BDB
 PROTOTYPES: ENABLE
           const_iv (INIT_TXN)
           const_iv (RECOVER)
           const_iv (INIT_TXN)
           const_iv (RECOVER_FATAL)
           const_iv (CREATE)
+          const_iv (RDONLY)
           const_iv (USE_ENVIRON)
           const_iv (USE_ENVIRON_ROOT)
           const_iv (LOCKDOWN)
           const_iv (PRIVATE)
           const_iv (REGISTER)
           const_iv (SYSTEM_MEM)
           const_iv (AUTO_COMMIT)
           const_iv (CDB_ALLDB)
           const_iv (DIRECT_DB)
-          const_iv (DIRECT_LOG)
           const_iv (DSYNC_DB)
-          const_iv (DSYNC_LOG)
-          const_iv (LOG_AUTOREMOVE)
-          const_iv (LOG_INMEMORY)
           const_iv (NOLOCKING)
-          const_iv (MULTIVERSION)
           const_iv (NOMMAP)
           const_iv (NOPANIC)
           const_iv (OVERWRITE)
           const_iv (PANIC_ENVIRONMENT)
           const_iv (REGION_INIT)
           const_iv (TIME_NOTGRANTED)
           const_iv (TXN_NOSYNC)
-          const_iv (TXN_SNAPSHOT)
+          const_iv (TXN_NOT_DURABLE)
           const_iv (TXN_WRITE_NOSYNC)
           const_iv (WRITECURSOR)
           const_iv (YIELDCPU)
           const_iv (ENCRYPT_AES)
           const_iv (XA_CREATE)
           const_iv (READ_UNCOMMITTED)
           const_iv (TRUNCATE)
           const_iv (NOSYNC)
           const_iv (CHKSUM)
           const_iv (ENCRYPT)
-          const_iv (TXN_NOT_DURABLE)
           const_iv (DUP)
           const_iv (DUPSORT)
           const_iv (RECNUM)
           const_iv (RENUMBER)
           const_iv (REVSPLITOFF)
           const_iv (GET_BOTH_RANGE)
           //const_iv (SET_RECNO)
           //const_iv (MULTIPLE)
           const_iv (SNAPSHOT)
           const_iv (JOIN_ITEM)
+          const_iv (JOIN_NOSORT)
           const_iv (RMW)
           const_iv (NOTFOUND)
           const_iv (KEYEMPTY)
           const_iv (LOCK_DEADLOCK)
           const_iv (APPEND)
           const_iv (NODUPDATA)
           const_iv (NOOVERWRITE)
           const_iv (TXN_NOWAIT)
-          const_iv (TXN_SNAPSHOT)
           const_iv (TXN_SYNC)
           const_iv (SET_LOCK_TIMEOUT)
           const_iv (SET_TXN_TIMEOUT)
-          const_iv (JOIN_ITEM)
           const_iv (FIRST)
           const_iv (NEXT)
           const_iv (NEXT_DUP)
           const_iv (NEXT_NODUP)
           const_iv (PREV)
           const_iv (LOCK_YOUNGEST)
           const_iv (SEQ_DEC)
           const_iv (SEQ_INC)
           const_iv (SEQ_WRAP)
+          const_iv (BUFFER_SMALL)
+          const_iv (DONOTINDEX)
+          const_iv (KEYEMPTY	)
+          const_iv (KEYEXIST	)
+          const_iv (LOCK_DEADLOCK)
+          const_iv (LOCK_NOTGRANTED)
+          const_iv (LOG_BUFFER_FULL)
+          const_iv (NOSERVER)
+          const_iv (NOSERVER_HOME)
+          const_iv (NOSERVER_ID)
+          const_iv (NOTFOUND)
+          const_iv (PAGE_NOTFOUND)
+          const_iv (REP_DUPMASTER)
+          const_iv (REP_HANDLE_DEAD)
+          const_iv (REP_HOLDELECTION)
+          const_iv (REP_IGNORE)
+          const_iv (REP_ISPERM)
+          const_iv (REP_JOIN_FAILURE)
+          const_iv (REP_LOCKOUT)
+          const_iv (REP_NEWMASTER)
+          const_iv (REP_NEWSITE)
+          const_iv (REP_NOTPERM)
+          const_iv (REP_UNAVAIL)
+          const_iv (RUNRECOVERY)
+          const_iv (SECONDARY_BAD)
+          const_iv (VERIFY_BAD)
+          const_iv (VERSION_MISMATCH)
+          const_iv (VERB_DEADLOCK)
+          const_iv (VERB_RECOVERY)
+          const_iv (VERB_REGISTER)
+          const_iv (VERB_REPLICATION)
+          const_iv (VERB_WAITSFOR)
+          const_iv (VERSION_MAJOR)
+          const_iv (VERSION_MINOR)
+          const_iv (VERSION_PATCH)
+#if DB_VERSION_MINOR >= 5
+          const_iv (MULTIVERSION)
+          const_iv (TXN_SNAPSHOT)
+#endif
+#if DB_VERSION_MINOR >= 6
+          const_iv (PREV_DUP)
+          const_iv (PRIORITY_UNCHANGED)
+          const_iv (PRIORITY_VERY_LOW)
+          const_iv (PRIORITY_LOW)
+          const_iv (PRIORITY_DEFAULT)
+          const_iv (PRIORITY_HIGH)
+          const_iv (PRIORITY_VERY_HIGH)
+#endif
+#if DB_VERSION_MINOR >= 7
+          const_iv (LOG_DIRECT)
+          const_iv (LOG_DSYNC)
+          const_iv (LOG_AUTO_REMOVE)
+          const_iv (LOG_IN_MEMORY)
+          const_iv (LOG_ZERO)
+#else
+          const_iv (DIRECT_LOG)
+          const_iv (DSYNC_LOG)
+          const_iv (LOG_AUTOREMOVE)
+          const_iv (LOG_INMEMORY)
+#endif
         };
         for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
           newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
+        {
+          /* we currently only allow version, minor-version and patchlevel to go up to 255 */
+          char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
+          newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
+        }
+        newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
-        if (!create_pipe (respipe))
+        create_respipe ();
-          croak ("unable to initialize result pipe");
         X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
-#ifdef _WIN32
+        patch_errno ();
-        X_MUTEX_CHECK (wrklock);
-        X_MUTEX_CHECK (reslock);
-        X_MUTEX_CHECK (reqlock);
-        X_COND_CHECK  (reqwait);
-#endif
 }
 void
 max_poll_reqs (int nreqs)
 	PROTOTYPE: $
 	PROTOTYPE: &
 	CODE:
         SvREFCNT_dec (prepare_cb);
         prepare_cb = newSVsv (cb);
+char *
+strerror (int errorno = errno)
+	PROTOTYPE: ;$
+        CODE:
+        RETVAL = db_strerror (errorno);
+	OUTPUT:
+        RETVAL
+void _on_next_submit (SV *cb)
+        CODE:
+        SvREFCNT_dec (on_next_submit);
+        on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
 DB_ENV *
 db_env_create (U32 env_flags = 0)
 	CODE:
 {
         errno = db_env_create (&RETVAL, env_flags);
         if (errno)
           croak ("db_env_create: %s", db_strerror (errno));
+        if (0)
+          {
+            RETVAL->set_errcall (RETVAL, debug_errcall);
+            RETVAL->set_msgcall (RETVAL, debug_msgcall);
+          }
 }
 	OUTPUT:
 	RETVAL
 void
-db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
+db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
-  	env->set_thread_count (env, get_nthreads ());
         dREQ (REQ_ENV_OPEN);
         req->env   = env;
         req->uint1 = open_flags | DB_THREAD;
         req->int1  = mode;
         req->buf1  = strdup_ornull (db_home);
         REQ_SEND;
 }
 void
-db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
 	dREQ (REQ_ENV_CLOSE);
         req->env   = env;
         req->uint1 = flags;
         REQ_SEND;
         ptr_nuke (ST (0));
 }
 void
-db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_ENV_TXN_CHECKPOINT);
         req->env   = env;
         req->uint1 = kbyte;
         req->uint2 = flags;
         REQ_SEND;
 }
 void
-db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = &PL_sv_undef)
+db_env_lock_detect (DB_ENV *env, U32 flags = 0, U32 atype = DB_LOCK_DEFAULT, SV *dummy = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_ENV_LOCK_DETECT);
         req->env   = env;
         req->uint1 = flags;
         req->uint2 = atype;
+        /* req->int2  = 0; dummy */
         REQ_SEND;
 }
 void
-db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = &PL_sv_undef)
+db_env_memp_sync (DB_ENV *env, SV *dummy = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_ENV_MEMP_SYNC);
         req->env  = env;
         REQ_SEND;
 }
 void
-db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = &PL_sv_undef)
+db_env_memp_trickle (DB_ENV *env, int percent, SV *dummy = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_ENV_MEMP_TRICKLE);
         req->env  = env;
         req->int1 = percent;
         REQ_SEND;
 }
+void
+db_env_dbremove (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
+	CODE:
+{
+	dREQ (REQ_ENV_DBREMOVE);
+        req->env   = env;
+        req->buf1  = strdup_ornull (file);
+        req->buf2  = strdup_ornull (database);
+        req->uint1 = flags;
+        REQ_SEND;
+}
+void
+db_env_dbrename (DB_ENV *env, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, bdb_filename newname, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
+	CODE:
+{
+	dREQ (REQ_ENV_DBRENAME);
+        req->env   = env;
+        req->buf1  = strdup_ornull (file);
+        req->buf2  = strdup_ornull (database);
+        req->buf3  = strdup_ornull (newname);
+        req->uint1 = flags;
+        REQ_SEND;
+}
 DB *
 db_create (DB_ENV *env = 0, U32 flags = 0)
 	CODE:
 {
 }
 	OUTPUT:
 	RETVAL
 void
-db_open (DB *db, DB_TXN_ornull *txnid, octetstring file, octetstring database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
+db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_DB_OPEN);
         req->db    = db;
         req->txn   = txnid;
         req->int2  = mode;
         REQ_SEND;
 }
 void
-db_close (DB *db, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_close (DB *db, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_DB_CLOSE);
         req->db    = db;
         req->uint1 = flags;
         REQ_SEND;
         ptr_nuke (ST (0));
 }
 void
-db_compact (DB *db, DB_TXN_ornull *txn = 0, SV *start = 0, SV *stop = 0, SV *unused1 = 0, U32 flags = DB_FREE_SPACE, SV *unused2 = 0, SV *callback = &PL_sv_undef)
+db_compact (DB *db, DB_TXN_ornull *txn = 0, SV *start = 0, SV *stop = 0, SV *unused1 = 0, U32 flags = DB_FREE_SPACE, SV *unused2 = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_DB_COMPACT);
         req->db    = db;
         req->txn   = txn;
         req->uint1 = flags;
         REQ_SEND;
 }
 void
-db_sync (DB *db, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_sync (DB *db, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_DB_SYNC);
         req->db    = db;
         req->uint1 = flags;
         REQ_SEND;
 }
 void
+db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
+	CODE:
+{
+        dREQ (REQ_DB_SYNC);
+        req->db    = db;
+        req->buf1  = strdup (file);
+        req->uint1 = flags;
+        REQ_SEND;
+}
+void
-db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_DB_KEY_RANGE);
         req->db    = db;
         req->txn   = txn;
         req->sv1   = SvREFCNT_inc (key_range); SvREADONLY_on (key_range);
         REQ_SEND;
 }
 void
-db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_DB_PUT);
         req->db    = db;
         req->txn   = txn;
         req->uint1 = flags;
         REQ_SEND;
 }
 void
-db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
+        if (SvREADONLY (data))
+          croak ("can't modify read-only data scalar in db_get");
 {
         dREQ (REQ_DB_GET);
         req->db    = db;
         req->txn   = txn;
         req->uint1 = flags;
         req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
         REQ_SEND;
 }
 void
-db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
+        if (SvREADONLY (data))
+          croak ("can't modify read-only data scalar in db_pget");
 {
         dREQ (REQ_DB_PGET);
         req->db    = db;
         req->txn   = txn;
         req->uint1 = flags;
         req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
         REQ_SEND;
 }
 void
-db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_DB_DEL);
         req->db    = db;
         req->txn   = txn;
         sv_to_dbt (&req->dbt1, key);
         REQ_SEND;
 }
 void
-db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_TXN_COMMIT);
         req->txn   = txn;
         req->uint1 = flags;
         REQ_SEND;
         ptr_nuke (ST (0));
 }
 void
-db_txn_abort (DB_TXN *txn, SV *callback = &PL_sv_undef)
+db_txn_abort (DB_TXN *txn, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_TXN_ABORT);
         req->txn   = txn;
         REQ_SEND;
         ptr_nuke (ST (0));
 }
 void
+db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
+	CODE:
+{
+        dREQ (REQ_TXN_FINISH);
+        req->txn   = txn;
+        req->uint1 = flags;
+        REQ_SEND;
+        ptr_nuke (ST (0));
+}
+void
-db_c_close (DBC *dbc, SV *callback = &PL_sv_undef)
+db_c_close (DBC *dbc, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_C_CLOSE);
         req->dbc = dbc;
         REQ_SEND;
         ptr_nuke (ST (0));
 }
 void
-db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_C_COUNT);
         req->dbc = dbc;
         req->sv1 = SvREFCNT_inc (count);
         REQ_SEND;
 }
 void
-db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_c_put (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_C_PUT);
         req->dbc   = dbc;
         sv_to_dbt (&req->dbt1, key);
         req->uint1 = flags;
         REQ_SEND;
 }
 void
-db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_C_GET);
         req->dbc   = dbc;
         req->uint1 = flags;
         req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
         REQ_SEND;
 }
 void
-db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_C_PGET);
         req->dbc   = dbc;
         req->uint1 = flags;
         req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
         REQ_SEND;
 }
 void
-db_c_del (DBC *dbc, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_C_DEL);
         req->dbc   = dbc;
         req->uint1 = flags;
         REQ_SEND;
 }
 void
-db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_sequence_open (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, SV *key, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_SEQ_OPEN);
         req->seq   = seq;
         req->txn   = txnid;
         sv_to_dbt (&req->dbt1, key);
         REQ_SEND;
 }
 void
-db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_SEQ_CLOSE);
         req->seq   = seq;
         req->uint1 = flags;
         REQ_SEND;
         ptr_nuke (ST (0));
 }
 void
-db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = &PL_sv_undef)
+db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_SEQ_GET);
         req->seq   = seq;
         req->txn   = txnid;
         req->sv1   = SvREFCNT_inc (seq_value); SvREADONLY_on (seq_value);
         REQ_SEND;
 }
 void
-db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_sequence_remove (DB_SEQUENCE *seq, DB_TXN_ornull *txnid = 0, U32 flags = 0, SV *callback = 0)
+	PREINIT:
+        CALLBACK
 	CODE:
 {
         dREQ (REQ_SEQ_REMOVE);
         req->seq   = seq;
         req->txn   = txnid;
 MODULE = BDB		PACKAGE = BDB::Env
 void
-DESTROY (DB_ENV_ornull *env)
+DESTROY (DB_ENV_ornuked *env)
 	CODE:
         if (env)
           env->close (env, 0);
 int set_data_dir (DB_ENV *env, const char *dir)
 	CODE:
         RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
 	OUTPUT:
         RETVAL
-int set_flags (DB_ENV *env, U32 flags, int onoff)
+int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
 	CODE:
         RETVAL = env->set_flags (env, flags, onoff);
 	OUTPUT:
         RETVAL
+#if DB_VERSION_MINOR >= 7
+int set_intermediate_dir_mode (DB_ENV *env, const char *mode)
+	CODE:
+        RETVAL = env->set_intermediate_dir_mode (env, mode);
+	OUTPUT:
+        RETVAL
+int log_set_config (DB_ENV *env, U32 flags, int onoff = 1)
+	CODE:
+        RETVAL = env->log_set_config (env, flags, onoff);
+	OUTPUT:
+        RETVAL
+#endif
+void set_errfile (DB_ENV *env, FILE *errfile = 0)
+	CODE:
+        env->set_errfile (env, errfile);
+void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
+	CODE:
+        env->set_msgfile (env, msgfile);
+int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
+	CODE:
+        RETVAL = env->set_verbose (env, which, onoff);
+	OUTPUT:
+        RETVAL
 int set_encrypt (DB_ENV *env, const char *password, U32 flags = 0)
 	CODE:
         RETVAL = env->set_encrypt (env, password, flags);
 	OUTPUT:
         RETVAL
-int set_timeout (DB_ENV *env, NV timeout, U32 flags)
+int set_timeout (DB_ENV *env, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
 	CODE:
         RETVAL = env->set_timeout (env, timeout * 1000000, flags);
 	OUTPUT:
         RETVAL
 int set_lg_max (DB_ENV *env, U32 max)
 	CODE:
         RETVAL = env->set_lg_max (env, max);
 	OUTPUT:
+        RETVAL
+int mutex_set_max (DB_ENV *env, U32 max)
+        CODE:
+        RETVAL = env->mutex_set_max (env, max);
+        OUTPUT:
+        RETVAL
+int mutex_set_increment (DB_ENV *env, U32 increment)
+        CODE:
+        RETVAL = env->mutex_set_increment (env, increment);
+        OUTPUT:
+        RETVAL
+int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
+        CODE:
+        RETVAL = env->mutex_set_tas_spins (env, tas_spins);
+        OUTPUT:
+        RETVAL
+int mutex_set_align (DB_ENV *env, U32 align)
+        CODE:
+        RETVAL = env->mutex_set_align (env, align);
+        OUTPUT:
         RETVAL
 DB_TXN *
 txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
 	CODE:
         if (errno)
           croak ("DB_ENV->txn_begin: %s", db_strerror (errno));
         OUTPUT:
         RETVAL
+DB_TXN *
+cdsgroup_begin (DB_ENV *env)
+	CODE:
+        errno = env->cdsgroup_begin (env, &RETVAL);
+        if (errno)
+          croak ("DB_ENV->cdsgroup_begin: %s", db_strerror (errno));
+        OUTPUT:
+        RETVAL
 MODULE = BDB		PACKAGE = BDB::Db
 void
-DESTROY (DB_ornull *db)
+DESTROY (DB_ornuked *db)
 	CODE:
         if (db)
           {
             SV *env = (SV *)db->app_private;
             db->close (db, 0);
 	CODE:
         RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
 	OUTPUT:
         RETVAL
-int set_flags (DB *db, U32 flags);
+int set_flags (DB *db, U32 flags)
 	CODE:
         RETVAL = db->set_flags (db, flags);
 	OUTPUT:
         RETVAL
 	CODE:
         RETVAL = db->set_bt_minkey (db, minkey);
 	OUTPUT:
         RETVAL
-int set_re_delim(DB *db, int delim);
+int set_re_delim (DB *db, int delim)
 	CODE:
         RETVAL = db->set_re_delim (db, delim);
 	OUTPUT:
         RETVAL
 MODULE = BDB		PACKAGE = BDB::Txn
 void
-DESTROY (DB_TXN_ornull *txn)
+DESTROY (DB_TXN_ornuked *txn)
 	CODE:
         if (txn)
           txn->abort (txn);
-int set_timeout (DB_TXN *txn, NV timeout, U32 flags)
+int set_timeout (DB_TXN *txn, NV timeout, U32 flags = DB_SET_TXN_TIMEOUT)
 	CODE:
         RETVAL = txn->set_timeout (txn, timeout * 1000000, flags);
 	OUTPUT:
         RETVAL
+int failed (DB_TXN *txn)
+	CODE:
+        RETVAL = !!(txn->flags & TXN_DEADLOCK);
+	OUTPUT:
+        RETVAL
 MODULE = BDB		PACKAGE = BDB::Cursor
 void
-DESTROY (DBC_ornull *dbc)
+DESTROY (DBC_ornuked *dbc)
 	CODE:
         if (dbc)
           dbc->c_close (dbc);
+#if DB_VERSION_MINOR >= 6
+int set_priority (DBC *dbc, int priority)
+        CODE:
+        dbc->set_priority (dbc, priority);
+#endif
 MODULE = BDB		PACKAGE = BDB::Sequence
 void
-DESTROY (DB_SEQUENCE_ornull *seq)
+DESTROY (DB_SEQUENCE_ornuked *seq)
 	CODE:
         if (seq)
           seq->close (seq, 0);
 int initial_value (DB_SEQUENCE *seq, db_seq_t value)
 	CODE:
         RETVAL = seq->set_range (seq, min, max);
 	OUTPUT:
         RETVAL

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing BDB/BDB.xs (file contents): Revision 1.12 by root, Sun Jul 8 09:16:19 2007 UTC vs. Revision 1.44 by root, Wed Jul 9 21:00:13 2008 UTC

Diff Legend

Comparing BDB/BDB.xs (file contents):
Revision 1.12 by root, Sun Jul 8 09:16:19 2007 UTC vs.
Revision 1.44 by root, Wed Jul 9 21:00:13 2008 UTC