--- BDB/BDB.xs 2007/12/22 07:33:48 1.28 +++ BDB/BDB.xs 2009/12/04 15:04:06 1.72 @@ -1,3 +1,5 @@ +#define X_STACKSIZE 1024 * 128 + sizeof (long) * 64 * 1024 / 4 + #include "xthread.h" #include @@ -6,7 +8,9 @@ #include "perl.h" #include "XSUB.h" -// perl stupidly defines these as macros, breaking +#include "schmorp.h" + +// perl stupidly defines these as argument-less macros, breaking // lots and lots of code. #undef open #undef close @@ -29,24 +33,42 @@ #include -#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 4) -# error you need Berkeley DB 4.4 or newer installed +#if DB_VERSION_MAJOR != 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3) +# error you need Berkeley DB 4.3 or a newer 4.x version installed #endif /* number of seconds after which idle threads exit */ #define IDLE_TIMEOUT 10 +typedef SV SV_mutable; + typedef DB_ENV DB_ENV_ornull; typedef DB_TXN DB_TXN_ornull; typedef DBC DBC_ornull; typedef DB DB_ornull; + +typedef DB_ENV DB_ENV_ornuked; +typedef DB_TXN DB_TXN_ornuked; +typedef DBC DBC_ornuked; +typedef DB DB_ornuked; + +#if DB_VERSION_MINOR >= 3 typedef DB_SEQUENCE DB_SEQUENCE_ornull; +typedef DB_SEQUENCE DB_SEQUENCE_ornuked; +#endif -typedef SV SV8; /* byte-sv, used for argument-checking */ -typedef char *octetstring; +typedef char *bdb_filename; static SV *prepare_cb; +static HV + *bdb_stash, + *bdb_env_stash, + *bdb_txn_stash, + *bdb_cursor_stash, + *bdb_db_stash, + *bdb_sequence_stash; + #if DB_VERSION_MINOR >= 6 # define c_close close # define c_count count @@ -57,6 +79,36 @@ # define c_put put #endif +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) { @@ -93,7 +145,12 @@ if (sv) { SvREADONLY_off (sv); - sv_setpvn_mg (sv, dbt->data, dbt->size); + + if (dbt->data) + sv_setpvn_mg (sv, dbt->data, dbt->size); + else + sv_setsv_mg (sv, &PL_sv_undef); + SvREFCNT_dec (sv); } @@ -103,9 +160,10 @@ 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_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_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME, + REQ_ENV_LOG_ARCHIVE, + REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_VERIFY, REQ_DB_UPGRADE, + REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 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, @@ -125,13 +183,17 @@ 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; +#if DB_VERSION_MINOR >= 3 DB_SEQUENCE *seq; db_seq_t seq_t; +#endif + + SV *rsv1, *rsv2; // keep some request objects alive } bdb_cb; typedef bdb_cb *bdb_req; @@ -147,6 +209,8 @@ #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; @@ -193,7 +257,7 @@ static volatile unsigned int nreqs, nready, npending; static volatile unsigned int max_idle = 4; static volatile unsigned int max_outstanding = 0xffffffff; -static int respipe_osf [2], respipe [2] = { -1, -1 }; +static s_epipe respipe; static mutex_t reslock = X_MUTEX_INIT; static mutex_t reqlock = X_MUTEX_INIT; @@ -201,7 +265,7 @@ #if WORDACCESS_UNSAFE -static unsigned int get_nready () +static unsigned int get_nready (void) { unsigned int retval; @@ -212,7 +276,7 @@ return retval; } -static unsigned int get_npending () +static unsigned int get_npending (void) { unsigned int retval; @@ -223,7 +287,7 @@ return retval; } -static unsigned int get_nthreads () +static unsigned int get_nthreads (void) { unsigned int retval; @@ -296,71 +360,86 @@ abort (); } -static int poll_cb (); +static int poll_cb (void); static void req_free (bdb_req req); -static void req_cancel (bdb_req req); static int req_invoke (bdb_req req) { - dSP; - - if (SvOK (req->callback)) + switch (req->type) { - ENTER; - SAVETMPS; - PUSHMARK (SP); + case REQ_DB_CLOSE: + SvREFCNT_dec (req->sv1); + break; + + case REQ_DB_GET: + case REQ_DB_PGET: + case REQ_C_GET: + case REQ_C_PGET: + case REQ_DB_PUT: + case REQ_C_PUT: + dbt_to_sv (req->sv1, &req->dbt1); + dbt_to_sv (req->sv2, &req->dbt2); + dbt_to_sv (req->sv3, &req->dbt3); + break; - switch (req->type) + case REQ_DB_KEY_RANGE: { - case REQ_DB_CLOSE: - SvREFCNT_dec (req->sv1); - break; + AV *av = newAV (); - case REQ_DB_GET: - case REQ_DB_PGET: - dbt_to_sv (req->sv3, &req->dbt3); - break; + av_push (av, newSVnv (req->key_range.less)); + av_push (av, newSVnv (req->key_range.equal)); + av_push (av, newSVnv (req->key_range.greater)); + + av = (AV *)newRV_noinc ((SV *)av); + + SvREADONLY_off (req->sv1); + sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); + SvREFCNT_dec (av); + SvREFCNT_dec (req->sv1); + } + break; - case REQ_C_GET: - case REQ_C_PGET: - dbt_to_sv (req->sv1, &req->dbt1); - dbt_to_sv (req->sv2, &req->dbt2); - dbt_to_sv (req->sv3, &req->dbt3); - break; +#if DB_VERSION_MINOR >= 3 + case REQ_SEQ_GET: + SvREADONLY_off (req->sv1); - case REQ_DB_PUT: - case REQ_C_PUT: - dbt_to_sv (0, &req->dbt1); - dbt_to_sv (0, &req->dbt2); - break; + if (sizeof (IV) > 4) + sv_setiv_mg (req->sv1, (IV)req->seq_t); + else + sv_setnv_mg (req->sv1, (NV)req->seq_t); - case REQ_DB_KEY_RANGE: - { - AV *av = newAV (); + SvREFCNT_dec (req->sv1); + break; +#endif - av_push (av, newSVnv (req->key_range.less)); - av_push (av, newSVnv (req->key_range.equal)); - av_push (av, newSVnv (req->key_range.greater)); - - SvREADONLY_off (req->sv1); - sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); - SvREFCNT_dec (req->sv1); - } - break; + case REQ_ENV_LOG_ARCHIVE: + { + AV *av = newAV (); + char **listp = (char **)req->buf1; - case REQ_SEQ_GET: - SvREADONLY_off (req->sv1); + if (listp) + while (*listp) + av_push (av, newSVpv (*listp, 0)), ++listp; + + av = (AV *)newRV_noinc ((SV *)av); + + SvREADONLY_off (req->sv1); + sv_setsv_mg (req->sv1, (SV *)av); + SvREFCNT_dec (av); + SvREFCNT_dec (req->sv1); + } + break; + } - if (sizeof (IV) > 4) - sv_setiv_mg (req->sv1, (IV)req->seq_t); - else - sv_setnv_mg (req->sv1, (NV)req->seq_t); + errno = req->result; - SvREFCNT_dec (req->sv1); - break; - } + if (req->callback) + { + dSP; - errno = req->result; + ENTER; + SAVETMPS; + PUSHMARK (SP); PUTBACK; call_sv (req->callback, G_VOID | G_EVAL); @@ -368,65 +447,35 @@ FREETMPS; LEAVE; + + return !SvTRUE (ERRSV); } - return !SvTRUE (ERRSV); + return 1; } static void req_free (bdb_req req) { + SvREFCNT_dec (req->callback); + + SvREFCNT_dec (req->rsv1); + SvREFCNT_dec (req->rsv2); + free (req->buf1); free (req->buf2); + free (req->buf3); + Safefree (req); } -#ifdef USE_SOCKETS_AS_HANDLES -# define TO_SOCKET(x) (win32_get_osfhandle (x)) -#else -# define TO_SOCKET(x) (x) -#endif - static void -create_respipe () +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]); + if (s_epipe_renew (&respipe)) + croak ("BDB: unable to create event pipe"); } +static void bdb_request (bdb_req req); X_THREAD_PROC (bdb_proc); static void start_thread (void) @@ -451,7 +500,7 @@ X_UNLOCK (wrklock); } -static void maybe_start_thread () +static void maybe_start_thread (void) { if (get_nthreads () >= wanted) return; @@ -467,23 +516,46 @@ { SV *wait_callback = 0; - // synthesize callback if none given - if (!SvOK (req->callback)) + if (on_next_submit) { - int count; - dSP; + SV *cb = sv_2mortal (on_next_submit); + + on_next_submit = 0; + PUSHMARK (SP); PUTBACK; - count = call_sv (prepare_cb, G_ARRAY); + call_sv (cb, G_DISCARD | G_EVAL); SPAGAIN; + } - if (count != 2) - croak ("prepare callback must return exactly two values\n"); + // synthesize callback if none given + if (!req->callback) + { + if (SvOK (prepare_cb)) + { + int count; - wait_callback = POPs; - SvREFCNT_dec (req->callback); - req->callback = SvREFCNT_inc (POPs); + dSP; + PUSHMARK (SP); + PUTBACK; + count = call_sv (prepare_cb, G_ARRAY); + SPAGAIN; + + if (count != 2) + croak ("sync prepare callback must return exactly two values\n"); + + wait_callback = POPs; + req->callback = SvREFCNT_inc (POPs); + } + else + { + // execute request synchronously + bdb_request (req); + req_invoke (req); + req_free (req); + return; + } } ++nreqs; @@ -507,9 +579,7 @@ static void end_thread (void) { - bdb_req req; - - Newz (0, req, 1, bdb_cb); + bdb_req req = calloc (1, sizeof (bdb_cb)); req->type = REQ_QUIT; req->pri = PRI_MAX + PRI_BIAS; @@ -546,10 +616,8 @@ end_thread (); } -static void poll_wait () +static void poll_wait (void) { - fd_set rfd; - while (nreqs) { int size; @@ -562,14 +630,11 @@ maybe_start_thread (); - FD_ZERO (&rfd); - FD_SET (respipe [0], &rfd); - - PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); + s_epipe_wait (&respipe); } } -static int poll_cb () +static int poll_cb (void) { dSP; int count = 0; @@ -595,12 +660,8 @@ --npending; if (!res_queue.size) - { - /* read any signals sent by the worker threads */ - char buf [4]; - while (respipe_read (respipe [0], buf, 4) == 4) - ; - } + /* read any signals sent by the worker threads */ + s_epipe_drain (&respipe); } X_UNLOCK (reslock); @@ -645,6 +706,176 @@ /*****************************************************************************/ +static void +bdb_request (bdb_req req) +{ + switch (req->type) + { + case REQ_ENV_OPEN: + req->result = req->env->open (req->env, req->buf1, req->uint1, req->int1); + break; + + case REQ_ENV_CLOSE: + req->result = req->env->close (req->env, req->uint1); + break; + + case REQ_ENV_TXN_CHECKPOINT: + req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2); + break; + + case REQ_ENV_LOCK_DETECT: + req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1); + break; + + case REQ_ENV_MEMP_SYNC: + req->result = req->env->memp_sync (req->env, 0); + 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: + req->result = req->db->close (req->db, req->uint1); + break; + +#if DB_VERSION_MINOR >= 4 + case REQ_DB_COMPACT: + req->result = req->db->compact (req->db, req->txn, req->dbt1.data ? &req->dbt1 : 0, req->dbt2.data ? &req->dbt2 : 0, 0, req->uint1, 0); + break; +#endif + + case REQ_DB_SYNC: + req->result = req->db->sync (req->db, req->uint1); + break; + + case REQ_DB_VERIFY: + req->result = req->db->verify (req->db, req->buf1, req->buf2, 0, 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; + +#if DB_VERSION_MINOR >= 6 + case REQ_DB_EXISTS: + req->result = req->db->exists (req->db, req->txn, &req->dbt1, req->uint1); + break; +#endif + case REQ_DB_GET: + req->result = req->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1); + break; + + case REQ_DB_PGET: + req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1); + break; + + case REQ_DB_DEL: + req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1); + break; + + case REQ_DB_KEY_RANGE: + req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1); + break; + + case REQ_TXN_COMMIT: + 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; + + case REQ_C_COUNT: + { + db_recno_t recno; + req->result = req->dbc->c_count (req->dbc, &recno, req->uint1); + req->uv1 = recno; + } + break; + + case REQ_C_PUT: + req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1); + break; + + case REQ_C_GET: + req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1); + break; + + case REQ_C_PGET: + req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1); + break; + + case REQ_C_DEL: + req->result = req->dbc->c_del (req->dbc, req->uint1); + break; + +#if DB_VERSION_MINOR >= 3 + case REQ_SEQ_OPEN: + req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1); + break; + + case REQ_SEQ_CLOSE: + req->result = req->seq->close (req->seq, req->uint1); + break; + + case REQ_SEQ_GET: + req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1); + break; + + case REQ_SEQ_REMOVE: + req->result = req->seq->remove (req->seq, req->txn, req->uint1); + break; +#endif + + case REQ_ENV_LOG_ARCHIVE: + { + char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */ + req->result = req->env->log_archive (req->env, &listp, req->uint1); + req->buf1 = (char *)listp; + } + break; + + default: + req->result = ENOSYS; + break; + } + + if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED)) + req->txn->flags |= TXN_DEADLOCK; +} + X_THREAD_PROC (bdb_proc) { bdb_req req; @@ -656,7 +887,7 @@ for (;;) { - ts.tv_sec = time (0) + IDLE_TIMEOUT; + ts.tv_sec = time (0) + IDLE_TIMEOUT; X_LOCK (reqlock); @@ -693,155 +924,25 @@ --nready; 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_CLOSE: - req->result = req->env->close (req->env, req->uint1); - break; - - case REQ_ENV_TXN_CHECKPOINT: - req->result = req->env->txn_checkpoint (req->env, req->uint1, req->int1, req->uint2); - break; - - case REQ_ENV_LOCK_DETECT: - req->result = req->env->lock_detect (req->env, req->uint1, req->uint2, &req->int1); - break; - case REQ_ENV_MEMP_SYNC: - req->result = req->env->memp_sync (req->env, 0); - break; - - case REQ_ENV_MEMP_TRICKLE: - req->result = req->env->memp_trickle (req->env, req->int1, &req->int2); - 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: - req->result = req->db->close (req->db, req->uint1); - break; - - case REQ_DB_COMPACT: - req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0); - break; - - 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->db->get (req->db, req->txn, &req->dbt1, &req->dbt3, req->uint1); - break; - - case REQ_DB_PGET: - req->result = req->db->pget (req->db, req->txn, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1); - break; - - case REQ_DB_DEL: - req->result = req->db->del (req->db, req->txn, &req->dbt1, req->uint1); - break; - - case REQ_DB_KEY_RANGE: - req->result = req->db->key_range (req->db, req->txn, &req->dbt1, &req->key_range, req->uint1); - break; - - case REQ_TXN_COMMIT: - 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; - - case REQ_C_COUNT: - { - db_recno_t recno; - req->result = req->dbc->c_count (req->dbc, &recno, req->uint1); - req->uv1 = recno; - } - break; - - case REQ_C_PUT: - req->result = req->dbc->c_put (req->dbc, &req->dbt1, &req->dbt2, req->uint1); - break; - - case REQ_C_GET: - req->result = req->dbc->c_get (req->dbc, &req->dbt1, &req->dbt3, req->uint1); - break; - - case REQ_C_PGET: - req->result = req->dbc->c_pget (req->dbc, &req->dbt1, &req->dbt2, &req->dbt3, req->uint1); - break; - - case REQ_C_DEL: - req->result = req->dbc->c_del (req->dbc, req->uint1); - break; - - case REQ_SEQ_OPEN: - req->result = req->seq->open (req->seq, req->txn, &req->dbt1, req->uint1); - break; - - case REQ_SEQ_CLOSE: - req->result = req->seq->close (req->seq, req->uint1); - break; - - case REQ_SEQ_GET: - req->result = req->seq->get (req->seq, req->txn, req->int1, &req->seq_t, req->uint1); - break; - - case REQ_SEQ_REMOVE: - req->result = req->seq->remove (req->seq, req->txn, req->uint1); - break; + if (req->type == REQ_QUIT) + { + X_LOCK (reslock); + free (req); + self->req = 0; + X_UNLOCK (reslock); - default: - req->result = ENOSYS; - break; + goto quit; } - if (req->txn && (req->result > 0 || req->result == DB_LOCK_NOTGRANTED)) - req->txn->flags |= TXN_DEADLOCK; + bdb_request (req); X_LOCK (reslock); ++npending; if (!reqq_push (&res_queue, req)) - /* write a dummy byte to the pipe so fh becomes ready */ - respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); + s_epipe_signal (&respipe); self->req = 0; worker_clear (self); @@ -905,43 +1006,59 @@ atfork_parent (); } -#define dREQ(reqtype) \ +#define dREQ(reqtype,rsvcnt) \ bdb_req req; \ int req_pri = next_pri; \ next_pri = DEFAULT_PRI + PRI_BIAS; \ \ - if (SvOK (callback) && !SvROK (callback)) \ - croak ("callback must be undef or of reference type"); \ + if (callback && SvOK (callback)) \ + croak ("callback has illegal type or extra arguments"); \ \ Newz (0, req, 1, bdb_cb); \ if (!req) \ croak ("out of memory during bdb_req allocation"); \ \ - req->callback = newSVsv (callback); \ + req->callback = SvREFCNT_inc (cb); \ req->type = (reqtype); \ - req->pri = req_pri + req->pri = req_pri; \ + if (rsvcnt >= 1) req->rsv1 = SvREFCNT_inc (ST (0)); \ + if (rsvcnt >= 2) req->rsv2 = SvREFCNT_inc (ST (1)); \ + (void)0; #define REQ_SEND \ req_send (req) -#define SvPTR(var, arg, type, class, nullok) \ +#define SvPTR(var, arg, type, stash, 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)) \ + else if (SvSTASH (SvRV (arg)) == stash || 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); + +#define ARG_MUTABLE(name) \ + if (SvREADONLY (name)) \ + croak ("argument " #name " is read-only/constant, but the request requires it to be mutable"); + +static SV * +newSVptr (void *ptr, HV *stash) +{ + SV *rv = NEWSV (0, 0); + sv_upgrade (rv, SVt_PVMG); + sv_setiv (rv, PTR2IV (ptr)); + + return sv_bless (newRV_noinc (rv), stash); +} static void ptr_nuke (SV *sv) @@ -950,14 +1067,129 @@ 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; +} + +/*****************************************************************************/ + +#if 0 +static int +bt_pfxc_compare (DB *db, const DBT *dbt1, const DBT *dbt2) +{ + ssize_t size1 = dbt1->size; + ssize_t size2 = dbt2->size; + int res = memcmp ((void *)dbt1->data, (void *)dbt2->data, + size1 <= size2 ? size1 : size2); + + if (res) + return res; + else if (size1 - size2) + return size1 - size2; + else + return 0; +} + +static size_t +bt_pfxc_prefix_x (DB *db, const DBT *dbt1, const DBT *dbt2) +{ + ssize_t size1 = dbt1->size; + ssize_t size2 = dbt2->size; + u_int8_t *p1 = (u_int8_t *)dbt1->data; + u_int8_t *p2 = (u_int8_t *)dbt2->data; + u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2); + + while (p1 < pe) + if (*p1++ != *p2++) + return p1 - (u_int8_t *)dbt1->data - 1; + + if (size1 < size2) return size1 + 1; + if (size1 > size2) return size2 + 1; + + return size1; +} +#endif + +/*****************************************************************************/ + +/* stupid windows defines CALLBACK as well */ +#undef CALLBACK +#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); + MODULE = BDB PACKAGE = BDB PROTOTYPES: ENABLE BOOT: { - HV *stash = gv_stashpv ("BDB", 1); - static const struct { const char *name; IV iv; @@ -979,16 +1211,10 @@ 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 (NOMMAP) const_iv (NOPANIC) @@ -1009,18 +1235,15 @@ const_iv (RECNO) const_iv (UNKNOWN) const_iv (EXCL) - const_iv (READ_COMMITTED) - const_iv (READ_UNCOMMITTED) const_iv (TRUNCATE) const_iv (NOSYNC) const_iv (CHKSUM) const_iv (ENCRYPT) const_iv (DUP) const_iv (DUPSORT) - const_iv (RECNUM) + //const_iv (RECNUM) const_iv (RENUMBER) const_iv (REVSPLITOFF) - const_iv (INORDER) const_iv (CONSUME) const_iv (CONSUME_WAIT) const_iv (GET_BOTH) @@ -1039,12 +1262,8 @@ const_iv (RUNRECOVERY) const_iv (OLD_VERSION) const_iv (REP_HANDLE_DEAD) - const_iv (REP_LOCKOUT) const_iv (SECONDARY_BAD) - const_iv (FREE_SPACE) - const_iv (FREELIST_ONLY) - const_iv (APPEND) const_iv (NODUPDATA) const_iv (NOOVERWRITE) @@ -1076,24 +1295,17 @@ const_iv (LOCK_DEFAULT) const_iv (LOCK_EXPIRE) const_iv (LOCK_MAXLOCKS) - const_iv (LOCK_MAXWRITE) const_iv (LOCK_MINLOCKS) const_iv (LOCK_MINWRITE) const_iv (LOCK_OLDEST) const_iv (LOCK_RANDOM) 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) @@ -1102,10 +1314,7 @@ 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) @@ -1113,17 +1322,48 @@ const_iv (RUNRECOVERY) const_iv (SECONDARY_BAD) const_iv (VERIFY_BAD) - const_iv (VERSION_MISMATCH) + + const_iv (SALVAGE) + const_iv (AGGRESSIVE) + const_iv (PRINTABLE) + const_iv (NOORDERCHK) + const_iv (ORDERCHKONLY) + + const_iv (ARCH_ABS) + const_iv (ARCH_DATA) + const_iv (ARCH_LOG) + const_iv (ARCH_REMOVE) 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 >= 3 + const_iv (INORDER) + const_iv (LOCK_MAXWRITE) + const_iv (SEQ_DEC) + const_iv (SEQ_INC) + const_iv (SEQ_WRAP) + const_iv (BUFFER_SMALL) + const_iv (LOG_BUFFER_FULL) + const_iv (VERSION_MISMATCH) +#endif +#if DB_VERSION_MINOR >= 4 + const_iv (REGISTER) + const_iv (DSYNC_DB) + const_iv (READ_COMMITTED) + const_iv (READ_UNCOMMITTED) + const_iv (REP_IGNORE) + const_iv (REP_LOCKOUT) + const_iv (REP_JOIN_FAILURE) + const_iv (FREE_SPACE) + const_iv (FREELIST_ONLY) + const_iv (VERB_REGISTER) +#endif #if DB_VERSION_MINOR >= 5 const_iv (MULTIVERSION) const_iv (TXN_SNAPSHOT) @@ -1136,25 +1376,50 @@ const_iv (PRIORITY_DEFAULT) const_iv (PRIORITY_HIGH) const_iv (PRIORITY_VERY_HIGH) + const_iv (IGNORE_LEASE) +#endif +#if DB_VERSION_MINOR >= 7 + //const_iv (MULTIPLE_KEY) + 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 (LOG_AUTOREMOVE) +# if DB_VERSION_MINOR >= 3 + const_iv (DSYNC_LOG) + const_iv (LOG_INMEMORY) +# endif #endif }; + bdb_stash = gv_stashpv ("BDB" , 1); + bdb_env_stash = gv_stashpv ("BDB::Env" , 1); + bdb_txn_stash = gv_stashpv ("BDB::Txn" , 1); + bdb_cursor_stash = gv_stashpv ("BDB::Cursor" , 1); + bdb_db_stash = gv_stashpv ("BDB::Db" , 1); + bdb_sequence_stash = gv_stashpv ("BDB::Sequence", 1); + for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) - newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); + newCONSTSUB (bdb_stash, (char *)civ->name, newSViv (civ->iv)); + + prepare_cb = &PL_sv_undef; + + { + /* 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", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); - newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); + newCONSTSUB (bdb_stash, "VERSION_v", newSVpvn (vstring, 3)); + } + + newCONSTSUB (bdb_stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); create_respipe (); X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); -#ifdef _WIN32 - X_MUTEX_CHECK (wrklock); - X_MUTEX_CHECK (reslock); - X_MUTEX_CHECK (reqlock); - - X_COND_CHECK (reqwait); -#endif + patch_errno (); } void @@ -1237,7 +1502,7 @@ poll_fileno () PROTOTYPE: CODE: - RETVAL = respipe [0]; + RETVAL = s_epipe_fd (&respipe); OUTPUT: RETVAL @@ -1289,12 +1554,14 @@ OUTPUT: RETVAL -void +SV * set_sync_prepare (SV *cb) PROTOTYPE: & CODE: - SvREFCNT_dec (prepare_cb); + RETVAL = prepare_cb; prepare_cb = newSVsv (cb); + OUTPUT: + RETVAL char * strerror (int errorno = errno) @@ -1304,6 +1571,11 @@ 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: @@ -1322,13 +1594,12 @@ 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: { - dREQ (REQ_ENV_OPEN); - - env->set_thread_count (env, wanted + 2); - + dREQ (REQ_ENV_OPEN, 1); req->env = env; req->uint1 = open_flags | DB_THREAD; req->int1 = mode; @@ -1337,21 +1608,25 @@ } 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); + dREQ (REQ_ENV_CLOSE, 0); + ptr_nuke (ST (0)); 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); + dREQ (REQ_ENV_TXN_CHECKPOINT, 1); req->env = env; req->uint1 = kbyte; req->int1 = min; @@ -1360,35 +1635,83 @@ } 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); + dREQ (REQ_ENV_LOCK_DETECT, 1); 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); + dREQ (REQ_ENV_MEMP_SYNC, 1); 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); + dREQ (REQ_ENV_MEMP_TRICKLE, 1); 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, 2); + 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, 2); + req->env = env; + req->buf1 = strdup_ornull (file); + req->buf2 = strdup_ornull (database); + req->buf3 = strdup_ornull (newname); + req->uint1 = flags; + REQ_SEND; +} + +void +db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0) + PREINIT: + CALLBACK + CODE: +{ + dREQ (REQ_ENV_LOG_ARCHIVE, 1); + req->sv1 = SvREFCNT_inc (listp); + req->env = env; + req->uint1 = flags; + REQ_SEND; +} DB * db_create (DB_ENV *env = 0, U32 flags = 0) @@ -1405,10 +1728,12 @@ 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); + dREQ (REQ_DB_OPEN, 2); req->db = db; req->txn = txnid; req->buf1 = strdup_ornull (file); @@ -1420,45 +1745,72 @@ } 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); + dREQ (REQ_DB_CLOSE, 0); + ptr_nuke (ST (0)); req->db = db; req->uint1 = flags; req->sv1 = (SV *)db->app_private; REQ_SEND; - ptr_nuke (ST (0)); } +#if DB_VERSION_MINOR >= 4 + 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); + dREQ (REQ_DB_COMPACT, 2); req->db = db; req->txn = txn; - sv_to_dbt (&req->dbt1, start); - sv_to_dbt (&req->dbt2, stop); + if (start) sv_to_dbt (&req->dbt1, start); + if (stop ) sv_to_dbt (&req->dbt2, stop ); req->uint1 = flags; REQ_SEND; } +#endif + 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); + dREQ (REQ_DB_SYNC, 1); req->db = db; req->uint1 = flags; REQ_SEND; } void -db_upgrade (DB *db, octetstring file, U32 flags = 0, SV *callback = &PL_sv_undef) +db_verify (DB *db, bdb_filename file, bdb_filename database = 0, SV *dummy = 0, U32 flags = 0, SV *callback = 0) + PREINIT: + CALLBACK + CODE: +{ + dREQ (REQ_DB_VERIFY, 1); + ptr_nuke (ST (0)); /* verify destroys the database handle, hopefully it is freed as well */ + req->db = db; + req->buf1 = strdup (file); + req->buf2 = strdup_ornull (database); + 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); + dREQ (REQ_DB_UPGRADE, 1); req->db = db; req->buf1 = strdup (file); req->uint1 = flags; @@ -1466,10 +1818,12 @@ } 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_mutable *key_range, U32 flags = 0, SV *callback = 0) + PREINIT: + CALLBACK CODE: { - dREQ (REQ_DB_KEY_RANGE); + dREQ (REQ_DB_KEY_RANGE, 2); req->db = db; req->txn = txn; sv_to_dbt (&req->dbt1, key); @@ -1479,10 +1833,12 @@ } 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); + dREQ (REQ_DB_PUT, 2); req->db = db; req->txn = txn; sv_to_dbt (&req->dbt1, key); @@ -1491,13 +1847,32 @@ REQ_SEND; } +#if DB_VERSION_MINOR >= 6 + +void +db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0) + PREINIT: + CALLBACK + CODE: +{ + dREQ (REQ_DB_EXISTS, 2); + req->db = db; + req->txn = txn; + req->uint1 = flags; + sv_to_dbt (&req->dbt1, key); + REQ_SEND; +} + +#endif + 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_mutable *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); + //TODO: key is somtimesmutable + dREQ (REQ_DB_GET, 2); req->db = db; req->txn = txn; req->uint1 = flags; @@ -1508,27 +1883,34 @@ } 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_mutable *pkey, SV_mutable *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); + //TODO: key is somtimesmutable + dREQ (REQ_DB_PGET, 2); req->db = db; req->txn = txn; req->uint1 = flags; + sv_to_dbt (&req->dbt1, key); - sv_to_dbt (&req->dbt2, pkey); + + req->dbt2.flags = DB_DBT_MALLOC; + req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); + req->dbt3.flags = DB_DBT_MALLOC; 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); + dREQ (REQ_DB_DEL, 2); req->db = db; req->txn = txn; req->uint1 = flags; @@ -1537,62 +1919,74 @@ } 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); + dREQ (REQ_TXN_COMMIT, 0); + ptr_nuke (ST (0)); 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); + dREQ (REQ_TXN_ABORT, 0); + ptr_nuke (ST (0)); req->txn = txn; REQ_SEND; - ptr_nuke (ST (0)); } void -db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = &PL_sv_undef) +db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0) + PREINIT: + CALLBACK CODE: { - dREQ (REQ_TXN_FINISH); + dREQ (REQ_TXN_FINISH, 0); + ptr_nuke (ST (0)); 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); + dREQ (REQ_C_CLOSE, 0); + ptr_nuke (ST (0)); 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); + dREQ (REQ_C_COUNT, 1); 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); + dREQ (REQ_C_PUT, 1); req->dbc = dbc; sv_to_dbt (&req->dbt1, key); sv_to_dbt (&req->dbt2, data); @@ -1601,74 +1995,110 @@ } 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_mutable *data, U32 flags = 0, SV *callback = 0) + PREINIT: + CALLBACK CODE: { - dREQ (REQ_C_GET); - req->dbc = dbc; - req->uint1 = flags; - if ((flags & DB_SET) == DB_SET - || (flags & DB_SET_RANGE) == DB_SET_RANGE) - sv_to_dbt (&req->dbt1, key); - else - req->dbt1.flags = DB_DBT_MALLOC; + if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key)) + croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET"); + if (SvPOKp (key) && !sv_utf8_downgrade (key, 1)) + croak ("argument \"%s\" must be byte/octet-encoded in %s", + "key", + "BDB::db_c_get"); - req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); + { + dREQ (REQ_C_GET, 1); + req->dbc = dbc; + req->uint1 = flags; + if ((flags & DB_OPFLAGS_MASK) == DB_SET) + sv_to_dbt (&req->dbt1, key); + else + { + if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE) + sv_to_dbt (&req->dbt1, key); + else + req->dbt1.flags = DB_DBT_MALLOC; - if ((flags & DB_GET_BOTH) == DB_GET_BOTH - || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) - sv_to_dbt (&req->dbt3, data); - else - req->dbt3.flags = DB_DBT_MALLOC; + req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); + } - req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); - REQ_SEND; + if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH + || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE) + sv_to_dbt (&req->dbt3, data); + else + req->dbt3.flags = DB_DBT_MALLOC; + + 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_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) + PREINIT: + CALLBACK CODE: { - dREQ (REQ_C_PGET); - req->dbc = dbc; - req->uint1 = flags; - if ((flags & DB_SET) == DB_SET - || (flags & DB_SET_RANGE) == DB_SET_RANGE) - sv_to_dbt (&req->dbt1, key); - else - req->dbt1.flags = DB_DBT_MALLOC; + if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key)) + croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); + if (SvPOKp (key) && !sv_utf8_downgrade (key, 1)) + croak ("argument \"%s\" must be byte/octet-encoded in %s", + "key", + "BDB::db_c_pget"); - req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); + { + dREQ (REQ_C_PGET, 1); + req->dbc = dbc; + req->uint1 = flags; + if ((flags & DB_OPFLAGS_MASK) == DB_SET) + sv_to_dbt (&req->dbt1, key); + else + { + if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE) + sv_to_dbt (&req->dbt1, key); + else + req->dbt1.flags = DB_DBT_MALLOC; - req->dbt2.flags = DB_DBT_MALLOC; - req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); + req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); + } - if ((flags & DB_GET_BOTH) == DB_GET_BOTH - || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) - sv_to_dbt (&req->dbt3, data); - else - req->dbt3.flags = DB_DBT_MALLOC; + req->dbt2.flags = DB_DBT_MALLOC; + req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); - req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); - REQ_SEND; + if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH + || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE) + sv_to_dbt (&req->dbt3, data); + else + req->dbt3.flags = DB_DBT_MALLOC; + + 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); + dREQ (REQ_C_DEL, 1); req->dbc = dbc; req->uint1 = flags; REQ_SEND; } +#if DB_VERSION_MINOR >= 3 + 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); + dREQ (REQ_SEQ_OPEN, 2); req->seq = seq; req->txn = txnid; req->uint1 = flags | DB_THREAD; @@ -1677,21 +2107,25 @@ } 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); + dREQ (REQ_SEQ_CLOSE, 0); + ptr_nuke (ST (0)); 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_mutable *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0) + PREINIT: + CALLBACK CODE: { - dREQ (REQ_SEQ_GET); + dREQ (REQ_SEQ_GET, 2); req->seq = seq; req->txn = txnid; req->int1 = delta; @@ -1701,21 +2135,25 @@ } 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); + dREQ (REQ_SEQ_REMOVE, 2); req->seq = seq; req->txn = txnid; req->uint1 = flags; REQ_SEND; } +#endif + MODULE = BDB PACKAGE = BDB::Env void -DESTROY (DB_ENV_ornull *env) +DESTROY (DB_ENV_ornuked *env) CODE: if (env) env->close (env, 0); @@ -1756,6 +2194,23 @@ 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); @@ -1836,6 +2291,8 @@ OUTPUT: RETVAL +#if DB_VERSION_MINOR >= 4 + int mutex_set_max (DB_ENV *env, U32 max) CODE: RETVAL = env->mutex_set_max (env, max); @@ -1860,6 +2317,8 @@ OUTPUT: RETVAL +#endif + DB_TXN * txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) CODE: @@ -1869,10 +2328,23 @@ OUTPUT: RETVAL +#if DB_VERSION_MINOR >= 5 + +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 + +#endif + MODULE = BDB PACKAGE = BDB::Db void -DESTROY (DB_ornull *db) +DESTROY (DB_ornuked *db) CODE: if (db) { @@ -1887,6 +2359,12 @@ OUTPUT: RETVAL +int set_pagesize (DB *db, U32 pagesize) + CODE: + RETVAL = db->set_pagesize (db, pagesize); + OUTPUT: + RETVAL + int set_flags (DB *db, U32 flags) CODE: RETVAL = db->set_flags (db, flags); @@ -1962,6 +2440,8 @@ OUTPUT: RETVAL +#if DB_VERSION_MINOR >= 3 + DB_SEQUENCE * sequence (DB *db, U32 flags = 0) CODE: @@ -1973,11 +2453,13 @@ OUTPUT: RETVAL +#endif + MODULE = BDB PACKAGE = BDB::Txn void -DESTROY (DB_TXN_ornull *txn) +DESTROY (DB_TXN_ornuked *txn) CODE: if (txn) txn->abort (txn); @@ -1998,7 +2480,7 @@ MODULE = BDB PACKAGE = BDB::Cursor void -DESTROY (DBC_ornull *dbc) +DESTROY (DBC_ornuked *dbc) CODE: if (dbc) dbc->c_close (dbc); @@ -2011,10 +2493,12 @@ #endif +#if DB_VERSION_MINOR >= 3 + MODULE = BDB PACKAGE = BDB::Sequence void -DESTROY (DB_SEQUENCE_ornull *seq) +DESTROY (DB_SEQUENCE_ornuked *seq) CODE: if (seq) seq->close (seq, 0); @@ -2043,3 +2527,6 @@ OUTPUT: RETVAL +#endif + +