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

Comparing BDB/BDB.xs (file contents):
Revision 1.54 by root, Fri Sep 26 02:03:48 2008 UTC vs.
Revision 1.65 by root, Fri Jan 2 22:37:51 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>
56#if DB_VERSION_MINOR >= 3 53#if DB_VERSION_MINOR >= 3
57typedef DB_SEQUENCE DB_SEQUENCE_ornull; 54typedef DB_SEQUENCE DB_SEQUENCE_ornull;
58typedef DB_SEQUENCE DB_SEQUENCE_ornuked; 55typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
59#endif 56#endif
60 57
61typedef SV SV8; /* byte-sv, used for argument-checking */
62typedef char *bdb_filename; 58typedef char *bdb_filename;
63 59
64static SV *prepare_cb; 60static SV *prepare_cb;
65 61
66#if DB_VERSION_MINOR >= 6 62#if DB_VERSION_MINOR >= 6
137dbt_to_sv (SV *sv, DBT *dbt) 133dbt_to_sv (SV *sv, DBT *dbt)
138{ 134{
139 if (sv) 135 if (sv)
140 { 136 {
141 SvREADONLY_off (sv); 137 SvREADONLY_off (sv);
142 sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef); 138
139 if (dbt->data)
140 sv_setpvn_mg (sv, dbt->data, dbt->size);
141 else
142 sv_setsv_mg (sv, &PL_sv_undef);
143
143 SvREFCNT_dec (sv); 144 SvREFCNT_dec (sv);
144 } 145 }
145 146
146 if (dbt->flags & DB_DBT_MALLOC)
147 free (dbt->data); 147 free (dbt->data);
148} 148}
149 149
150enum { 150enum {
151 REQ_QUIT, 151 REQ_QUIT,
152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME, 153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
154 REQ_ENV_LOG_ARCHIVE,
154 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 155 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
155 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 156 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
156 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
157 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 158 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
158 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 159 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
349 abort (); 350 abort ();
350} 351}
351 352
352static int poll_cb (void); 353static int poll_cb (void);
353static void req_free (bdb_req req); 354static void req_free (bdb_req req);
354static void req_cancel (bdb_req req);
355 355
356static int req_invoke (bdb_req req) 356static int req_invoke (bdb_req req)
357{ 357{
358 switch (req->type) 358 switch (req->type)
359 { 359 {
378 378
379 av_push (av, newSVnv (req->key_range.less)); 379 av_push (av, newSVnv (req->key_range.less));
380 av_push (av, newSVnv (req->key_range.equal)); 380 av_push (av, newSVnv (req->key_range.equal));
381 av_push (av, newSVnv (req->key_range.greater)); 381 av_push (av, newSVnv (req->key_range.greater));
382 382
383 av = (AV *)newRV_noinc ((SV *)av);
384
383 SvREADONLY_off (req->sv1); 385 SvREADONLY_off (req->sv1);
384 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 386 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
387 SvREFCNT_dec (av);
385 SvREFCNT_dec (req->sv1); 388 SvREFCNT_dec (req->sv1);
386 } 389 }
387 break; 390 break;
388 391
389#if DB_VERSION_MINOR >= 3 392#if DB_VERSION_MINOR >= 3
396 sv_setnv_mg (req->sv1, (NV)req->seq_t); 399 sv_setnv_mg (req->sv1, (NV)req->seq_t);
397 400
398 SvREFCNT_dec (req->sv1); 401 SvREFCNT_dec (req->sv1);
399 break; 402 break;
400#endif 403#endif
404
405 case REQ_ENV_LOG_ARCHIVE:
406 {
407 AV *av = newAV ();
408 char **listp = (char **)req->buf1;
409
410 if (listp)
411 while (*listp)
412 av_push (av, newSVpv (*listp, 0)), ++listp;
413
414 av = (AV *)newRV_noinc ((SV *)av);
415
416 SvREADONLY_off (req->sv1);
417 sv_setsv_mg (req->sv1, (SV *)av);
418 SvREFCNT_dec (av);
419 SvREFCNT_dec (req->sv1);
420 }
421 break;
401 } 422 }
402 423
403 errno = req->result; 424 errno = req->result;
404 425
405 if (req->callback) 426 if (req->callback)
438} 459}
439 460
440#ifdef USE_SOCKETS_AS_HANDLES 461#ifdef USE_SOCKETS_AS_HANDLES
441# define TO_SOCKET(x) (win32_get_osfhandle (x)) 462# define TO_SOCKET(x) (win32_get_osfhandle (x))
442#else 463#else
464# define EV_SELECT_IS_WINSOCKET 1
443# define TO_SOCKET(x) (x) 465# define TO_SOCKET(x) (x)
466#endif
467
468#ifdef _WIN32
469/* taken verbatim from libev's ev_win32.c */
470/* oh, the humanity! */
471static int
472ev_pipe (int filedes [2])
473{
474 struct sockaddr_in addr = { 0 };
475 int addr_size = sizeof (addr);
476 struct sockaddr_in adr2;
477 int adr2_size;
478 SOCKET listener;
479 SOCKET sock [2] = { -1, -1 };
480
481 if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
482 return -1;
483
484 addr.sin_family = AF_INET;
485 addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
486 addr.sin_port = 0;
487
488 if (bind (listener, (struct sockaddr *)&addr, addr_size))
489 goto fail;
490
491 if (getsockname (listener, (struct sockaddr *)&addr, &addr_size))
492 goto fail;
493
494 if (listen (listener, 1))
495 goto fail;
496
497 if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
498 goto fail;
499
500 if (connect (sock [0], (struct sockaddr *)&addr, addr_size))
501 goto fail;
502
503 if ((sock [1] = accept (listener, 0, 0)) < 0)
504 goto fail;
505
506 /* windows vista returns fantasy port numbers for getpeername.
507 * example for two interconnected tcp sockets:
508 *
509 * (Socket::unpack_sockaddr_in getsockname $sock0)[0] == 53364
510 * (Socket::unpack_sockaddr_in getpeername $sock0)[0] == 53363
511 * (Socket::unpack_sockaddr_in getsockname $sock1)[0] == 53363
512 * (Socket::unpack_sockaddr_in getpeername $sock1)[0] == 53365
513 *
514 * wow! tridirectional sockets!
515 *
516 * this way of checking ports seems to work:
517 */
518 if (getpeername (sock [0], (struct sockaddr *)&addr, &addr_size))
519 goto fail;
520
521 if (getsockname (sock [1], (struct sockaddr *)&adr2, &adr2_size))
522 goto fail;
523
524 errno = WSAEINVAL;
525 if (addr_size != adr2_size
526 || addr.sin_addr.s_addr != adr2.sin_addr.s_addr /* just to be sure, I mean, it's windows */
527 || addr.sin_port != adr2.sin_port)
528 goto fail;
529
530 closesocket (listener);
531
532#if EV_SELECT_IS_WINSOCKET
533 filedes [0] = _open_osfhandle (sock [0], 0);
534 filedes [1] = _open_osfhandle (sock [1], 0);
535#else
536 /* when select isn't winsocket, we also expect socket, connect, accept etc.
537 * to work on fds */
538 filedes [0] = sock [0];
539 filedes [1] = sock [1];
540#endif
541
542 return 0;
543
544fail:
545 closesocket (listener);
546
547 if (sock [0] != INVALID_SOCKET) closesocket (sock [0]);
548 if (sock [1] != INVALID_SOCKET) closesocket (sock [1]);
549
550 return -1;
551}
444#endif 552#endif
445 553
446static void 554static void
447create_respipe (void) 555create_respipe (void)
448{ 556{
453 561
454 if (respipe [1] >= 0) 562 if (respipe [1] >= 0)
455 respipe_close (TO_SOCKET (respipe [1])); 563 respipe_close (TO_SOCKET (respipe [1]));
456 564
457#ifdef _WIN32 565#ifdef _WIN32
458 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe)) 566 if (ev_pipe (respipe))
459#else 567#else
460 if (pipe (respipe)) 568 if (pipe (respipe))
461#endif 569#endif
462 croak ("unable to initialize result pipe"); 570 croak ("unable to initialize result pipe");
463 571
769 req->result = req->db->close (req->db, req->uint1); 877 req->result = req->db->close (req->db, req->uint1);
770 break; 878 break;
771 879
772#if DB_VERSION_MINOR >= 4 880#if DB_VERSION_MINOR >= 4
773 case REQ_DB_COMPACT: 881 case REQ_DB_COMPACT:
774 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0); 882 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; 883 break;
776#endif 884#endif
777 885
778 case REQ_DB_SYNC: 886 case REQ_DB_SYNC:
779 req->result = req->db->sync (req->db, req->uint1); 887 req->result = req->db->sync (req->db, req->uint1);
870 978
871 case REQ_SEQ_REMOVE: 979 case REQ_SEQ_REMOVE:
872 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 980 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
873 break; 981 break;
874#endif 982#endif
983
984 case REQ_ENV_LOG_ARCHIVE:
985 {
986 char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */
987 req->result = req->env->log_archive (req->env, &listp, req->uint1);
988 req->buf1 = (char *)listp;
989 }
990 break;
875 991
876 default: 992 default:
877 req->result = ENOSYS; 993 req->result = ENOSYS;
878 break; 994 break;
879 } 995 }
1134 } 1250 }
1135 1251
1136 return 0; 1252 return 0;
1137} 1253}
1138 1254
1255/*****************************************************************************/
1256
1257#if 0
1258static int
1259bt_pfxc_compare (DB *db, const DBT *dbt1, const DBT *dbt2)
1260{
1261 ssize_t size1 = dbt1->size;
1262 ssize_t size2 = dbt2->size;
1263 int res = memcmp ((void *)dbt1->data, (void *)dbt2->data,
1264 size1 <= size2 ? size1 : size2);
1265
1266 if (res)
1267 return res;
1268 else if (size1 - size2)
1269 return size1 - size2;
1270 else
1271 return 0;
1272}
1273
1274static size_t
1275bt_pfxc_prefix_x (DB *db, const DBT *dbt1, const DBT *dbt2)
1276{
1277 ssize_t size1 = dbt1->size;
1278 ssize_t size2 = dbt2->size;
1279 u_int8_t *p1 = (u_int8_t *)dbt1->data;
1280 u_int8_t *p2 = (u_int8_t *)dbt2->data;
1281 u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2);
1282
1283 while (p1 < pe)
1284 if (*p1++ != *p2++)
1285 return p1 - (u_int8_t *)dbt1->data - 1;
1286
1287 if (size1 < size2) return size1 + 1;
1288 if (size1 > size2) return size2 + 1;
1289
1290 return size1;
1291}
1292#endif
1293
1294/*****************************************************************************/
1295
1139/* stupid windoes defined CALLBACK as well */ 1296/* stupid windows defines CALLBACK as well */
1140#undef CALLBACK 1297#undef CALLBACK
1141#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1298#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1142 1299
1143MODULE = BDB PACKAGE = BDB 1300MODULE = BDB PACKAGE = BDB
1144 1301
1197 const_iv (NOSYNC) 1354 const_iv (NOSYNC)
1198 const_iv (CHKSUM) 1355 const_iv (CHKSUM)
1199 const_iv (ENCRYPT) 1356 const_iv (ENCRYPT)
1200 const_iv (DUP) 1357 const_iv (DUP)
1201 const_iv (DUPSORT) 1358 const_iv (DUPSORT)
1202 const_iv (RECNUM) 1359 //const_iv (RECNUM)
1203 const_iv (RENUMBER) 1360 const_iv (RENUMBER)
1204 const_iv (REVSPLITOFF) 1361 const_iv (REVSPLITOFF)
1205 const_iv (CONSUME) 1362 const_iv (CONSUME)
1206 const_iv (CONSUME_WAIT) 1363 const_iv (CONSUME_WAIT)
1207 const_iv (GET_BOTH) 1364 const_iv (GET_BOTH)
1279 const_iv (REP_UNAVAIL) 1436 const_iv (REP_UNAVAIL)
1280 const_iv (RUNRECOVERY) 1437 const_iv (RUNRECOVERY)
1281 const_iv (SECONDARY_BAD) 1438 const_iv (SECONDARY_BAD)
1282 const_iv (VERIFY_BAD) 1439 const_iv (VERIFY_BAD)
1283 1440
1441 const_iv (ARCH_ABS)
1442 const_iv (ARCH_DATA)
1443 const_iv (ARCH_LOG)
1444 const_iv (ARCH_REMOVE)
1445
1284 const_iv (VERB_DEADLOCK) 1446 const_iv (VERB_DEADLOCK)
1285 const_iv (VERB_RECOVERY) 1447 const_iv (VERB_RECOVERY)
1286 const_iv (VERB_REPLICATION) 1448 const_iv (VERB_REPLICATION)
1287 const_iv (VERB_WAITSFOR) 1449 const_iv (VERB_WAITSFOR)
1288 1450
1321 const_iv (PRIORITY_VERY_LOW) 1483 const_iv (PRIORITY_VERY_LOW)
1322 const_iv (PRIORITY_LOW) 1484 const_iv (PRIORITY_LOW)
1323 const_iv (PRIORITY_DEFAULT) 1485 const_iv (PRIORITY_DEFAULT)
1324 const_iv (PRIORITY_HIGH) 1486 const_iv (PRIORITY_HIGH)
1325 const_iv (PRIORITY_VERY_HIGH) 1487 const_iv (PRIORITY_VERY_HIGH)
1488 const_iv (IGNORE_LEASE)
1326#endif 1489#endif
1327#if DB_VERSION_MINOR >= 7 1490#if DB_VERSION_MINOR >= 7
1491 //const_iv (MULTIPLE_KEY)
1328 const_iv (LOG_DIRECT) 1492 const_iv (LOG_DIRECT)
1329 const_iv (LOG_DSYNC) 1493 const_iv (LOG_DSYNC)
1330 const_iv (LOG_AUTO_REMOVE) 1494 const_iv (LOG_AUTO_REMOVE)
1331 const_iv (LOG_IN_MEMORY) 1495 const_iv (LOG_IN_MEMORY)
1332 const_iv (LOG_ZERO) 1496 const_iv (LOG_ZERO)
1549db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1713db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1550 PREINIT: 1714 PREINIT:
1551 CALLBACK 1715 CALLBACK
1552 CODE: 1716 CODE:
1553{ 1717{
1718 dREQ (REQ_ENV_CLOSE, 0);
1554 ptr_nuke (ST (0)); 1719 ptr_nuke (ST (0));
1555 dREQ (REQ_ENV_CLOSE, 0);
1556 req->env = env; 1720 req->env = env;
1557 req->uint1 = flags; 1721 req->uint1 = flags;
1558 REQ_SEND; 1722 REQ_SEND;
1559} 1723}
1560 1724
1632 dREQ (REQ_ENV_DBRENAME, 2); 1796 dREQ (REQ_ENV_DBRENAME, 2);
1633 req->env = env; 1797 req->env = env;
1634 req->buf1 = strdup_ornull (file); 1798 req->buf1 = strdup_ornull (file);
1635 req->buf2 = strdup_ornull (database); 1799 req->buf2 = strdup_ornull (database);
1636 req->buf3 = strdup_ornull (newname); 1800 req->buf3 = strdup_ornull (newname);
1801 req->uint1 = flags;
1802 REQ_SEND;
1803}
1804
1805void
1806db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1807 PREINIT:
1808 CALLBACK
1809 CODE:
1810{
1811 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1812 req->sv1 = SvREFCNT_inc (listp);
1813 req->env = env;
1637 req->uint1 = flags; 1814 req->uint1 = flags;
1638 REQ_SEND; 1815 REQ_SEND;
1639} 1816}
1640 1817
1641DB * 1818DB *
1673db_close (DB *db, U32 flags = 0, SV *callback = 0) 1850db_close (DB *db, U32 flags = 0, SV *callback = 0)
1674 PREINIT: 1851 PREINIT:
1675 CALLBACK 1852 CALLBACK
1676 CODE: 1853 CODE:
1677{ 1854{
1855 dREQ (REQ_DB_CLOSE, 0);
1678 ptr_nuke (ST (0)); 1856 ptr_nuke (ST (0));
1679 dREQ (REQ_DB_CLOSE, 0);
1680 req->db = db; 1857 req->db = db;
1681 req->uint1 = flags; 1858 req->uint1 = flags;
1682 req->sv1 = (SV *)db->app_private; 1859 req->sv1 = (SV *)db->app_private;
1683 REQ_SEND; 1860 REQ_SEND;
1684} 1861}
1692 CODE: 1869 CODE:
1693{ 1870{
1694 dREQ (REQ_DB_COMPACT, 2); 1871 dREQ (REQ_DB_COMPACT, 2);
1695 req->db = db; 1872 req->db = db;
1696 req->txn = txn; 1873 req->txn = txn;
1697 sv_to_dbt (&req->dbt1, start); 1874 if (start) sv_to_dbt (&req->dbt1, start);
1698 sv_to_dbt (&req->dbt2, stop); 1875 if (stop ) sv_to_dbt (&req->dbt2, stop );
1699 req->uint1 = flags; 1876 req->uint1 = flags;
1700 REQ_SEND; 1877 REQ_SEND;
1701} 1878}
1702 1879
1703#endif 1880#endif
1832db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 2009db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1833 PREINIT: 2010 PREINIT:
1834 CALLBACK 2011 CALLBACK
1835 CODE: 2012 CODE:
1836{ 2013{
2014 dREQ (REQ_TXN_COMMIT, 0);
1837 ptr_nuke (ST (0)); 2015 ptr_nuke (ST (0));
1838 dREQ (REQ_TXN_COMMIT, 0);
1839 req->txn = txn; 2016 req->txn = txn;
1840 req->uint1 = flags; 2017 req->uint1 = flags;
1841 REQ_SEND; 2018 REQ_SEND;
1842} 2019}
1843 2020
1845db_txn_abort (DB_TXN *txn, SV *callback = 0) 2022db_txn_abort (DB_TXN *txn, SV *callback = 0)
1846 PREINIT: 2023 PREINIT:
1847 CALLBACK 2024 CALLBACK
1848 CODE: 2025 CODE:
1849{ 2026{
2027 dREQ (REQ_TXN_ABORT, 0);
1850 ptr_nuke (ST (0)); 2028 ptr_nuke (ST (0));
1851 dREQ (REQ_TXN_ABORT, 0);
1852 req->txn = txn; 2029 req->txn = txn;
1853 REQ_SEND; 2030 REQ_SEND;
1854} 2031}
1855 2032
1856void 2033void
1857db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 2034db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1858 PREINIT: 2035 PREINIT:
1859 CALLBACK 2036 CALLBACK
1860 CODE: 2037 CODE:
1861{ 2038{
2039 dREQ (REQ_TXN_FINISH, 0);
1862 ptr_nuke (ST (0)); 2040 ptr_nuke (ST (0));
1863 dREQ (REQ_TXN_FINISH, 0);
1864 req->txn = txn; 2041 req->txn = txn;
1865 req->uint1 = flags; 2042 req->uint1 = flags;
1866 REQ_SEND; 2043 REQ_SEND;
1867} 2044}
1868 2045
1870db_c_close (DBC *dbc, SV *callback = 0) 2047db_c_close (DBC *dbc, SV *callback = 0)
1871 PREINIT: 2048 PREINIT:
1872 CALLBACK 2049 CALLBACK
1873 CODE: 2050 CODE:
1874{ 2051{
2052 dREQ (REQ_C_CLOSE, 0);
1875 ptr_nuke (ST (0)); 2053 ptr_nuke (ST (0));
1876 dREQ (REQ_C_CLOSE, 0);
1877 req->dbc = dbc; 2054 req->dbc = dbc;
1878 REQ_SEND; 2055 REQ_SEND;
1879} 2056}
1880 2057
1881void 2058void
1908db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2085db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1909 PREINIT: 2086 PREINIT:
1910 CALLBACK 2087 CALLBACK
1911 CODE: 2088 CODE:
1912{ 2089{
1913 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2090 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"); 2091 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
2092 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2093 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2094 "key",
2095 "BDB::db_c_get");
1915 2096
2097 {
1916 dREQ (REQ_C_GET, 1); 2098 dREQ (REQ_C_GET, 1);
1917 req->dbc = dbc; 2099 req->dbc = dbc;
1918 req->uint1 = flags; 2100 req->uint1 = flags;
1919 if (flags & DB_OPFLAGS_MASK == DB_SET) 2101 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1920 sv_to_dbt (&req->dbt1, key); 2102 sv_to_dbt (&req->dbt1, key);
1921 else 2103 else
1922 { 2104 {
1923 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2105 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1924 sv_to_dbt (&req->dbt1, key); 2106 sv_to_dbt (&req->dbt1, key);
1925 else 2107 else
1926 req->dbt1.flags = DB_DBT_MALLOC; 2108 req->dbt1.flags = DB_DBT_MALLOC;
1927 2109
1928 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2110 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1929 } 2111 }
1930 2112
1931 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2113 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1932 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2114 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1933 sv_to_dbt (&req->dbt3, data); 2115 sv_to_dbt (&req->dbt3, data);
1934 else 2116 else
1935 req->dbt3.flags = DB_DBT_MALLOC; 2117 req->dbt3.flags = DB_DBT_MALLOC;
1936 2118
1937 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2119 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1938 REQ_SEND; 2120 REQ_SEND;
2121 }
1939} 2122}
1940 2123
1941void 2124void
1942db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2125db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1943 PREINIT: 2126 PREINIT:
1944 CALLBACK 2127 CALLBACK
1945 CODE: 2128 CODE:
1946{ 2129{
1947 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2130 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1948 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2131 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
2132 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
2133 croak ("argument \"%s\" must be byte/octet-encoded in %s",
2134 "key",
2135 "BDB::db_c_pget");
1949 2136
2137 {
1950 dREQ (REQ_C_PGET, 1); 2138 dREQ (REQ_C_PGET, 1);
1951 req->dbc = dbc; 2139 req->dbc = dbc;
1952 req->uint1 = flags; 2140 req->uint1 = flags;
1953 if (flags & DB_OPFLAGS_MASK == DB_SET) 2141 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1954 sv_to_dbt (&req->dbt1, key); 2142 sv_to_dbt (&req->dbt1, key);
1955 else 2143 else
1956 { 2144 {
1957 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2145 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1958 sv_to_dbt (&req->dbt1, key); 2146 sv_to_dbt (&req->dbt1, key);
1959 else 2147 else
1960 req->dbt1.flags = DB_DBT_MALLOC; 2148 req->dbt1.flags = DB_DBT_MALLOC;
1961 2149
1962 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2150 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1963 } 2151 }
1964 2152
1965 req->dbt2.flags = DB_DBT_MALLOC; 2153 req->dbt2.flags = DB_DBT_MALLOC;
1966 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2154 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1967 2155
1968 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2156 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1969 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2157 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1970 sv_to_dbt (&req->dbt3, data); 2158 sv_to_dbt (&req->dbt3, data);
1971 else 2159 else
1972 req->dbt3.flags = DB_DBT_MALLOC; 2160 req->dbt3.flags = DB_DBT_MALLOC;
1973 2161
1974 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2162 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1975 REQ_SEND; 2163 REQ_SEND;
2164 }
1976} 2165}
1977 2166
1978void 2167void
1979db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 2168db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1980 PREINIT: 2169 PREINIT:
2008db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 2197db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
2009 PREINIT: 2198 PREINIT:
2010 CALLBACK 2199 CALLBACK
2011 CODE: 2200 CODE:
2012{ 2201{
2202 dREQ (REQ_SEQ_CLOSE, 0);
2013 ptr_nuke (ST (0)); 2203 ptr_nuke (ST (0));
2014 dREQ (REQ_SEQ_CLOSE, 0);
2015 req->seq = seq; 2204 req->seq = seq;
2016 req->uint1 = flags; 2205 req->uint1 = flags;
2017 REQ_SEND; 2206 REQ_SEND;
2018} 2207}
2019 2208
2255 CODE: 2444 CODE:
2256 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2445 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2257 OUTPUT: 2446 OUTPUT:
2258 RETVAL 2447 RETVAL
2259 2448
2449int set_pagesize (DB *db, U32 pagesize)
2450 CODE:
2451 RETVAL = db->set_pagesize (db, pagesize);
2452 OUTPUT:
2453 RETVAL
2454
2260int set_flags (DB *db, U32 flags) 2455int set_flags (DB *db, U32 flags)
2261 CODE: 2456 CODE:
2262 RETVAL = db->set_flags (db, flags); 2457 RETVAL = db->set_flags (db, flags);
2263 OUTPUT: 2458 OUTPUT:
2264 RETVAL 2459 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines