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

Comparing BDB/BDB.xs (file contents):
Revision 1.58 by root, Tue Sep 30 17:03:07 2008 UTC vs.
Revision 1.70 by root, Wed Jul 15 14:53:52 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
… …
378 380
379 av_push (av, newSVnv (req->key_range.less)); 381 av_push (av, newSVnv (req->key_range.less));
380 av_push (av, newSVnv (req->key_range.equal)); 382 av_push (av, newSVnv (req->key_range.equal));
381 av_push (av, newSVnv (req->key_range.greater)); 383 av_push (av, newSVnv (req->key_range.greater));
382 384
385 av = (AV *)newRV_noinc ((SV *)av);
386
383 SvREADONLY_off (req->sv1); 387 SvREADONLY_off (req->sv1);
384 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 388 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
389 SvREFCNT_dec (av);
385 SvREFCNT_dec (req->sv1); 390 SvREFCNT_dec (req->sv1);
386 } 391 }
387 break; 392 break;
388 393
389#if DB_VERSION_MINOR >= 3 394#if DB_VERSION_MINOR >= 3
… …
396 sv_setnv_mg (req->sv1, (NV)req->seq_t); 401 sv_setnv_mg (req->sv1, (NV)req->seq_t);
397 402
398 SvREFCNT_dec (req->sv1); 403 SvREFCNT_dec (req->sv1);
399 break; 404 break;
400#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;
401 } 424 }
402 425
403 errno = req->result; 426 errno = req->result;
404 427
405 if (req->callback) 428 if (req->callback)
… …
435 free (req->buf3); 458 free (req->buf3);
436 459
437 Safefree (req); 460 Safefree (req);
438} 461}
439 462
440#ifdef USE_SOCKETS_AS_HANDLES
441# define TO_SOCKET(x) (win32_get_osfhandle (x))
442#else
443# define TO_SOCKET(x) (x)
444#endif
445
446static void 463static void
447create_respipe (void) 464create_respipe (void)
448{ 465{
449#ifdef _WIN32
450 int arg; /* argg */
451#endif
452 int old_readfd = respipe [0];
453
454 if (respipe [1] >= 0)
455 respipe_close (TO_SOCKET (respipe [1]));
456
457#ifdef _WIN32
458 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
459#else
460 if (pipe (respipe)) 466 if (s_epipe_renew (&respipe))
461#endif 467 croak ("BDB: unable to create event pipe");
462 croak ("unable to initialize result pipe");
463
464 if (old_readfd >= 0)
465 {
466 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
467 croak ("unable to initialize result pipe(2)");
468
469 respipe_close (respipe [0]);
470 respipe [0] = old_readfd;
471 }
472
473#ifdef _WIN32
474 arg = 1;
475 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
476 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
477#else
478 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
479 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
480#endif
481 croak ("unable to initialize result pipe(3)");
482
483 respipe_osf [0] = TO_SOCKET (respipe [0]);
484 respipe_osf [1] = TO_SOCKET (respipe [1]);
485} 468}
486 469
487static void bdb_request (bdb_req req); 470static void bdb_request (bdb_req req);
488X_THREAD_PROC (bdb_proc); 471X_THREAD_PROC (bdb_proc);
489 472
… …
625 end_thread (); 608 end_thread ();
626} 609}
627 610
628static void poll_wait (void) 611static void poll_wait (void)
629{ 612{
630 fd_set rfd;
631
632 while (nreqs) 613 while (nreqs)
633 { 614 {
634 int size; 615 int size;
635 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 616 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
636 size = res_queue.size; 617 size = res_queue.size;
… …
639 if (size) 620 if (size)
640 return; 621 return;
641 622
642 maybe_start_thread (); 623 maybe_start_thread ();
643 624
644 FD_ZERO (&rfd); 625 s_epipe_wait (&respipe);
645 FD_SET (respipe [0], &rfd);
646
647 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
648 } 626 }
649} 627}
650 628
651static int poll_cb (void) 629static int poll_cb (void)
652{ 630{
… …
672 if (req) 650 if (req)
673 { 651 {
674 --npending; 652 --npending;
675 653
676 if (!res_queue.size) 654 if (!res_queue.size)
677 {
678 /* read any signals sent by the worker threads */ 655 /* read any signals sent by the worker threads */
679 char buf [4]; 656 s_epipe_drain (&respipe);
680 while (respipe_read (respipe [0], buf, 4) == 4)
681 ;
682 }
683 } 657 }
684 658
685 X_UNLOCK (reslock); 659 X_UNLOCK (reslock);
686 660
687 if (!req) 661 if (!req)
… …
769 req->result = req->db->close (req->db, req->uint1); 743 req->result = req->db->close (req->db, req->uint1);
770 break; 744 break;
771 745
772#if DB_VERSION_MINOR >= 4 746#if DB_VERSION_MINOR >= 4
773 case REQ_DB_COMPACT: 747 case REQ_DB_COMPACT:
774 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0); 748 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);
775 break; 749 break;
776#endif 750#endif
777 751
778 case REQ_DB_SYNC: 752 case REQ_DB_SYNC:
779 req->result = req->db->sync (req->db, req->uint1); 753 req->result = req->db->sync (req->db, req->uint1);
754 break;
755
756 case REQ_DB_VERIFY:
757 req->result = req->db->verify (req->db, req->buf1, req->buf2, 0, req->uint1);
780 break; 758 break;
781 759
782 case REQ_DB_UPGRADE: 760 case REQ_DB_UPGRADE:
783 req->result = req->db->upgrade (req->db, req->buf1, req->uint1); 761 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
784 break; 762 break;
… …
871 case REQ_SEQ_REMOVE: 849 case REQ_SEQ_REMOVE:
872 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 850 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
873 break; 851 break;
874#endif 852#endif
875 853
854 case REQ_ENV_LOG_ARCHIVE:
855 {
856 char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */
857 req->result = req->env->log_archive (req->env, &listp, req->uint1);
858 req->buf1 = (char *)listp;
859 }
860 break;
861
876 default: 862 default:
877 req->result = ENOSYS; 863 req->result = ENOSYS;
878 break; 864 break;
879 } 865 }
880 866
… …
891 /* try to distribute timeouts somewhat evenly */ 877 /* try to distribute timeouts somewhat evenly */
892 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 878 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
893 879
894 for (;;) 880 for (;;)
895 { 881 {
896 ts.tv_sec = time (0) + IDLE_TIMEOUT; 882 ts.tv_sec = time (0) + IDLE_TIMEOUT;
897 883
898 X_LOCK (reqlock); 884 X_LOCK (reqlock);
899 885
900 for (;;) 886 for (;;)
901 { 887 {
… …
946 X_LOCK (reslock); 932 X_LOCK (reslock);
947 933
948 ++npending; 934 ++npending;
949 935
950 if (!reqq_push (&res_queue, req)) 936 if (!reqq_push (&res_queue, req))
951 /* write a dummy byte to the pipe so fh becomes ready */ 937 s_epipe_signal (&respipe);
952 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
953 938
954 self->req = 0; 939 self->req = 0;
955 worker_clear (self); 940 worker_clear (self);
956 941
957 X_UNLOCK (reslock); 942 X_UNLOCK (reslock);
… …
1133 } 1118 }
1134 } 1119 }
1135 1120
1136 return 0; 1121 return 0;
1137} 1122}
1123
1124/*****************************************************************************/
1125
1126#if 0
1127static int
1128bt_pfxc_compare (DB *db, const DBT *dbt1, const DBT *dbt2)
1129{
1130 ssize_t size1 = dbt1->size;
1131 ssize_t size2 = dbt2->size;
1132 int res = memcmp ((void *)dbt1->data, (void *)dbt2->data,
1133 size1 <= size2 ? size1 : size2);
1134
1135 if (res)
1136 return res;
1137 else if (size1 - size2)
1138 return size1 - size2;
1139 else
1140 return 0;
1141}
1142
1143static size_t
1144bt_pfxc_prefix_x (DB *db, const DBT *dbt1, const DBT *dbt2)
1145{
1146 ssize_t size1 = dbt1->size;
1147 ssize_t size2 = dbt2->size;
1148 u_int8_t *p1 = (u_int8_t *)dbt1->data;
1149 u_int8_t *p2 = (u_int8_t *)dbt2->data;
1150 u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2);
1151
1152 while (p1 < pe)
1153 if (*p1++ != *p2++)
1154 return p1 - (u_int8_t *)dbt1->data - 1;
1155
1156 if (size1 < size2) return size1 + 1;
1157 if (size1 > size2) return size2 + 1;
1158
1159 return size1;
1160}
1161#endif
1162
1163/*****************************************************************************/
1138 1164
1139/* stupid windows defines CALLBACK as well */ 1165/* stupid windows defines CALLBACK as well */
1140#undef CALLBACK 1166#undef CALLBACK
1141#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1167#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1142 1168
… …
1197 const_iv (NOSYNC) 1223 const_iv (NOSYNC)
1198 const_iv (CHKSUM) 1224 const_iv (CHKSUM)
1199 const_iv (ENCRYPT) 1225 const_iv (ENCRYPT)
1200 const_iv (DUP) 1226 const_iv (DUP)
1201 const_iv (DUPSORT) 1227 const_iv (DUPSORT)
1202 const_iv (RECNUM) 1228 //const_iv (RECNUM)
1203 const_iv (RENUMBER) 1229 const_iv (RENUMBER)
1204 const_iv (REVSPLITOFF) 1230 const_iv (REVSPLITOFF)
1205 const_iv (CONSUME) 1231 const_iv (CONSUME)
1206 const_iv (CONSUME_WAIT) 1232 const_iv (CONSUME_WAIT)
1207 const_iv (GET_BOTH) 1233 const_iv (GET_BOTH)
… …
1279 const_iv (REP_UNAVAIL) 1305 const_iv (REP_UNAVAIL)
1280 const_iv (RUNRECOVERY) 1306 const_iv (RUNRECOVERY)
1281 const_iv (SECONDARY_BAD) 1307 const_iv (SECONDARY_BAD)
1282 const_iv (VERIFY_BAD) 1308 const_iv (VERIFY_BAD)
1283 1309
1310 const_iv (SALVAGE)
1311 const_iv (AGGRESSIVE)
1312 const_iv (PRINTABLE)
1313 const_iv (NOORDERCHK)
1314 const_iv (ORDERCHKONLY)
1315
1316 const_iv (ARCH_ABS)
1317 const_iv (ARCH_DATA)
1318 const_iv (ARCH_LOG)
1319 const_iv (ARCH_REMOVE)
1320
1284 const_iv (VERB_DEADLOCK) 1321 const_iv (VERB_DEADLOCK)
1285 const_iv (VERB_RECOVERY) 1322 const_iv (VERB_RECOVERY)
1286 const_iv (VERB_REPLICATION) 1323 const_iv (VERB_REPLICATION)
1287 const_iv (VERB_WAITSFOR) 1324 const_iv (VERB_WAITSFOR)
1288 1325
… …
1321 const_iv (PRIORITY_VERY_LOW) 1358 const_iv (PRIORITY_VERY_LOW)
1322 const_iv (PRIORITY_LOW) 1359 const_iv (PRIORITY_LOW)
1323 const_iv (PRIORITY_DEFAULT) 1360 const_iv (PRIORITY_DEFAULT)
1324 const_iv (PRIORITY_HIGH) 1361 const_iv (PRIORITY_HIGH)
1325 const_iv (PRIORITY_VERY_HIGH) 1362 const_iv (PRIORITY_VERY_HIGH)
1363 const_iv (IGNORE_LEASE)
1326#endif 1364#endif
1327#if DB_VERSION_MINOR >= 7 1365#if DB_VERSION_MINOR >= 7
1366 //const_iv (MULTIPLE_KEY)
1328 const_iv (LOG_DIRECT) 1367 const_iv (LOG_DIRECT)
1329 const_iv (LOG_DSYNC) 1368 const_iv (LOG_DSYNC)
1330 const_iv (LOG_AUTO_REMOVE) 1369 const_iv (LOG_AUTO_REMOVE)
1331 const_iv (LOG_IN_MEMORY) 1370 const_iv (LOG_IN_MEMORY)
1332 const_iv (LOG_ZERO) 1371 const_iv (LOG_ZERO)
… …
1438 1477
1439int 1478int
1440poll_fileno () 1479poll_fileno ()
1441 PROTOTYPE: 1480 PROTOTYPE:
1442 CODE: 1481 CODE:
1443 RETVAL = respipe [0]; 1482 RETVAL = s_epipe_fd (&respipe);
1444 OUTPUT: 1483 OUTPUT:
1445 RETVAL 1484 RETVAL
1446 1485
1447int 1486int
1448poll_cb (...) 1487poll_cb (...)
… …
1632 dREQ (REQ_ENV_DBRENAME, 2); 1671 dREQ (REQ_ENV_DBRENAME, 2);
1633 req->env = env; 1672 req->env = env;
1634 req->buf1 = strdup_ornull (file); 1673 req->buf1 = strdup_ornull (file);
1635 req->buf2 = strdup_ornull (database); 1674 req->buf2 = strdup_ornull (database);
1636 req->buf3 = strdup_ornull (newname); 1675 req->buf3 = strdup_ornull (newname);
1676 req->uint1 = flags;
1677 REQ_SEND;
1678}
1679
1680void
1681db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1682 PREINIT:
1683 CALLBACK
1684 CODE:
1685{
1686 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1687 req->sv1 = SvREFCNT_inc (listp);
1688 req->env = env;
1637 req->uint1 = flags; 1689 req->uint1 = flags;
1638 REQ_SEND; 1690 REQ_SEND;
1639} 1691}
1640 1692
1641DB * 1693DB *
… …
1692 CODE: 1744 CODE:
1693{ 1745{
1694 dREQ (REQ_DB_COMPACT, 2); 1746 dREQ (REQ_DB_COMPACT, 2);
1695 req->db = db; 1747 req->db = db;
1696 req->txn = txn; 1748 req->txn = txn;
1697 sv_to_dbt (&req->dbt1, start); 1749 if (start) sv_to_dbt (&req->dbt1, start);
1698 sv_to_dbt (&req->dbt2, stop); 1750 if (stop ) sv_to_dbt (&req->dbt2, stop );
1699 req->uint1 = flags; 1751 req->uint1 = flags;
1700 REQ_SEND; 1752 REQ_SEND;
1701} 1753}
1702 1754
1703#endif 1755#endif
… …
1713 req->uint1 = flags; 1765 req->uint1 = flags;
1714 REQ_SEND; 1766 REQ_SEND;
1715} 1767}
1716 1768
1717void 1769void
1770db_verify (DB *db, bdb_filename file, bdb_filename database = 0, SV *dummy = 0, U32 flags = 0, SV *callback = 0)
1771 PREINIT:
1772 CALLBACK
1773 CODE:
1774{
1775 dREQ (REQ_DB_VERIFY, 1);
1776 ptr_nuke (ST (0)); /* verify destroys the database handle, hopefully it is freed as well */
1777 req->db = db;
1778 req->buf1 = strdup (file);
1779 req->buf2 = strdup_ornull (database);
1780 req->uint1 = flags;
1781 REQ_SEND;
1782}
1783
1784void
1718db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1785db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1719 PREINIT: 1786 PREINIT:
1720 CALLBACK 1787 CALLBACK
1721 CODE: 1788 CODE:
1722{ 1789{
1723 dREQ (REQ_DB_SYNC, 1); 1790 dREQ (REQ_DB_UPGRADE, 1);
1724 req->db = db; 1791 req->db = db;
1725 req->buf1 = strdup (file); 1792 req->buf1 = strdup (file);
1726 req->uint1 = flags; 1793 req->uint1 = flags;
1727 REQ_SEND; 1794 REQ_SEND;
1728} 1795}
… …
1908db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0) 1975db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1909 PREINIT: 1976 PREINIT:
1910 CALLBACK 1977 CALLBACK
1911 CODE: 1978 CODE:
1912{ 1979{
1913 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 1980 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1914 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET"); 1981 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1982 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1983 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1984 "key",
1985 "BDB::db_c_get");
1915 1986
1916 { 1987 {
1917 dREQ (REQ_C_GET, 1); 1988 dREQ (REQ_C_GET, 1);
1918 req->dbc = dbc; 1989 req->dbc = dbc;
1919 req->uint1 = flags; 1990 req->uint1 = flags;
1920 if (flags & DB_OPFLAGS_MASK == DB_SET) 1991 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1921 sv_to_dbt (&req->dbt1, key); 1992 sv_to_dbt (&req->dbt1, key);
1922 else 1993 else
1923 { 1994 {
1924 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 1995 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1925 sv_to_dbt (&req->dbt1, key); 1996 sv_to_dbt (&req->dbt1, key);
1926 else 1997 else
1927 req->dbt1.flags = DB_DBT_MALLOC; 1998 req->dbt1.flags = DB_DBT_MALLOC;
1928 1999
1929 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2000 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1930 } 2001 }
1931 2002
1932 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2003 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1933 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2004 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1934 sv_to_dbt (&req->dbt3, data); 2005 sv_to_dbt (&req->dbt3, data);
1935 else 2006 else
1936 req->dbt3.flags = DB_DBT_MALLOC; 2007 req->dbt3.flags = DB_DBT_MALLOC;
1937 2008
1938 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2009 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
… …
1944db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2015db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1945 PREINIT: 2016 PREINIT:
1946 CALLBACK 2017 CALLBACK
1947 CODE: 2018 CODE:
1948{ 2019{
1949 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2020 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1950 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2021 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
2022 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2023 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2024 "key",
2025 "BDB::db_c_pget");
1951 2026
1952 { 2027 {
1953 dREQ (REQ_C_PGET, 1); 2028 dREQ (REQ_C_PGET, 1);
1954 req->dbc = dbc; 2029 req->dbc = dbc;
1955 req->uint1 = flags; 2030 req->uint1 = flags;
1956 if (flags & DB_OPFLAGS_MASK == DB_SET) 2031 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1957 sv_to_dbt (&req->dbt1, key); 2032 sv_to_dbt (&req->dbt1, key);
1958 else 2033 else
1959 { 2034 {
1960 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2035 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1961 sv_to_dbt (&req->dbt1, key); 2036 sv_to_dbt (&req->dbt1, key);
1962 else 2037 else
1963 req->dbt1.flags = DB_DBT_MALLOC; 2038 req->dbt1.flags = DB_DBT_MALLOC;
1964 2039
1965 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2040 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1966 } 2041 }
1967 2042
1968 req->dbt2.flags = DB_DBT_MALLOC; 2043 req->dbt2.flags = DB_DBT_MALLOC;
1969 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2044 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1970 2045
1971 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2046 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1972 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2047 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1973 sv_to_dbt (&req->dbt3, data); 2048 sv_to_dbt (&req->dbt3, data);
1974 else 2049 else
1975 req->dbt3.flags = DB_DBT_MALLOC; 2050 req->dbt3.flags = DB_DBT_MALLOC;
1976 2051
1977 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2052 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
… …
2259 CODE: 2334 CODE:
2260 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2335 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2261 OUTPUT: 2336 OUTPUT:
2262 RETVAL 2337 RETVAL
2263 2338
2339int set_pagesize (DB *db, U32 pagesize)
2340 CODE:
2341 RETVAL = db->set_pagesize (db, pagesize);
2342 OUTPUT:
2343 RETVAL
2344
2264int set_flags (DB *db, U32 flags) 2345int set_flags (DB *db, U32 flags)
2265 CODE: 2346 CODE:
2266 RETVAL = db->set_flags (db, flags); 2347 RETVAL = db->set_flags (db, flags);
2267 OUTPUT: 2348 OUTPUT:
2268 RETVAL 2349 RETVAL

Diff Legend

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