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

Comparing BDB/BDB.xs (file contents):
Revision 1.57 by root, Mon Sep 29 03:01:54 2008 UTC vs.
Revision 1.68 by root, Tue Jul 14 19:29:23 2009 UTC

… …
5#include <errno.h> 5#include <errno.h>
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
11#include "schmorp.h"
10 12
11// perl stupidly defines these as macros, breaking 13// perl stupidly defines these as 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
… …
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};
… …
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 466#ifdef _WIN32
451 int arg; /* argg */ 467 int arg; /* argg */
452#endif 468#endif
453 int old_readfd = respipe [0]; 469 int old_readfd = respipe [0];
454 470
455 if (respipe [1] >= 0) 471 if (respipe [1] >= 0)
456 respipe_close (TO_SOCKET (respipe [1])); 472 respipe_close (S_TO_SOCKET (respipe [1]));
457 473
458#ifdef _WIN32
459 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
460#else
461 if (pipe (respipe)) 474 if (s_pipe (respipe))
462#endif
463 croak ("unable to initialize result pipe"); 475 croak ("unable to initialize result pipe");
464 476
465 if (old_readfd >= 0) 477 if (old_readfd >= 0)
466 { 478 {
467 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)
468 croak ("unable to initialize result pipe(2)"); 480 croak ("unable to initialize result pipe(2)");
469 481
470 respipe_close (respipe [0]); 482 respipe_close (respipe [0]);
471 respipe [0] = old_readfd; 483 respipe [0] = old_readfd;
472 } 484 }
473 485
474#ifdef _WIN32 486#ifdef _WIN32
475 arg = 1; 487 arg = 1;
476 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg) 488 if (ioctlsocket (S_TO_SOCKET (respipe [0]), FIONBIO, &arg)
477 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg)) 489 || ioctlsocket (S_TO_SOCKET (respipe [1]), FIONBIO, &arg))
478#else 490#else
479 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK) 491 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
480 || fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 492 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
481#endif 493#endif
482 croak ("unable to initialize result pipe(3)"); 494 croak ("unable to initialize result pipe(3)");
483 495
484 respipe_osf [0] = TO_SOCKET (respipe [0]); 496 respipe_osf [0] = S_TO_SOCKET (respipe [0]);
485 respipe_osf [1] = TO_SOCKET (respipe [1]); 497 respipe_osf [1] = S_TO_SOCKET (respipe [1]);
486} 498}
487 499
488static void bdb_request (bdb_req req); 500static void bdb_request (bdb_req req);
489X_THREAD_PROC (bdb_proc); 501X_THREAD_PROC (bdb_proc);
490 502
… …
770 req->result = req->db->close (req->db, req->uint1); 782 req->result = req->db->close (req->db, req->uint1);
771 break; 783 break;
772 784
773#if DB_VERSION_MINOR >= 4 785#if DB_VERSION_MINOR >= 4
774 case REQ_DB_COMPACT: 786 case REQ_DB_COMPACT:
775 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);
776 break; 788 break;
777#endif 789#endif
778 790
779 case REQ_DB_SYNC: 791 case REQ_DB_SYNC:
780 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);
781 break; 797 break;
782 798
783 case REQ_DB_UPGRADE: 799 case REQ_DB_UPGRADE:
784 req->result = req->db->upgrade (req->db, req->buf1, req->uint1); 800 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
785 break; 801 break;
… …
871 887
872 case REQ_SEQ_REMOVE: 888 case REQ_SEQ_REMOVE:
873 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 889 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
874 break; 890 break;
875#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;
876 900
877 default: 901 default:
878 req->result = ENOSYS; 902 req->result = ENOSYS;
879 break; 903 break;
880 } 904 }
… …
1135 } 1159 }
1136 1160
1137 return 0; 1161 return 0;
1138} 1162}
1139 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
1140/* stupid windoes defined CALLBACK as well */ 1205/* stupid windows defines CALLBACK as well */
1141#undef CALLBACK 1206#undef CALLBACK
1142#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1207#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1143 1208
1144MODULE = BDB PACKAGE = BDB 1209MODULE = BDB PACKAGE = BDB
1145 1210
… …
1198 const_iv (NOSYNC) 1263 const_iv (NOSYNC)
1199 const_iv (CHKSUM) 1264 const_iv (CHKSUM)
1200 const_iv (ENCRYPT) 1265 const_iv (ENCRYPT)
1201 const_iv (DUP) 1266 const_iv (DUP)
1202 const_iv (DUPSORT) 1267 const_iv (DUPSORT)
1203 const_iv (RECNUM) 1268 //const_iv (RECNUM)
1204 const_iv (RENUMBER) 1269 const_iv (RENUMBER)
1205 const_iv (REVSPLITOFF) 1270 const_iv (REVSPLITOFF)
1206 const_iv (CONSUME) 1271 const_iv (CONSUME)
1207 const_iv (CONSUME_WAIT) 1272 const_iv (CONSUME_WAIT)
1208 const_iv (GET_BOTH) 1273 const_iv (GET_BOTH)
… …
1280 const_iv (REP_UNAVAIL) 1345 const_iv (REP_UNAVAIL)
1281 const_iv (RUNRECOVERY) 1346 const_iv (RUNRECOVERY)
1282 const_iv (SECONDARY_BAD) 1347 const_iv (SECONDARY_BAD)
1283 const_iv (VERIFY_BAD) 1348 const_iv (VERIFY_BAD)
1284 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
1285 const_iv (VERB_DEADLOCK) 1361 const_iv (VERB_DEADLOCK)
1286 const_iv (VERB_RECOVERY) 1362 const_iv (VERB_RECOVERY)
1287 const_iv (VERB_REPLICATION) 1363 const_iv (VERB_REPLICATION)
1288 const_iv (VERB_WAITSFOR) 1364 const_iv (VERB_WAITSFOR)
1289 1365
… …
1322 const_iv (PRIORITY_VERY_LOW) 1398 const_iv (PRIORITY_VERY_LOW)
1323 const_iv (PRIORITY_LOW) 1399 const_iv (PRIORITY_LOW)
1324 const_iv (PRIORITY_DEFAULT) 1400 const_iv (PRIORITY_DEFAULT)
1325 const_iv (PRIORITY_HIGH) 1401 const_iv (PRIORITY_HIGH)
1326 const_iv (PRIORITY_VERY_HIGH) 1402 const_iv (PRIORITY_VERY_HIGH)
1403 const_iv (IGNORE_LEASE)
1327#endif 1404#endif
1328#if DB_VERSION_MINOR >= 7 1405#if DB_VERSION_MINOR >= 7
1406 //const_iv (MULTIPLE_KEY)
1329 const_iv (LOG_DIRECT) 1407 const_iv (LOG_DIRECT)
1330 const_iv (LOG_DSYNC) 1408 const_iv (LOG_DSYNC)
1331 const_iv (LOG_AUTO_REMOVE) 1409 const_iv (LOG_AUTO_REMOVE)
1332 const_iv (LOG_IN_MEMORY) 1410 const_iv (LOG_IN_MEMORY)
1333 const_iv (LOG_ZERO) 1411 const_iv (LOG_ZERO)
… …
1637 req->buf3 = strdup_ornull (newname); 1715 req->buf3 = strdup_ornull (newname);
1638 req->uint1 = flags; 1716 req->uint1 = flags;
1639 REQ_SEND; 1717 REQ_SEND;
1640} 1718}
1641 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;
1729 req->uint1 = flags;
1730 REQ_SEND;
1731}
1732
1642DB * 1733DB *
1643db_create (DB_ENV *env = 0, U32 flags = 0) 1734db_create (DB_ENV *env = 0, U32 flags = 0)
1644 CODE: 1735 CODE:
1645{ 1736{
1646 errno = db_create (&RETVAL, env, flags); 1737 errno = db_create (&RETVAL, env, flags);
… …
1693 CODE: 1784 CODE:
1694{ 1785{
1695 dREQ (REQ_DB_COMPACT, 2); 1786 dREQ (REQ_DB_COMPACT, 2);
1696 req->db = db; 1787 req->db = db;
1697 req->txn = txn; 1788 req->txn = txn;
1698 sv_to_dbt (&req->dbt1, start); 1789 if (start) sv_to_dbt (&req->dbt1, start);
1699 sv_to_dbt (&req->dbt2, stop); 1790 if (stop ) sv_to_dbt (&req->dbt2, stop );
1700 req->uint1 = flags; 1791 req->uint1 = flags;
1701 REQ_SEND; 1792 REQ_SEND;
1702} 1793}
1703 1794
1704#endif 1795#endif
… …
1714 req->uint1 = flags; 1805 req->uint1 = flags;
1715 REQ_SEND; 1806 REQ_SEND;
1716} 1807}
1717 1808
1718void 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
1719db_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)
1720 PREINIT: 1826 PREINIT:
1721 CALLBACK 1827 CALLBACK
1722 CODE: 1828 CODE:
1723{ 1829{
1724 dREQ (REQ_DB_SYNC, 1); 1830 dREQ (REQ_DB_UPGRADE, 1);
1725 req->db = db; 1831 req->db = db;
1726 req->buf1 = strdup (file); 1832 req->buf1 = strdup (file);
1727 req->uint1 = flags; 1833 req->uint1 = flags;
1728 REQ_SEND; 1834 REQ_SEND;
1729} 1835}
… …
1909db_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)
1910 PREINIT: 2016 PREINIT:
1911 CALLBACK 2017 CALLBACK
1912 CODE: 2018 CODE:
1913{ 2019{
1914 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2020 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"); 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");
1916 2026
1917 { 2027 {
1918 dREQ (REQ_C_GET, 1); 2028 dREQ (REQ_C_GET, 1);
1919 req->dbc = dbc; 2029 req->dbc = dbc;
1920 req->uint1 = flags; 2030 req->uint1 = flags;
1921 if (flags & DB_OPFLAGS_MASK == DB_SET) 2031 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1922 sv_to_dbt (&req->dbt1, key); 2032 sv_to_dbt (&req->dbt1, key);
1923 else 2033 else
1924 { 2034 {
1925 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2035 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1926 sv_to_dbt (&req->dbt1, key); 2036 sv_to_dbt (&req->dbt1, key);
1927 else 2037 else
1928 req->dbt1.flags = DB_DBT_MALLOC; 2038 req->dbt1.flags = DB_DBT_MALLOC;
1929 2039
1930 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2040 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1931 } 2041 }
1932 2042
1933 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2043 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1934 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2044 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1935 sv_to_dbt (&req->dbt3, data); 2045 sv_to_dbt (&req->dbt3, data);
1936 else 2046 else
1937 req->dbt3.flags = DB_DBT_MALLOC; 2047 req->dbt3.flags = DB_DBT_MALLOC;
1938 2048
1939 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2049 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
… …
1945db_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)
1946 PREINIT: 2056 PREINIT:
1947 CALLBACK 2057 CALLBACK
1948 CODE: 2058 CODE:
1949{ 2059{
1950 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2060 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1951 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");
1952 2066
1953 { 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);
… …
2260 CODE: 2374 CODE:
2261 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache); 2375 RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2262 OUTPUT: 2376 OUTPUT:
2263 RETVAL 2377 RETVAL
2264 2378
2379int set_pagesize (DB *db, U32 pagesize)
2380 CODE:
2381 RETVAL = db->set_pagesize (db, pagesize);
2382 OUTPUT:
2383 RETVAL
2384
2265int set_flags (DB *db, U32 flags) 2385int set_flags (DB *db, U32 flags)
2266 CODE: 2386 CODE:
2267 RETVAL = db->set_flags (db, flags); 2387 RETVAL = db->set_flags (db, flags);
2268 OUTPUT: 2388 OUTPUT:
2269 RETVAL 2389 RETVAL

Diff Legend

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