ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/BDB/BDB.xs
(Generate patch)

Comparing BDB/BDB.xs (file contents):
Revision 1.56 by root, Mon Sep 29 02:59:08 2008 UTC vs.
Revision 1.69 by root, Wed Jul 15 14:40:00 2009 UTC

… …
6 6
7#include "EXTERN.h" 7#include "EXTERN.h"
8#include "perl.h" 8#include "perl.h"
9#include "XSUB.h" 9#include "XSUB.h"
10 10
11#include "schmorp.h"
12
11// perl stupidly defines these as macros, breaking 13// perl stupidly defines these as argument-less macros, breaking
12// lots and lots of code. 14// lots and lots of code.
13#undef open 15#undef open
14#undef close 16#undef close
15#undef abort 17#undef abort
16#undef malloc 18#undef malloc
… …
53#if DB_VERSION_MINOR >= 3 55#if DB_VERSION_MINOR >= 3
54typedef DB_SEQUENCE DB_SEQUENCE_ornull; 56typedef DB_SEQUENCE DB_SEQUENCE_ornull;
55typedef DB_SEQUENCE DB_SEQUENCE_ornuked; 57typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
56#endif 58#endif
57 59
58typedef SV SV8; /* byte-sv, used for argument-checking */
59typedef char *bdb_filename; 60typedef char *bdb_filename;
60 61
61static SV *prepare_cb; 62static SV *prepare_cb;
62 63
63#if DB_VERSION_MINOR >= 6 64#if DB_VERSION_MINOR >= 6
… …
150 151
151enum { 152enum {
152 REQ_QUIT, 153 REQ_QUIT,
153 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 154 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
154 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME, 155 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
156 REQ_ENV_LOG_ARCHIVE,
155 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 157 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_VERIFY, REQ_DB_UPGRADE,
156 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 158 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 159 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
158 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 160 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
159 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 161 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
160}; 162};
… …
245} 247}
246 248
247static volatile unsigned int nreqs, nready, npending; 249static volatile unsigned int nreqs, nready, npending;
248static volatile unsigned int max_idle = 4; 250static volatile unsigned int max_idle = 4;
249static volatile unsigned int max_outstanding = 0xffffffff; 251static volatile unsigned int max_outstanding = 0xffffffff;
250static int respipe_osf [2], respipe [2] = { -1, -1 }; 252static s_epipe respipe;
251 253
252static mutex_t reslock = X_MUTEX_INIT; 254static mutex_t reslock = X_MUTEX_INIT;
253static mutex_t reqlock = X_MUTEX_INIT; 255static mutex_t reqlock = X_MUTEX_INIT;
254static cond_t reqwait = X_COND_INIT; 256static cond_t reqwait = X_COND_INIT;
255 257
… …
350 abort (); 352 abort ();
351} 353}
352 354
353static int poll_cb (void); 355static int poll_cb (void);
354static void req_free (bdb_req req); 356static void req_free (bdb_req req);
355static void req_cancel (bdb_req req);
356 357
357static int req_invoke (bdb_req req) 358static int req_invoke (bdb_req req)
358{ 359{
359 switch (req->type) 360 switch (req->type)
360 { 361 {
… …
379 380
380 av_push (av, newSVnv (req->key_range.less)); 381 av_push (av, newSVnv (req->key_range.less));
381 av_push (av, newSVnv (req->key_range.equal)); 382 av_push (av, newSVnv (req->key_range.equal));
382 av_push (av, newSVnv (req->key_range.greater)); 383 av_push (av, newSVnv (req->key_range.greater));
383 384
385 av = (AV *)newRV_noinc ((SV *)av);
386
384 SvREADONLY_off (req->sv1); 387 SvREADONLY_off (req->sv1);
385 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 388 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
389 SvREFCNT_dec (av);
386 SvREFCNT_dec (req->sv1); 390 SvREFCNT_dec (req->sv1);
387 } 391 }
388 break; 392 break;
389 393
390#if DB_VERSION_MINOR >= 3 394#if DB_VERSION_MINOR >= 3
… …
397 sv_setnv_mg (req->sv1, (NV)req->seq_t); 401 sv_setnv_mg (req->sv1, (NV)req->seq_t);
398 402
399 SvREFCNT_dec (req->sv1); 403 SvREFCNT_dec (req->sv1);
400 break; 404 break;
401#endif 405#endif
406
407 case REQ_ENV_LOG_ARCHIVE:
408 {
409 AV *av = newAV ();
410 char **listp = (char **)req->buf1;
411
412 if (listp)
413 while (*listp)
414 av_push (av, newSVpv (*listp, 0)), ++listp;
415
416 av = (AV *)newRV_noinc ((SV *)av);
417
418 SvREADONLY_off (req->sv1);
419 sv_setsv_mg (req->sv1, (SV *)av);
420 SvREFCNT_dec (av);
421 SvREFCNT_dec (req->sv1);
422 }
423 break;
402 } 424 }
403 425
404 errno = req->result; 426 errno = req->result;
405 427
406 if (req->callback) 428 if (req->callback)
… …
436 free (req->buf3); 458 free (req->buf3);
437 459
438 Safefree (req); 460 Safefree (req);
439} 461}
440 462
441#ifdef USE_SOCKETS_AS_HANDLES
442# define TO_SOCKET(x) (win32_get_osfhandle (x))
443#else
444# define TO_SOCKET(x) (x)
445#endif
446
447static void 463static void
448create_respipe (void) 464create_respipe (void)
449{ 465{
450#ifdef _WIN32
451 int arg; /* argg */
452#endif
453 int old_readfd = respipe [0];
454
455 if (respipe [1] >= 0)
456 respipe_close (TO_SOCKET (respipe [1]));
457
458#ifdef _WIN32
459 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
460#else
461 if (pipe (respipe)) 466 if (s_epipe_renew (&respipe))
462#endif 467 croak ("BDB: unable to create event pipe");
463 croak ("unable to initialize result pipe");
464
465 if (old_readfd >= 0)
466 {
467 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
468 croak ("unable to initialize result pipe(2)");
469
470 respipe_close (respipe [0]);
471 respipe [0] = old_readfd;
472 }
473
474#ifdef _WIN32
475 arg = 1;
476 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
477 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
478#else
479 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
480 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
481#endif
482 croak ("unable to initialize result pipe(3)");
483
484 respipe_osf [0] = TO_SOCKET (respipe [0]);
485 respipe_osf [1] = TO_SOCKET (respipe [1]);
486} 468}
487 469
488static void bdb_request (bdb_req req); 470static void bdb_request (bdb_req req);
489X_THREAD_PROC (bdb_proc); 471X_THREAD_PROC (bdb_proc);
490 472
… …
640 if (size) 622 if (size)
641 return; 623 return;
642 624
643 maybe_start_thread (); 625 maybe_start_thread ();
644 626
645 FD_ZERO (&rfd); 627 s_epipe_wait (&respipe);
646 FD_SET (respipe [0], &rfd);
647
648 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
649 } 628 }
650} 629}
651 630
652static int poll_cb (void) 631static int poll_cb (void)
653{ 632{
… …
673 if (req) 652 if (req)
674 { 653 {
675 --npending; 654 --npending;
676 655
677 if (!res_queue.size) 656 if (!res_queue.size)
678 {
679 /* read any signals sent by the worker threads */ 657 /* read any signals sent by the worker threads */
680 char buf [4]; 658 s_epipe_drain (&respipe);
681 while (respipe_read (respipe [0], buf, 4) == 4)
682 ;
683 }
684 } 659 }
685 660
686 X_UNLOCK (reslock); 661 X_UNLOCK (reslock);
687 662
688 if (!req) 663 if (!req)
… …
770 req->result = req->db->close (req->db, req->uint1); 745 req->result = req->db->close (req->db, req->uint1);
771 break; 746 break;
772 747
773#if DB_VERSION_MINOR >= 4 748#if DB_VERSION_MINOR >= 4
774 case REQ_DB_COMPACT: 749 case REQ_DB_COMPACT:
775 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0); 750 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);
776 break; 751 break;
777#endif 752#endif
778 753
779 case REQ_DB_SYNC: 754 case REQ_DB_SYNC:
780 req->result = req->db->sync (req->db, req->uint1); 755 req->result = req->db->sync (req->db, req->uint1);
756 break;
757
758 case REQ_DB_VERIFY:
759 req->result = req->db->verify (req->db, req->buf1, req->buf2, 0, req->uint1);
781 break; 760 break;
782 761
783 case REQ_DB_UPGRADE: 762 case REQ_DB_UPGRADE:
784 req->result = req->db->upgrade (req->db, req->buf1, req->uint1); 763 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
785 break; 764 break;
… …
872 case REQ_SEQ_REMOVE: 851 case REQ_SEQ_REMOVE:
873 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 852 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
874 break; 853 break;
875#endif 854#endif
876 855
856 case REQ_ENV_LOG_ARCHIVE:
857 {
858 char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */
859 req->result = req->env->log_archive (req->env, &listp, req->uint1);
860 req->buf1 = (char *)listp;
861 }
862 break;
863
877 default: 864 default:
878 req->result = ENOSYS; 865 req->result = ENOSYS;
879 break; 866 break;
880 } 867 }
881 868
… …
892 /* try to distribute timeouts somewhat evenly */ 879 /* try to distribute timeouts somewhat evenly */
893 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 880 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
894 881
895 for (;;) 882 for (;;)
896 { 883 {
897 ts.tv_sec = time (0) + IDLE_TIMEOUT; 884 ts.tv_sec = time (0) + IDLE_TIMEOUT;
898 885
899 X_LOCK (reqlock); 886 X_LOCK (reqlock);
900 887
901 for (;;) 888 for (;;)
902 { 889 {
… …
947 X_LOCK (reslock); 934 X_LOCK (reslock);
948 935
949 ++npending; 936 ++npending;
950 937
951 if (!reqq_push (&res_queue, req)) 938 if (!reqq_push (&res_queue, req))
952 /* write a dummy byte to the pipe so fh becomes ready */ 939 s_epipe_signal (&respipe);
953 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
954 940
955 self->req = 0; 941 self->req = 0;
956 worker_clear (self); 942 worker_clear (self);
957 943
958 X_UNLOCK (reslock); 944 X_UNLOCK (reslock);
… …
1135 } 1121 }
1136 1122
1137 return 0; 1123 return 0;
1138} 1124}
1139 1125
1126/*****************************************************************************/
1127
1128#if 0
1129static int
1130bt_pfxc_compare (DB *db, const DBT *dbt1, const DBT *dbt2)
1131{
1132 ssize_t size1 = dbt1->size;
1133 ssize_t size2 = dbt2->size;
1134 int res = memcmp ((void *)dbt1->data, (void *)dbt2->data,
1135 size1 <= size2 ? size1 : size2);
1136
1137 if (res)
1138 return res;
1139 else if (size1 - size2)
1140 return size1 - size2;
1141 else
1142 return 0;
1143}
1144
1145static size_t
1146bt_pfxc_prefix_x (DB *db, const DBT *dbt1, const DBT *dbt2)
1147{
1148 ssize_t size1 = dbt1->size;
1149 ssize_t size2 = dbt2->size;
1150 u_int8_t *p1 = (u_int8_t *)dbt1->data;
1151 u_int8_t *p2 = (u_int8_t *)dbt2->data;
1152 u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2);
1153
1154 while (p1 < pe)
1155 if (*p1++ != *p2++)
1156 return p1 - (u_int8_t *)dbt1->data - 1;
1157
1158 if (size1 < size2) return size1 + 1;
1159 if (size1 > size2) return size2 + 1;
1160
1161 return size1;
1162}
1163#endif
1164
1165/*****************************************************************************/
1166
1140/* stupid windoes defined CALLBACK as well */ 1167/* stupid windows defines CALLBACK as well */
1141#undef CALLBACK 1168#undef CALLBACK
1142#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1169#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1143 1170
1144MODULE = BDB PACKAGE = BDB 1171MODULE = BDB PACKAGE = BDB
1145 1172
… …
1198 const_iv (NOSYNC) 1225 const_iv (NOSYNC)
1199 const_iv (CHKSUM) 1226 const_iv (CHKSUM)
1200 const_iv (ENCRYPT) 1227 const_iv (ENCRYPT)
1201 const_iv (DUP) 1228 const_iv (DUP)
1202 const_iv (DUPSORT) 1229 const_iv (DUPSORT)
1203 const_iv (RECNUM) 1230 //const_iv (RECNUM)
1204 const_iv (RENUMBER) 1231 const_iv (RENUMBER)
1205 const_iv (REVSPLITOFF) 1232 const_iv (REVSPLITOFF)
1206 const_iv (CONSUME) 1233 const_iv (CONSUME)
1207 const_iv (CONSUME_WAIT) 1234 const_iv (CONSUME_WAIT)
1208 const_iv (GET_BOTH) 1235 const_iv (GET_BOTH)
… …
1280 const_iv (REP_UNAVAIL) 1307 const_iv (REP_UNAVAIL)
1281 const_iv (RUNRECOVERY) 1308 const_iv (RUNRECOVERY)
1282 const_iv (SECONDARY_BAD) 1309 const_iv (SECONDARY_BAD)
1283 const_iv (VERIFY_BAD) 1310 const_iv (VERIFY_BAD)
1284 1311
1312 const_iv (SALVAGE)
1313 const_iv (AGGRESSIVE)
1314 const_iv (PRINTABLE)
1315 const_iv (NOORDERCHK)
1316 const_iv (ORDERCHKONLY)
1317
1318 const_iv (ARCH_ABS)
1319 const_iv (ARCH_DATA)
1320 const_iv (ARCH_LOG)
1321 const_iv (ARCH_REMOVE)
1322
1285 const_iv (VERB_DEADLOCK) 1323 const_iv (VERB_DEADLOCK)
1286 const_iv (VERB_RECOVERY) 1324 const_iv (VERB_RECOVERY)
1287 const_iv (VERB_REPLICATION) 1325 const_iv (VERB_REPLICATION)
1288 const_iv (VERB_WAITSFOR) 1326 const_iv (VERB_WAITSFOR)
1289 1327
… …
1322 const_iv (PRIORITY_VERY_LOW) 1360 const_iv (PRIORITY_VERY_LOW)
1323 const_iv (PRIORITY_LOW) 1361 const_iv (PRIORITY_LOW)
1324 const_iv (PRIORITY_DEFAULT) 1362 const_iv (PRIORITY_DEFAULT)
1325 const_iv (PRIORITY_HIGH) 1363 const_iv (PRIORITY_HIGH)
1326 const_iv (PRIORITY_VERY_HIGH) 1364 const_iv (PRIORITY_VERY_HIGH)
1365 const_iv (IGNORE_LEASE)
1327#endif 1366#endif
1328#if DB_VERSION_MINOR >= 7 1367#if DB_VERSION_MINOR >= 7
1368 //const_iv (MULTIPLE_KEY)
1329 const_iv (LOG_DIRECT) 1369 const_iv (LOG_DIRECT)
1330 const_iv (LOG_DSYNC) 1370 const_iv (LOG_DSYNC)
1331 const_iv (LOG_AUTO_REMOVE) 1371 const_iv (LOG_AUTO_REMOVE)
1332 const_iv (LOG_IN_MEMORY) 1372 const_iv (LOG_IN_MEMORY)
1333 const_iv (LOG_ZERO) 1373 const_iv (LOG_ZERO)
… …
1439 1479
1440int 1480int
1441poll_fileno () 1481poll_fileno ()
1442 PROTOTYPE: 1482 PROTOTYPE:
1443 CODE: 1483 CODE:
1444 RETVAL = respipe [0]; 1484 RETVAL = s_epipe_fd (&respipe);
1445 OUTPUT: 1485 OUTPUT:
1446 RETVAL 1486 RETVAL
1447 1487
1448int 1488int
1449poll_cb (...) 1489poll_cb (...)
… …
1633 dREQ (REQ_ENV_DBRENAME, 2); 1673 dREQ (REQ_ENV_DBRENAME, 2);
1634 req->env = env; 1674 req->env = env;
1635 req->buf1 = strdup_ornull (file); 1675 req->buf1 = strdup_ornull (file);
1636 req->buf2 = strdup_ornull (database); 1676 req->buf2 = strdup_ornull (database);
1637 req->buf3 = strdup_ornull (newname); 1677 req->buf3 = strdup_ornull (newname);
1678 req->uint1 = flags;
1679 REQ_SEND;
1680}
1681
1682void
1683db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1684 PREINIT:
1685 CALLBACK
1686 CODE:
1687{
1688 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1689 req->sv1 = SvREFCNT_inc (listp);
1690 req->env = env;
1638 req->uint1 = flags; 1691 req->uint1 = flags;
1639 REQ_SEND; 1692 REQ_SEND;
1640} 1693}
1641 1694
1642DB * 1695DB *
… …
1693 CODE: 1746 CODE:
1694{ 1747{
1695 dREQ (REQ_DB_COMPACT, 2); 1748 dREQ (REQ_DB_COMPACT, 2);
1696 req->db = db; 1749 req->db = db;
1697 req->txn = txn; 1750 req->txn = txn;
1698 sv_to_dbt (&req->dbt1, start); 1751 if (start) sv_to_dbt (&req->dbt1, start);
1699 sv_to_dbt (&req->dbt2, stop); 1752 if (stop ) sv_to_dbt (&req->dbt2, stop );
1700 req->uint1 = flags; 1753 req->uint1 = flags;
1701 REQ_SEND; 1754 REQ_SEND;
1702} 1755}
1703 1756
1704#endif 1757#endif
… …
1714 req->uint1 = flags; 1767 req->uint1 = flags;
1715 REQ_SEND; 1768 REQ_SEND;
1716} 1769}
1717 1770
1718void 1771void
1772db_verify (DB *db, bdb_filename file, bdb_filename database = 0, SV *dummy = 0, U32 flags = 0, SV *callback = 0)
1773 PREINIT:
1774 CALLBACK
1775 CODE:
1776{
1777 dREQ (REQ_DB_VERIFY, 1);
1778 ptr_nuke (ST (0)); /* verify destroys the database handle, hopefully it is freed as well */
1779 req->db = db;
1780 req->buf1 = strdup (file);
1781 req->buf2 = strdup_ornull (database);
1782 req->uint1 = flags;
1783 REQ_SEND;
1784}
1785
1786void
1719db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1787db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1720 PREINIT: 1788 PREINIT:
1721 CALLBACK 1789 CALLBACK
1722 CODE: 1790 CODE:
1723{ 1791{
1724 dREQ (REQ_DB_SYNC, 1); 1792 dREQ (REQ_DB_UPGRADE, 1);
1725 req->db = db; 1793 req->db = db;
1726 req->buf1 = strdup (file); 1794 req->buf1 = strdup (file);
1727 req->uint1 = flags; 1795 req->uint1 = flags;
1728 REQ_SEND; 1796 REQ_SEND;
1729} 1797}
… …
1909db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0) 1977db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1910 PREINIT: 1978 PREINIT:
1911 CALLBACK 1979 CALLBACK
1912 CODE: 1980 CODE:
1913{ 1981{
1914 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 1982 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1915 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET"); 1983 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1984 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1985 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1986 "key",
1987 "BDB::db_c_get");
1916 1988
1989 {
1917 dREQ (REQ_C_GET, 1); 1990 dREQ (REQ_C_GET, 1);
1918 req->dbc = dbc; 1991 req->dbc = dbc;
1919 req->uint1 = flags; 1992 req->uint1 = flags;
1920 if (flags & DB_OPFLAGS_MASK == DB_SET) 1993 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1921 sv_to_dbt (&req->dbt1, key); 1994 sv_to_dbt (&req->dbt1, key);
1922 else 1995 else
1923 { 1996 {
1924 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 1997 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1925 sv_to_dbt (&req->dbt1, key); 1998 sv_to_dbt (&req->dbt1, key);
1926 else 1999 else
1927 req->dbt1.flags = DB_DBT_MALLOC; 2000 req->dbt1.flags = DB_DBT_MALLOC;
1928 2001
1929 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2002 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1930 } 2003 }
1931 2004
1932 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2005 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1933 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2006 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1934 sv_to_dbt (&req->dbt3, data); 2007 sv_to_dbt (&req->dbt3, data);
1935 else 2008 else
1936 req->dbt3.flags = DB_DBT_MALLOC; 2009 req->dbt3.flags = DB_DBT_MALLOC;
1937 2010
1938 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2011 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1939 REQ_SEND; 2012 REQ_SEND;
2013 }
1940} 2014}
1941 2015
1942void 2016void
1943db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2017db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1944 PREINIT: 2018 PREINIT:
1945 CALLBACK 2019 CALLBACK
1946 CODE: 2020 CODE:
1947{ 2021{
1948 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2022 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1949 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2023 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
2024 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2025 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2026 "key",
2027 "BDB::db_c_pget");
1950 2028
2029 {
1951 dREQ (REQ_C_PGET, 1); 2030 dREQ (REQ_C_PGET, 1);
1952 req->dbc = dbc; 2031 req->dbc = dbc;
1953 req->uint1 = flags; 2032 req->uint1 = flags;
1954 if (flags & DB_OPFLAGS_MASK == DB_SET) 2033 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1955 sv_to_dbt (&req->dbt1, key); 2034 sv_to_dbt (&req->dbt1, key);
1956 else 2035 else
1957 { 2036 {
1958 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2037 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1959 sv_to_dbt (&req->dbt1, key); 2038 sv_to_dbt (&req->dbt1, key);
1960 else 2039 else
1961 req->dbt1.flags = DB_DBT_MALLOC; 2040 req->dbt1.flags = DB_DBT_MALLOC;
1962 2041
1963 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2042 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1964 } 2043 }
1965 2044
1966 req->dbt2.flags = DB_DBT_MALLOC; 2045 req->dbt2.flags = DB_DBT_MALLOC;
1967 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2046 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1968 2047
1969 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2048 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1970 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2049 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1971 sv_to_dbt (&req->dbt3, data); 2050 sv_to_dbt (&req->dbt3, data);
1972 else 2051 else
1973 req->dbt3.flags = DB_DBT_MALLOC; 2052 req->dbt3.flags = DB_DBT_MALLOC;
1974 2053
1975 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2054 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1976 REQ_SEND; 2055 REQ_SEND;
2056 }
1977} 2057}
1978 2058
1979void 2059void
1980db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 2060db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1981 PREINIT: 2061 PREINIT:
… …
2256 CODE: 2336 CODE:
2257 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2337 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2258 OUTPUT: 2338 OUTPUT:
2259 RETVAL 2339 RETVAL
2260 2340
2341int set_pagesize (DB *db, U32 pagesize)
2342 CODE:
2343 RETVAL = db->set_pagesize (db, pagesize);
2344 OUTPUT:
2345 RETVAL
2346
2261int set_flags (DB *db, U32 flags) 2347int set_flags (DB *db, U32 flags)
2262 CODE: 2348 CODE:
2263 RETVAL = db->set_flags (db, flags); 2349 RETVAL = db->set_flags (db, flags);
2264 OUTPUT: 2350 OUTPUT:
2265 RETVAL 2351 RETVAL

Diff Legend

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