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

Comparing BDB/BDB.xs (file contents):
Revision 1.55 by root, Fri Sep 26 02:37:33 2008 UTC vs.
Revision 1.68 by root, Tue Jul 14 19:29:23 2009 UTC

1#include <sys/user.h>
2#include <sys/ptrace.h>
3
4#define X_STACKSIZE 1024 * 128 + sizeof (long) * 64 * 1024 / 4 1#define X_STACKSIZE 1024 * 128 + sizeof (long) * 64 * 1024 / 4
5 2
6#include "xthread.h" 3#include "xthread.h"
7 4
8#include <errno.h> 5#include <errno.h>
9 6
10#include "EXTERN.h" 7#include "EXTERN.h"
11#include "perl.h" 8#include "perl.h"
12#include "XSUB.h" 9#include "XSUB.h"
10
11#include "schmorp.h"
13 12
14// perl stupidly defines these as macros, breaking 13// perl stupidly defines these as macros, breaking
15// lots and lots of code. 14// lots and lots of code.
16#undef open 15#undef open
17#undef close 16#undef close
… …
56#if DB_VERSION_MINOR >= 3 55#if DB_VERSION_MINOR >= 3
57typedef DB_SEQUENCE DB_SEQUENCE_ornull; 56typedef DB_SEQUENCE DB_SEQUENCE_ornull;
58typedef DB_SEQUENCE DB_SEQUENCE_ornuked; 57typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
59#endif 58#endif
60 59
61typedef SV SV8; /* byte-sv, used for argument-checking */
62typedef char *bdb_filename; 60typedef char *bdb_filename;
63 61
64static SV *prepare_cb; 62static SV *prepare_cb;
65 63
66#if DB_VERSION_MINOR >= 6 64#if DB_VERSION_MINOR >= 6
… …
153 151
154enum { 152enum {
155 REQ_QUIT, 153 REQ_QUIT,
156 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,
157 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,
158 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,
159 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,
160 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 159 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
161 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,
162 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,
163}; 162};
… …
353 abort (); 352 abort ();
354} 353}
355 354
356static int poll_cb (void); 355static int poll_cb (void);
357static void req_free (bdb_req req); 356static void req_free (bdb_req req);
358static void req_cancel (bdb_req req);
359 357
360static int req_invoke (bdb_req req) 358static int req_invoke (bdb_req req)
361{ 359{
362 switch (req->type) 360 switch (req->type)
363 { 361 {
… …
382 380
383 av_push (av, newSVnv (req->key_range.less)); 381 av_push (av, newSVnv (req->key_range.less));
384 av_push (av, newSVnv (req->key_range.equal)); 382 av_push (av, newSVnv (req->key_range.equal));
385 av_push (av, newSVnv (req->key_range.greater)); 383 av_push (av, newSVnv (req->key_range.greater));
386 384
385 av = (AV *)newRV_noinc ((SV *)av);
386
387 SvREADONLY_off (req->sv1); 387 SvREADONLY_off (req->sv1);
388 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 388 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
389 SvREFCNT_dec (av);
389 SvREFCNT_dec (req->sv1); 390 SvREFCNT_dec (req->sv1);
390 } 391 }
391 break; 392 break;
392 393
393#if DB_VERSION_MINOR >= 3 394#if DB_VERSION_MINOR >= 3
… …
400 sv_setnv_mg (req->sv1, (NV)req->seq_t); 401 sv_setnv_mg (req->sv1, (NV)req->seq_t);
401 402
402 SvREFCNT_dec (req->sv1); 403 SvREFCNT_dec (req->sv1);
403 break; 404 break;
404#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;
405 } 424 }
406 425
407 errno = req->result; 426 errno = req->result;
408 427
409 if (req->callback) 428 if (req->callback)
… …
439 free (req->buf3); 458 free (req->buf3);
440 459
441 Safefree (req); 460 Safefree (req);
442} 461}
443 462
444#ifdef USE_SOCKETS_AS_HANDLES
445# define TO_SOCKET(x) (win32_get_osfhandle (x))
446#else
447# define TO_SOCKET(x) (x)
448#endif
449
450static void 463static void
451create_respipe (void) 464create_respipe (void)
452{ 465{
453#ifdef _WIN32 466#ifdef _WIN32
454 int arg; /* argg */ 467 int arg; /* argg */
455#endif 468#endif
456 int old_readfd = respipe [0]; 469 int old_readfd = respipe [0];
457 470
458 if (respipe [1] >= 0) 471 if (respipe [1] >= 0)
459 respipe_close (TO_SOCKET (respipe [1])); 472 respipe_close (S_TO_SOCKET (respipe [1]));
460 473
461#ifdef _WIN32
462 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
463#else
464 if (pipe (respipe)) 474 if (s_pipe (respipe))
465#endif
466 croak ("unable to initialize result pipe"); 475 croak ("unable to initialize result pipe");
467 476
468 if (old_readfd >= 0) 477 if (old_readfd >= 0)
469 { 478 {
470 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0) 479 if (dup2 (S_TO_SOCKET (respipe [0]), S_TO_SOCKET (old_readfd)) < 0)
471 croak ("unable to initialize result pipe(2)"); 480 croak ("unable to initialize result pipe(2)");
472 481
473 respipe_close (respipe [0]); 482 respipe_close (respipe [0]);
474 respipe [0] = old_readfd; 483 respipe [0] = old_readfd;
475 } 484 }
476 485
477#ifdef _WIN32 486#ifdef _WIN32
478 arg = 1; 487 arg = 1;
479 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg) 488 if (ioctlsocket (S_TO_SOCKET (respipe [0]), FIONBIO, &arg)
480 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg)) 489 || ioctlsocket (S_TO_SOCKET (respipe [1]), FIONBIO, &arg))
481#else 490#else
482 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK) 491 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
483 || fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 492 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
484#endif 493#endif
485 croak ("unable to initialize result pipe(3)"); 494 croak ("unable to initialize result pipe(3)");
486 495
487 respipe_osf [0] = TO_SOCKET (respipe [0]); 496 respipe_osf [0] = S_TO_SOCKET (respipe [0]);
488 respipe_osf [1] = TO_SOCKET (respipe [1]); 497 respipe_osf [1] = S_TO_SOCKET (respipe [1]);
489} 498}
490 499
491static void bdb_request (bdb_req req); 500static void bdb_request (bdb_req req);
492X_THREAD_PROC (bdb_proc); 501X_THREAD_PROC (bdb_proc);
493 502
… …
773 req->result = req->db->close (req->db, req->uint1); 782 req->result = req->db->close (req->db, req->uint1);
774 break; 783 break;
775 784
776#if DB_VERSION_MINOR >= 4 785#if DB_VERSION_MINOR >= 4
777 case REQ_DB_COMPACT: 786 case REQ_DB_COMPACT:
778 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0); 787 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);
779 break; 788 break;
780#endif 789#endif
781 790
782 case REQ_DB_SYNC: 791 case REQ_DB_SYNC:
783 req->result = req->db->sync (req->db, req->uint1); 792 req->result = req->db->sync (req->db, req->uint1);
793 break;
794
795 case REQ_DB_VERIFY:
796 req->result = req->db->verify (req->db, req->buf1, req->buf2, 0, req->uint1);
784 break; 797 break;
785 798
786 case REQ_DB_UPGRADE: 799 case REQ_DB_UPGRADE:
787 req->result = req->db->upgrade (req->db, req->buf1, req->uint1); 800 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
788 break; 801 break;
… …
874 887
875 case REQ_SEQ_REMOVE: 888 case REQ_SEQ_REMOVE:
876 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 889 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
877 break; 890 break;
878#endif 891#endif
892
893 case REQ_ENV_LOG_ARCHIVE:
894 {
895 char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */
896 req->result = req->env->log_archive (req->env, &listp, req->uint1);
897 req->buf1 = (char *)listp;
898 }
899 break;
879 900
880 default: 901 default:
881 req->result = ENOSYS; 902 req->result = ENOSYS;
882 break; 903 break;
883 } 904 }
… …
1138 } 1159 }
1139 1160
1140 return 0; 1161 return 0;
1141} 1162}
1142 1163
1164/*****************************************************************************/
1165
1166#if 0
1167static int
1168bt_pfxc_compare (DB *db, const DBT *dbt1, const DBT *dbt2)
1169{
1170 ssize_t size1 = dbt1->size;
1171 ssize_t size2 = dbt2->size;
1172 int res = memcmp ((void *)dbt1->data, (void *)dbt2->data,
1173 size1 <= size2 ? size1 : size2);
1174
1175 if (res)
1176 return res;
1177 else if (size1 - size2)
1178 return size1 - size2;
1179 else
1180 return 0;
1181}
1182
1183static size_t
1184bt_pfxc_prefix_x (DB *db, const DBT *dbt1, const DBT *dbt2)
1185{
1186 ssize_t size1 = dbt1->size;
1187 ssize_t size2 = dbt2->size;
1188 u_int8_t *p1 = (u_int8_t *)dbt1->data;
1189 u_int8_t *p2 = (u_int8_t *)dbt2->data;
1190 u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2);
1191
1192 while (p1 < pe)
1193 if (*p1++ != *p2++)
1194 return p1 - (u_int8_t *)dbt1->data - 1;
1195
1196 if (size1 < size2) return size1 + 1;
1197 if (size1 > size2) return size2 + 1;
1198
1199 return size1;
1200}
1201#endif
1202
1203/*****************************************************************************/
1204
1143/* stupid windoes defined CALLBACK as well */ 1205/* stupid windows defines CALLBACK as well */
1144#undef CALLBACK 1206#undef CALLBACK
1145#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1207#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1146 1208
1147MODULE = BDB PACKAGE = BDB 1209MODULE = BDB PACKAGE = BDB
1148 1210
… …
1201 const_iv (NOSYNC) 1263 const_iv (NOSYNC)
1202 const_iv (CHKSUM) 1264 const_iv (CHKSUM)
1203 const_iv (ENCRYPT) 1265 const_iv (ENCRYPT)
1204 const_iv (DUP) 1266 const_iv (DUP)
1205 const_iv (DUPSORT) 1267 const_iv (DUPSORT)
1206 const_iv (RECNUM) 1268 //const_iv (RECNUM)
1207 const_iv (RENUMBER) 1269 const_iv (RENUMBER)
1208 const_iv (REVSPLITOFF) 1270 const_iv (REVSPLITOFF)
1209 const_iv (CONSUME) 1271 const_iv (CONSUME)
1210 const_iv (CONSUME_WAIT) 1272 const_iv (CONSUME_WAIT)
1211 const_iv (GET_BOTH) 1273 const_iv (GET_BOTH)
… …
1283 const_iv (REP_UNAVAIL) 1345 const_iv (REP_UNAVAIL)
1284 const_iv (RUNRECOVERY) 1346 const_iv (RUNRECOVERY)
1285 const_iv (SECONDARY_BAD) 1347 const_iv (SECONDARY_BAD)
1286 const_iv (VERIFY_BAD) 1348 const_iv (VERIFY_BAD)
1287 1349
1350 const_iv (SALVAGE)
1351 const_iv (AGGRESSIVE)
1352 const_iv (PRINTABLE)
1353 const_iv (NOORDERCHK)
1354 const_iv (ORDERCHKONLY)
1355
1356 const_iv (ARCH_ABS)
1357 const_iv (ARCH_DATA)
1358 const_iv (ARCH_LOG)
1359 const_iv (ARCH_REMOVE)
1360
1288 const_iv (VERB_DEADLOCK) 1361 const_iv (VERB_DEADLOCK)
1289 const_iv (VERB_RECOVERY) 1362 const_iv (VERB_RECOVERY)
1290 const_iv (VERB_REPLICATION) 1363 const_iv (VERB_REPLICATION)
1291 const_iv (VERB_WAITSFOR) 1364 const_iv (VERB_WAITSFOR)
1292 1365
… …
1325 const_iv (PRIORITY_VERY_LOW) 1398 const_iv (PRIORITY_VERY_LOW)
1326 const_iv (PRIORITY_LOW) 1399 const_iv (PRIORITY_LOW)
1327 const_iv (PRIORITY_DEFAULT) 1400 const_iv (PRIORITY_DEFAULT)
1328 const_iv (PRIORITY_HIGH) 1401 const_iv (PRIORITY_HIGH)
1329 const_iv (PRIORITY_VERY_HIGH) 1402 const_iv (PRIORITY_VERY_HIGH)
1403 const_iv (IGNORE_LEASE)
1330#endif 1404#endif
1331#if DB_VERSION_MINOR >= 7 1405#if DB_VERSION_MINOR >= 7
1406 //const_iv (MULTIPLE_KEY)
1332 const_iv (LOG_DIRECT) 1407 const_iv (LOG_DIRECT)
1333 const_iv (LOG_DSYNC) 1408 const_iv (LOG_DSYNC)
1334 const_iv (LOG_AUTO_REMOVE) 1409 const_iv (LOG_AUTO_REMOVE)
1335 const_iv (LOG_IN_MEMORY) 1410 const_iv (LOG_IN_MEMORY)
1336 const_iv (LOG_ZERO) 1411 const_iv (LOG_ZERO)
… …
1553db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1628db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1554 PREINIT: 1629 PREINIT:
1555 CALLBACK 1630 CALLBACK
1556 CODE: 1631 CODE:
1557{ 1632{
1633 dREQ (REQ_ENV_CLOSE, 0);
1558 ptr_nuke (ST (0)); 1634 ptr_nuke (ST (0));
1559 dREQ (REQ_ENV_CLOSE, 0);
1560 req->env = env; 1635 req->env = env;
1561 req->uint1 = flags; 1636 req->uint1 = flags;
1562 REQ_SEND; 1637 REQ_SEND;
1563} 1638}
1564 1639
… …
1636 dREQ (REQ_ENV_DBRENAME, 2); 1711 dREQ (REQ_ENV_DBRENAME, 2);
1637 req->env = env; 1712 req->env = env;
1638 req->buf1 = strdup_ornull (file); 1713 req->buf1 = strdup_ornull (file);
1639 req->buf2 = strdup_ornull (database); 1714 req->buf2 = strdup_ornull (database);
1640 req->buf3 = strdup_ornull (newname); 1715 req->buf3 = strdup_ornull (newname);
1716 req->uint1 = flags;
1717 REQ_SEND;
1718}
1719
1720void
1721db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1722 PREINIT:
1723 CALLBACK
1724 CODE:
1725{
1726 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1727 req->sv1 = SvREFCNT_inc (listp);
1728 req->env = env;
1641 req->uint1 = flags; 1729 req->uint1 = flags;
1642 REQ_SEND; 1730 REQ_SEND;
1643} 1731}
1644 1732
1645DB * 1733DB *
… …
1677db_close (DB *db, U32 flags = 0, SV *callback = 0) 1765db_close (DB *db, U32 flags = 0, SV *callback = 0)
1678 PREINIT: 1766 PREINIT:
1679 CALLBACK 1767 CALLBACK
1680 CODE: 1768 CODE:
1681{ 1769{
1770 dREQ (REQ_DB_CLOSE, 0);
1682 ptr_nuke (ST (0)); 1771 ptr_nuke (ST (0));
1683 dREQ (REQ_DB_CLOSE, 0);
1684 req->db = db; 1772 req->db = db;
1685 req->uint1 = flags; 1773 req->uint1 = flags;
1686 req->sv1 = (SV *)db->app_private; 1774 req->sv1 = (SV *)db->app_private;
1687 REQ_SEND; 1775 REQ_SEND;
1688} 1776}
… …
1696 CODE: 1784 CODE:
1697{ 1785{
1698 dREQ (REQ_DB_COMPACT, 2); 1786 dREQ (REQ_DB_COMPACT, 2);
1699 req->db = db; 1787 req->db = db;
1700 req->txn = txn; 1788 req->txn = txn;
1701 sv_to_dbt (&req->dbt1, start); 1789 if (start) sv_to_dbt (&req->dbt1, start);
1702 sv_to_dbt (&req->dbt2, stop); 1790 if (stop ) sv_to_dbt (&req->dbt2, stop );
1703 req->uint1 = flags; 1791 req->uint1 = flags;
1704 REQ_SEND; 1792 REQ_SEND;
1705} 1793}
1706 1794
1707#endif 1795#endif
… …
1717 req->uint1 = flags; 1805 req->uint1 = flags;
1718 REQ_SEND; 1806 REQ_SEND;
1719} 1807}
1720 1808
1721void 1809void
1810db_verify (DB *db, bdb_filename file, bdb_filename database = 0, SV *dummy = 0, U32 flags = 0, SV *callback = 0)
1811 PREINIT:
1812 CALLBACK
1813 CODE:
1814{
1815 dREQ (REQ_DB_VERIFY, 1);
1816 ptr_nuke (ST (0)); /* verify destroys the database handle, hopefully it is freed as well */
1817 req->db = db;
1818 req->buf1 = strdup (file);
1819 req->buf2 = strdup_ornull (database);
1820 req->uint1 = flags;
1821 REQ_SEND;
1822}
1823
1824void
1722db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0) 1825db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = 0)
1723 PREINIT: 1826 PREINIT:
1724 CALLBACK 1827 CALLBACK
1725 CODE: 1828 CODE:
1726{ 1829{
1727 dREQ (REQ_DB_SYNC, 1); 1830 dREQ (REQ_DB_UPGRADE, 1);
1728 req->db = db; 1831 req->db = db;
1729 req->buf1 = strdup (file); 1832 req->buf1 = strdup (file);
1730 req->uint1 = flags; 1833 req->uint1 = flags;
1731 REQ_SEND; 1834 REQ_SEND;
1732} 1835}
… …
1836db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1939db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1837 PREINIT: 1940 PREINIT:
1838 CALLBACK 1941 CALLBACK
1839 CODE: 1942 CODE:
1840{ 1943{
1944 dREQ (REQ_TXN_COMMIT, 0);
1841 ptr_nuke (ST (0)); 1945 ptr_nuke (ST (0));
1842 dREQ (REQ_TXN_COMMIT, 0);
1843 req->txn = txn; 1946 req->txn = txn;
1844 req->uint1 = flags; 1947 req->uint1 = flags;
1845 REQ_SEND; 1948 REQ_SEND;
1846} 1949}
1847 1950
… …
1849db_txn_abort (DB_TXN *txn, SV *callback = 0) 1952db_txn_abort (DB_TXN *txn, SV *callback = 0)
1850 PREINIT: 1953 PREINIT:
1851 CALLBACK 1954 CALLBACK
1852 CODE: 1955 CODE:
1853{ 1956{
1957 dREQ (REQ_TXN_ABORT, 0);
1854 ptr_nuke (ST (0)); 1958 ptr_nuke (ST (0));
1855 dREQ (REQ_TXN_ABORT, 0);
1856 req->txn = txn; 1959 req->txn = txn;
1857 REQ_SEND; 1960 REQ_SEND;
1858} 1961}
1859 1962
1860void 1963void
1861db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1964db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1862 PREINIT: 1965 PREINIT:
1863 CALLBACK 1966 CALLBACK
1864 CODE: 1967 CODE:
1865{ 1968{
1969 dREQ (REQ_TXN_FINISH, 0);
1866 ptr_nuke (ST (0)); 1970 ptr_nuke (ST (0));
1867 dREQ (REQ_TXN_FINISH, 0);
1868 req->txn = txn; 1971 req->txn = txn;
1869 req->uint1 = flags; 1972 req->uint1 = flags;
1870 REQ_SEND; 1973 REQ_SEND;
1871} 1974}
1872 1975
… …
1874db_c_close (DBC *dbc, SV *callback = 0) 1977db_c_close (DBC *dbc, SV *callback = 0)
1875 PREINIT: 1978 PREINIT:
1876 CALLBACK 1979 CALLBACK
1877 CODE: 1980 CODE:
1878{ 1981{
1982 dREQ (REQ_C_CLOSE, 0);
1879 ptr_nuke (ST (0)); 1983 ptr_nuke (ST (0));
1880 dREQ (REQ_C_CLOSE, 0);
1881 req->dbc = dbc; 1984 req->dbc = dbc;
1882 REQ_SEND; 1985 REQ_SEND;
1883} 1986}
1884 1987
1885void 1988void
… …
1912db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2015db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1913 PREINIT: 2016 PREINIT:
1914 CALLBACK 2017 CALLBACK
1915 CODE: 2018 CODE:
1916{ 2019{
1917 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2020 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1918 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2021 croak ("db_c_get 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_get");
1919 2026
2027 {
1920 dREQ (REQ_C_GET, 1); 2028 dREQ (REQ_C_GET, 1);
1921 req->dbc = dbc; 2029 req->dbc = dbc;
1922 req->uint1 = flags; 2030 req->uint1 = flags;
1923 if (flags & DB_OPFLAGS_MASK == DB_SET) 2031 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1924 sv_to_dbt (&req->dbt1, key); 2032 sv_to_dbt (&req->dbt1, key);
1925 else 2033 else
1926 { 2034 {
1927 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2035 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1928 sv_to_dbt (&req->dbt1, key); 2036 sv_to_dbt (&req->dbt1, key);
1929 else 2037 else
1930 req->dbt1.flags = DB_DBT_MALLOC; 2038 req->dbt1.flags = DB_DBT_MALLOC;
1931 2039
1932 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2040 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1933 } 2041 }
1934 2042
1935 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2043 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1936 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2044 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1937 sv_to_dbt (&req->dbt3, data); 2045 sv_to_dbt (&req->dbt3, data);
1938 else 2046 else
1939 req->dbt3.flags = DB_DBT_MALLOC; 2047 req->dbt3.flags = DB_DBT_MALLOC;
1940 2048
1941 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2049 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1942 REQ_SEND; 2050 REQ_SEND;
2051 }
1943} 2052}
1944 2053
1945void 2054void
1946db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2055db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1947 PREINIT: 2056 PREINIT:
1948 CALLBACK 2057 CALLBACK
1949 CODE: 2058 CODE:
1950{ 2059{
1951 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2060 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1952 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2061 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
2062 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2063 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2064 "key",
2065 "BDB::db_c_pget");
1953 2066
2067 {
1954 dREQ (REQ_C_PGET, 1); 2068 dREQ (REQ_C_PGET, 1);
1955 req->dbc = dbc; 2069 req->dbc = dbc;
1956 req->uint1 = flags; 2070 req->uint1 = flags;
1957 if (flags & DB_OPFLAGS_MASK == DB_SET) 2071 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1958 sv_to_dbt (&req->dbt1, key); 2072 sv_to_dbt (&req->dbt1, key);
1959 else 2073 else
1960 { 2074 {
1961 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2075 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1962 sv_to_dbt (&req->dbt1, key); 2076 sv_to_dbt (&req->dbt1, key);
1963 else 2077 else
1964 req->dbt1.flags = DB_DBT_MALLOC; 2078 req->dbt1.flags = DB_DBT_MALLOC;
1965 2079
1966 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2080 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1967 } 2081 }
1968 2082
1969 req->dbt2.flags = DB_DBT_MALLOC; 2083 req->dbt2.flags = DB_DBT_MALLOC;
1970 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2084 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1971 2085
1972 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2086 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1973 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2087 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1974 sv_to_dbt (&req->dbt3, data); 2088 sv_to_dbt (&req->dbt3, data);
1975 else 2089 else
1976 req->dbt3.flags = DB_DBT_MALLOC; 2090 req->dbt3.flags = DB_DBT_MALLOC;
1977 2091
1978 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2092 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1979 REQ_SEND; 2093 REQ_SEND;
2094 }
1980} 2095}
1981 2096
1982void 2097void
1983db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 2098db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1984 PREINIT: 2099 PREINIT:
… …
2012db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 2127db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
2013 PREINIT: 2128 PREINIT:
2014 CALLBACK 2129 CALLBACK
2015 CODE: 2130 CODE:
2016{ 2131{
2132 dREQ (REQ_SEQ_CLOSE, 0);
2017 ptr_nuke (ST (0)); 2133 ptr_nuke (ST (0));
2018 dREQ (REQ_SEQ_CLOSE, 0);
2019 req->seq = seq; 2134 req->seq = seq;
2020 req->uint1 = flags; 2135 req->uint1 = flags;
2021 REQ_SEND; 2136 REQ_SEND;
2022} 2137}
2023 2138
… …
2259 CODE: 2374 CODE:
2260 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2375 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2261 OUTPUT: 2376 OUTPUT:
2262 RETVAL 2377 RETVAL
2263 2378
2379int set_pagesize (DB *db, U32 pagesize)
2380 CODE:
2381 RETVAL = db->set_pagesize (db, pagesize);
2382 OUTPUT:
2383 RETVAL
2384
2264int set_flags (DB *db, U32 flags) 2385int set_flags (DB *db, U32 flags)
2265 CODE: 2386 CODE:
2266 RETVAL = db->set_flags (db, flags); 2387 RETVAL = db->set_flags (db, flags);
2267 OUTPUT: 2388 OUTPUT:
2268 RETVAL 2389 RETVAL

Diff Legend

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