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

Comparing BDB/BDB.xs (file contents):
Revision 1.51 by root, Thu Sep 25 13:28:37 2008 UTC vs.
Revision 1.59 by root, Mon Oct 20 02:31:51 2008 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>
39#endif 36#endif
40 37
41/* number of seconds after which idle threads exit */ 38/* number of seconds after which idle threads exit */
42#define IDLE_TIMEOUT 10 39#define IDLE_TIMEOUT 10
43 40
41typedef SV SV_mutable;
42
44typedef DB_ENV DB_ENV_ornull; 43typedef DB_ENV DB_ENV_ornull;
45typedef DB_TXN DB_TXN_ornull; 44typedef DB_TXN DB_TXN_ornull;
46typedef DBC DBC_ornull; 45typedef DBC DBC_ornull;
47typedef DB DB_ornull; 46typedef DB DB_ornull;
48 47
54#if DB_VERSION_MINOR >= 3 53#if DB_VERSION_MINOR >= 3
55typedef DB_SEQUENCE DB_SEQUENCE_ornull; 54typedef DB_SEQUENCE DB_SEQUENCE_ornull;
56typedef DB_SEQUENCE DB_SEQUENCE_ornuked; 55typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
57#endif 56#endif
58 57
59typedef SV SV8; /* byte-sv, used for argument-checking */
60typedef char *bdb_filename; 58typedef char *bdb_filename;
61 59
62static SV *prepare_cb; 60static SV *prepare_cb;
63 61
64#if DB_VERSION_MINOR >= 6 62#if DB_VERSION_MINOR >= 6
135dbt_to_sv (SV *sv, DBT *dbt) 133dbt_to_sv (SV *sv, DBT *dbt)
136{ 134{
137 if (sv) 135 if (sv)
138 { 136 {
139 SvREADONLY_off (sv); 137 SvREADONLY_off (sv);
140 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
141 SvREFCNT_dec (sv); 144 SvREFCNT_dec (sv);
142 } 145 }
143 146
144 //assert (dbt->flags & DBT_MALLOC || !dbt->data);
145 free (dbt->data); 147 free (dbt->data);
146} 148}
147 149
148enum { 150enum {
149 REQ_QUIT, 151 REQ_QUIT,
347 abort (); 349 abort ();
348} 350}
349 351
350static int poll_cb (void); 352static int poll_cb (void);
351static void req_free (bdb_req req); 353static void req_free (bdb_req req);
352static void req_cancel (bdb_req req);
353 354
354static int req_invoke (bdb_req req) 355static int req_invoke (bdb_req req)
355{ 356{
356 dSP; 357 switch (req->type)
358 {
359 case REQ_DB_CLOSE:
360 SvREFCNT_dec (req->sv1);
361 break;
362
363 case REQ_DB_GET:
364 case REQ_DB_PGET:
365 case REQ_C_GET:
366 case REQ_C_PGET:
367 case REQ_DB_PUT:
368 case REQ_C_PUT:
369 dbt_to_sv (req->sv1, &req->dbt1);
370 dbt_to_sv (req->sv2, &req->dbt2);
371 dbt_to_sv (req->sv3, &req->dbt3);
372 break;
373
374 case REQ_DB_KEY_RANGE:
375 {
376 AV *av = newAV ();
377
378 av_push (av, newSVnv (req->key_range.less));
379 av_push (av, newSVnv (req->key_range.equal));
380 av_push (av, newSVnv (req->key_range.greater));
381
382 SvREADONLY_off (req->sv1);
383 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
384 SvREFCNT_dec (req->sv1);
385 }
386 break;
387
388#if DB_VERSION_MINOR >= 3
389 case REQ_SEQ_GET:
390 SvREADONLY_off (req->sv1);
391
392 if (sizeof (IV) > 4)
393 sv_setiv_mg (req->sv1, (IV)req->seq_t);
394 else
395 sv_setnv_mg (req->sv1, (NV)req->seq_t);
396
397 SvREFCNT_dec (req->sv1);
398 break;
399#endif
400 }
401
402 errno = req->result;
357 403
358 if (req->callback) 404 if (req->callback)
359 { 405 {
406 dSP;
407
360 ENTER; 408 ENTER;
361 SAVETMPS; 409 SAVETMPS;
362 PUSHMARK (SP); 410 PUSHMARK (SP);
363 411
364 switch (req->type)
365 {
366 case REQ_DB_CLOSE:
367 SvREFCNT_dec (req->sv1);
368 break;
369
370 case REQ_DB_GET:
371 case REQ_DB_PGET:
372 dbt_to_sv (req->sv3, &req->dbt3);
373 break;
374
375 case REQ_C_GET:
376 case REQ_C_PGET:
377 dbt_to_sv (req->sv1, &req->dbt1);
378 dbt_to_sv (req->sv2, &req->dbt2);
379 dbt_to_sv (req->sv3, &req->dbt3);
380 break;
381
382 case REQ_DB_PUT:
383 case REQ_C_PUT:
384 dbt_to_sv (0, &req->dbt1);
385 dbt_to_sv (0, &req->dbt2);
386 break;
387
388 case REQ_DB_KEY_RANGE:
389 {
390 AV *av = newAV ();
391
392 av_push (av, newSVnv (req->key_range.less));
393 av_push (av, newSVnv (req->key_range.equal));
394 av_push (av, newSVnv (req->key_range.greater));
395
396 SvREADONLY_off (req->sv1);
397 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
398 SvREFCNT_dec (req->sv1);
399 }
400 break;
401
402#if DB_VERSION_MINOR >= 3
403 case REQ_SEQ_GET:
404 SvREADONLY_off (req->sv1);
405
406 if (sizeof (IV) > 4)
407 sv_setiv_mg (req->sv1, (IV)req->seq_t);
408 else
409 sv_setnv_mg (req->sv1, (NV)req->seq_t);
410
411 SvREFCNT_dec (req->sv1);
412 break;
413#endif
414 }
415
416 errno = req->result;
417
418 PUTBACK; 412 PUTBACK;
419 call_sv (req->callback, G_VOID | G_EVAL); 413 call_sv (req->callback, G_VOID | G_EVAL);
420 SPAGAIN; 414 SPAGAIN;
421 415
422 FREETMPS; 416 FREETMPS;
423 LEAVE; 417 LEAVE;
418
419 return !SvTRUE (ERRSV);
424 } 420 }
425 421
426 return !SvTRUE (ERRSV); 422 return 1;
427} 423}
428 424
429static void req_free (bdb_req req) 425static void req_free (bdb_req req)
430{ 426{
431 SvREFCNT_dec (req->callback); 427 SvREFCNT_dec (req->callback);
485 481
486 respipe_osf [0] = TO_SOCKET (respipe [0]); 482 respipe_osf [0] = TO_SOCKET (respipe [0]);
487 respipe_osf [1] = TO_SOCKET (respipe [1]); 483 respipe_osf [1] = TO_SOCKET (respipe [1]);
488} 484}
489 485
486static void bdb_request (bdb_req req);
490X_THREAD_PROC (bdb_proc); 487X_THREAD_PROC (bdb_proc);
491 488
492static void start_thread (void) 489static void start_thread (void)
493{ 490{
494 worker *wrk = calloc (1, sizeof (worker)); 491 worker *wrk = calloc (1, sizeof (worker));
541 } 538 }
542 539
543 // synthesize callback if none given 540 // synthesize callback if none given
544 if (!req->callback) 541 if (!req->callback)
545 { 542 {
543 if (SvOK (prepare_cb))
544 {
546 int count; 545 int count;
547 546
548 dSP; 547 dSP;
549 PUSHMARK (SP); 548 PUSHMARK (SP);
550 PUTBACK; 549 PUTBACK;
551 count = call_sv (prepare_cb, G_ARRAY); 550 count = call_sv (prepare_cb, G_ARRAY);
552 SPAGAIN; 551 SPAGAIN;
553 552
554 if (count != 2) 553 if (count != 2)
555 croak ("prepare callback must return exactly two values\n"); 554 croak ("sync prepare callback must return exactly two values\n");
556 555
557 wait_callback = POPs; 556 wait_callback = POPs;
558 req->callback = SvREFCNT_inc (POPs); 557 req->callback = SvREFCNT_inc (POPs);
558 }
559 else
560 {
561 // execute request synchronously
562 bdb_request (req);
563 req_invoke (req);
564 req_free (req);
565 return;
566 }
559 } 567 }
560 568
561 ++nreqs; 569 ++nreqs;
562 570
563 X_LOCK (reqlock); 571 X_LOCK (reqlock);
577 } 585 }
578} 586}
579 587
580static void end_thread (void) 588static void end_thread (void)
581{ 589{
582 bdb_req req; 590 bdb_req req = calloc (1, sizeof (bdb_cb));
583
584 Newz (0, req, 1, bdb_cb);
585 591
586 req->type = REQ_QUIT; 592 req->type = REQ_QUIT;
587 req->pri = PRI_MAX + PRI_BIAS; 593 req->pri = PRI_MAX + PRI_BIAS;
588 594
589 X_LOCK (reqlock); 595 X_LOCK (reqlock);
923 --nready; 929 --nready;
924 930
925 X_UNLOCK (reqlock); 931 X_UNLOCK (reqlock);
926 932
927 if (req->type == REQ_QUIT) 933 if (req->type == REQ_QUIT)
934 {
935 X_LOCK (reslock);
936 free (req);
937 self->req = 0;
938 X_UNLOCK (reslock);
939
928 goto quit; 940 goto quit;
941 }
929 942
930 bdb_request (req); 943 bdb_request (req);
931 944
932 X_LOCK (reslock); 945 X_LOCK (reslock);
933 946
1031 } \ 1044 } \
1032 else if (sv_derived_from ((arg), # class)) \ 1045 else if (sv_derived_from ((arg), # class)) \
1033 { \ 1046 { \
1034 IV tmp = SvIV ((SV*) SvRV (arg)); \ 1047 IV tmp = SvIV ((SV*) SvRV (arg)); \
1035 (var) = INT2PTR (type, tmp); \ 1048 (var) = INT2PTR (type, tmp); \
1036 if (!var && nullok != 2) \ 1049 if (!var && nullok != 2) \
1037 croak (# var " is not a valid " # class " object anymore"); \ 1050 croak (# var " is not a valid " # class " object anymore"); \
1038 } \ 1051 } \
1039 else \ 1052 else \
1040 croak (# var " is not of type " # class); 1053 croak (# var " is not of type " # class);
1054
1055#define ARG_MUTABLE(name) \
1056 if (SvREADONLY (name)) \
1057 croak ("argument " #name " is read-only/constant, but the request requires it to be mutable");
1041 1058
1042static void 1059static void
1043ptr_nuke (SV *sv) 1060ptr_nuke (SV *sv)
1044{ 1061{
1045 assert (SvROK (sv)); 1062 assert (SvROK (sv));
1116 } 1133 }
1117 1134
1118 return 0; 1135 return 0;
1119} 1136}
1120 1137
1121/* stupid windoes defined CALLBACK as well */ 1138/* stupid windows defines CALLBACK as well */
1122#undef CALLBACK 1139#undef CALLBACK
1123#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1140#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1124 1141
1125MODULE = BDB PACKAGE = BDB 1142MODULE = BDB PACKAGE = BDB
1126 1143
1323 }; 1340 };
1324 1341
1325 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1342 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1326 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1343 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1327 1344
1345 prepare_cb = &PL_sv_undef;
1346
1328 { 1347 {
1329 /* we currently only allow version, minor-version and patchlevel to go up to 255 */ 1348 /* we currently only allow version, minor-version and patchlevel to go up to 255 */
1330 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH }; 1349 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1331 1350
1332 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3)); 1351 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
1470 RETVAL = started; 1489 RETVAL = started;
1471 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock); 1490 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1472 OUTPUT: 1491 OUTPUT:
1473 RETVAL 1492 RETVAL
1474 1493
1475void 1494SV *
1476set_sync_prepare (SV *cb) 1495set_sync_prepare (SV *cb)
1477 PROTOTYPE: & 1496 PROTOTYPE: &
1478 CODE: 1497 CODE:
1479 SvREFCNT_dec (prepare_cb); 1498 RETVAL = prepare_cb;
1480 prepare_cb = newSVsv (cb); 1499 prepare_cb = newSVsv (cb);
1500 OUTPUT:
1501 RETVAL
1481 1502
1482char * 1503char *
1483strerror (int errorno = errno) 1504strerror (int errorno = errno)
1484 PROTOTYPE: ;$ 1505 PROTOTYPE: ;$
1485 CODE: 1506 CODE:
1527db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1548db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1528 PREINIT: 1549 PREINIT:
1529 CALLBACK 1550 CALLBACK
1530 CODE: 1551 CODE:
1531{ 1552{
1532 dREQ (REQ_ENV_CLOSE, 1); 1553 dREQ (REQ_ENV_CLOSE, 0);
1554 ptr_nuke (ST (0));
1533 req->env = env; 1555 req->env = env;
1534 req->uint1 = flags; 1556 req->uint1 = flags;
1535 REQ_SEND; 1557 REQ_SEND;
1536 ptr_nuke (ST (0));
1537} 1558}
1538 1559
1539void 1560void
1540db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0) 1561db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
1541 PREINIT: 1562 PREINIT:
1651db_close (DB *db, U32 flags = 0, SV *callback = 0) 1672db_close (DB *db, U32 flags = 0, SV *callback = 0)
1652 PREINIT: 1673 PREINIT:
1653 CALLBACK 1674 CALLBACK
1654 CODE: 1675 CODE:
1655{ 1676{
1656 dREQ (REQ_DB_CLOSE, 1); 1677 dREQ (REQ_DB_CLOSE, 0);
1678 ptr_nuke (ST (0));
1657 req->db = db; 1679 req->db = db;
1658 req->uint1 = flags; 1680 req->uint1 = flags;
1659 req->sv1 = (SV *)db->app_private; 1681 req->sv1 = (SV *)db->app_private;
1660 REQ_SEND; 1682 REQ_SEND;
1661 ptr_nuke (ST (0));
1662} 1683}
1663 1684
1664#if DB_VERSION_MINOR >= 4 1685#if DB_VERSION_MINOR >= 4
1665 1686
1666void 1687void
1704 req->uint1 = flags; 1725 req->uint1 = flags;
1705 REQ_SEND; 1726 REQ_SEND;
1706} 1727}
1707 1728
1708void 1729void
1709db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0) 1730db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *key_range, U32 flags = 0, SV *callback = 0)
1710 PREINIT: 1731 PREINIT:
1711 CALLBACK 1732 CALLBACK
1712 CODE: 1733 CODE:
1713{ 1734{
1714 dREQ (REQ_DB_KEY_RANGE, 2); 1735 dREQ (REQ_DB_KEY_RANGE, 2);
1752} 1773}
1753 1774
1754#endif 1775#endif
1755 1776
1756void 1777void
1757db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1778db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1758 PREINIT: 1779 PREINIT:
1759 CALLBACK 1780 CALLBACK
1760 CODE: 1781 CODE:
1761 if (SvREADONLY (data))
1762 croak ("can't modify read-only data scalar in db_get");
1763{ 1782{
1783 //TODO: key is somtimesmutable
1764 dREQ (REQ_DB_GET, 2); 1784 dREQ (REQ_DB_GET, 2);
1765 req->db = db; 1785 req->db = db;
1766 req->txn = txn; 1786 req->txn = txn;
1767 req->uint1 = flags; 1787 req->uint1 = flags;
1768 sv_to_dbt (&req->dbt1, key); 1788 sv_to_dbt (&req->dbt1, key);
1770 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1790 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1771 REQ_SEND; 1791 REQ_SEND;
1772} 1792}
1773 1793
1774void 1794void
1775db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1795db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1776 PREINIT: 1796 PREINIT:
1777 CALLBACK 1797 CALLBACK
1778 CODE: 1798 CODE:
1779 if (SvREADONLY (data))
1780 croak ("can't modify read-only data scalar in db_pget");
1781{ 1799{
1800 //TODO: key is somtimesmutable
1782 dREQ (REQ_DB_PGET, 2); 1801 dREQ (REQ_DB_PGET, 2);
1783 req->db = db; 1802 req->db = db;
1784 req->txn = txn; 1803 req->txn = txn;
1785 req->uint1 = flags; 1804 req->uint1 = flags;
1805
1786 sv_to_dbt (&req->dbt1, key); 1806 sv_to_dbt (&req->dbt1, key);
1787 sv_to_dbt (&req->dbt2, pkey); 1807
1808 req->dbt2.flags = DB_DBT_MALLOC;
1809 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1810
1788 req->dbt3.flags = DB_DBT_MALLOC; 1811 req->dbt3.flags = DB_DBT_MALLOC;
1789 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1812 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1790 REQ_SEND; 1813 REQ_SEND;
1791} 1814}
1792 1815
1808db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1831db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1809 PREINIT: 1832 PREINIT:
1810 CALLBACK 1833 CALLBACK
1811 CODE: 1834 CODE:
1812{ 1835{
1813 dREQ (REQ_TXN_COMMIT, 1); 1836 dREQ (REQ_TXN_COMMIT, 0);
1837 ptr_nuke (ST (0));
1814 req->txn = txn; 1838 req->txn = txn;
1815 req->uint1 = flags; 1839 req->uint1 = flags;
1816 REQ_SEND; 1840 REQ_SEND;
1841}
1842
1843void
1844db_txn_abort (DB_TXN *txn, SV *callback = 0)
1845 PREINIT:
1846 CALLBACK
1847 CODE:
1848{
1849 dREQ (REQ_TXN_ABORT, 0);
1817 ptr_nuke (ST (0)); 1850 ptr_nuke (ST (0));
1818}
1819
1820void
1821db_txn_abort (DB_TXN *txn, SV *callback = 0)
1822 PREINIT:
1823 CALLBACK
1824 CODE:
1825{
1826 dREQ (REQ_TXN_ABORT, 1);
1827 req->txn = txn; 1851 req->txn = txn;
1828 REQ_SEND; 1852 REQ_SEND;
1853}
1854
1855void
1856db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1857 PREINIT:
1858 CALLBACK
1859 CODE:
1860{
1861 dREQ (REQ_TXN_FINISH, 0);
1829 ptr_nuke (ST (0)); 1862 ptr_nuke (ST (0));
1830}
1831
1832void
1833db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1834 PREINIT:
1835 CALLBACK
1836 CODE:
1837{
1838 dREQ (REQ_TXN_FINISH, 1);
1839 req->txn = txn; 1863 req->txn = txn;
1840 req->uint1 = flags; 1864 req->uint1 = flags;
1841 REQ_SEND; 1865 REQ_SEND;
1866}
1867
1868void
1869db_c_close (DBC *dbc, SV *callback = 0)
1870 PREINIT:
1871 CALLBACK
1872 CODE:
1873{
1874 dREQ (REQ_C_CLOSE, 0);
1842 ptr_nuke (ST (0)); 1875 ptr_nuke (ST (0));
1843}
1844
1845void
1846db_c_close (DBC *dbc, SV *callback = 0)
1847 PREINIT:
1848 CALLBACK
1849 CODE:
1850{
1851 dREQ (REQ_C_CLOSE, 1);
1852 req->dbc = dbc; 1876 req->dbc = dbc;
1853 REQ_SEND; 1877 REQ_SEND;
1854 ptr_nuke (ST (0));
1855} 1878}
1856 1879
1857void 1880void
1858db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0) 1881db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
1859 PREINIT: 1882 PREINIT:
1879 req->uint1 = flags; 1902 req->uint1 = flags;
1880 REQ_SEND; 1903 REQ_SEND;
1881} 1904}
1882 1905
1883void 1906void
1884db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1907db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1885 PREINIT: 1908 PREINIT:
1886 CALLBACK 1909 CALLBACK
1887 CODE: 1910 CODE:
1888{ 1911{
1912 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key))
1913 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1914 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1915 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1916 "key",
1917 "BDB::db_c_get");
1918
1919 {
1889 dREQ (REQ_C_GET, 1); 1920 dREQ (REQ_C_GET, 1);
1890 req->dbc = dbc; 1921 req->dbc = dbc;
1891 req->uint1 = flags; 1922 req->uint1 = flags;
1892 if ((flags & DB_SET) == DB_SET 1923 if (flags & DB_OPFLAGS_MASK == DB_SET)
1893 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1894 sv_to_dbt (&req->dbt1, key); 1924 sv_to_dbt (&req->dbt1, key);
1895 else 1925 else
1926 {
1927 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
1928 sv_to_dbt (&req->dbt1, key);
1929 else
1896 req->dbt1.flags = DB_DBT_MALLOC; 1930 req->dbt1.flags = DB_DBT_MALLOC;
1897 1931
1898 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1932 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1933 }
1899 1934
1900 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 1935 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1901 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 1936 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1902 sv_to_dbt (&req->dbt3, data); 1937 sv_to_dbt (&req->dbt3, data);
1903 else 1938 else
1904 req->dbt3.flags = DB_DBT_MALLOC; 1939 req->dbt3.flags = DB_DBT_MALLOC;
1905 1940
1906 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1941 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1907 REQ_SEND; 1942 REQ_SEND;
1943 }
1908} 1944}
1909 1945
1910void 1946void
1911db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1947db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1912 PREINIT: 1948 PREINIT:
1913 CALLBACK 1949 CALLBACK
1914 CODE: 1950 CODE:
1915{ 1951{
1952 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key))
1953 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
1954 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1955 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1956 "key",
1957 "BDB::db_c_pget");
1958
1959 {
1916 dREQ (REQ_C_PGET, 1); 1960 dREQ (REQ_C_PGET, 1);
1917 req->dbc = dbc; 1961 req->dbc = dbc;
1918 req->uint1 = flags; 1962 req->uint1 = flags;
1919 if ((flags & DB_SET) == DB_SET 1963 if (flags & DB_OPFLAGS_MASK == DB_SET)
1920 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1921 sv_to_dbt (&req->dbt1, key); 1964 sv_to_dbt (&req->dbt1, key);
1922 else 1965 else
1966 {
1967 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
1968 sv_to_dbt (&req->dbt1, key);
1969 else
1970 req->dbt1.flags = DB_DBT_MALLOC;
1971
1972 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1973 }
1974
1923 req->dbt1.flags = DB_DBT_MALLOC; 1975 req->dbt2.flags = DB_DBT_MALLOC;
1924
1925 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1926
1927 req->dbt2.flags = DB_DBT_MALLOC;
1928 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 1976 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1929 1977
1930 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 1978 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1931 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 1979 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1932 sv_to_dbt (&req->dbt3, data); 1980 sv_to_dbt (&req->dbt3, data);
1933 else 1981 else
1934 req->dbt3.flags = DB_DBT_MALLOC; 1982 req->dbt3.flags = DB_DBT_MALLOC;
1935 1983
1936 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1984 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1937 REQ_SEND; 1985 REQ_SEND;
1986 }
1938} 1987}
1939 1988
1940void 1989void
1941db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0) 1990db_c_del (DBC *dbc, U32 flags = 0, SV *callback = 0)
1942 PREINIT: 1991 PREINIT:
1970db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 2019db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1971 PREINIT: 2020 PREINIT:
1972 CALLBACK 2021 CALLBACK
1973 CODE: 2022 CODE:
1974{ 2023{
1975 dREQ (REQ_SEQ_CLOSE, 1); 2024 dREQ (REQ_SEQ_CLOSE, 0);
2025 ptr_nuke (ST (0));
1976 req->seq = seq; 2026 req->seq = seq;
1977 req->uint1 = flags; 2027 req->uint1 = flags;
1978 REQ_SEND; 2028 REQ_SEND;
1979 ptr_nuke (ST (0));
1980} 2029}
1981 2030
1982void 2031void
1983db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0) 2032db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV_mutable *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0)
1984 PREINIT: 2033 PREINIT:
1985 CALLBACK 2034 CALLBACK
1986 CODE: 2035 CODE:
1987{ 2036{
1988 dREQ (REQ_SEQ_GET, 2); 2037 dREQ (REQ_SEQ_GET, 2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines