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

Comparing BDB/BDB.xs (file contents):
Revision 1.52 by root, Thu Sep 25 13:44:44 2008 UTC vs.
Revision 1.54 by root, Fri Sep 26 02:03:48 2008 UTC

39#endif 39#endif
40 40
41/* number of seconds after which idle threads exit */ 41/* number of seconds after which idle threads exit */
42#define IDLE_TIMEOUT 10 42#define IDLE_TIMEOUT 10
43 43
44typedef SV SV_mutable;
45
44typedef DB_ENV DB_ENV_ornull; 46typedef DB_ENV DB_ENV_ornull;
45typedef DB_TXN DB_TXN_ornull; 47typedef DB_TXN DB_TXN_ornull;
46typedef DBC DBC_ornull; 48typedef DBC DBC_ornull;
47typedef DB DB_ornull; 49typedef DB DB_ornull;
48 50
139 SvREADONLY_off (sv); 141 SvREADONLY_off (sv);
140 sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef); 142 sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef);
141 SvREFCNT_dec (sv); 143 SvREFCNT_dec (sv);
142 } 144 }
143 145
144 //assert (dbt->flags & DBT_MALLOC || !dbt->data); 146 if (dbt->flags & DB_DBT_MALLOC)
145 free (dbt->data); 147 free (dbt->data);
146} 148}
147 149
148enum { 150enum {
149 REQ_QUIT, 151 REQ_QUIT,
150 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,
351static void req_free (bdb_req req); 353static void req_free (bdb_req req);
352static void req_cancel (bdb_req req); 354static void req_cancel (bdb_req req);
353 355
354static int req_invoke (bdb_req req) 356static int req_invoke (bdb_req req)
355{ 357{
356 dSP; 358 switch (req->type)
359 {
360 case REQ_DB_CLOSE:
361 SvREFCNT_dec (req->sv1);
362 break;
363
364 case REQ_DB_GET:
365 case REQ_DB_PGET:
366 case REQ_C_GET:
367 case REQ_C_PGET:
368 case REQ_DB_PUT:
369 case REQ_C_PUT:
370 dbt_to_sv (req->sv1, &req->dbt1);
371 dbt_to_sv (req->sv2, &req->dbt2);
372 dbt_to_sv (req->sv3, &req->dbt3);
373 break;
374
375 case REQ_DB_KEY_RANGE:
376 {
377 AV *av = newAV ();
378
379 av_push (av, newSVnv (req->key_range.less));
380 av_push (av, newSVnv (req->key_range.equal));
381 av_push (av, newSVnv (req->key_range.greater));
382
383 SvREADONLY_off (req->sv1);
384 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
385 SvREFCNT_dec (req->sv1);
386 }
387 break;
388
389#if DB_VERSION_MINOR >= 3
390 case REQ_SEQ_GET:
391 SvREADONLY_off (req->sv1);
392
393 if (sizeof (IV) > 4)
394 sv_setiv_mg (req->sv1, (IV)req->seq_t);
395 else
396 sv_setnv_mg (req->sv1, (NV)req->seq_t);
397
398 SvREFCNT_dec (req->sv1);
399 break;
400#endif
401 }
402
403 errno = req->result;
357 404
358 if (req->callback) 405 if (req->callback)
359 { 406 {
407 dSP;
408
360 ENTER; 409 ENTER;
361 SAVETMPS; 410 SAVETMPS;
362 PUSHMARK (SP); 411 PUSHMARK (SP);
363 412
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; 413 PUTBACK;
419 call_sv (req->callback, G_VOID | G_EVAL); 414 call_sv (req->callback, G_VOID | G_EVAL);
420 SPAGAIN; 415 SPAGAIN;
421 416
422 FREETMPS; 417 FREETMPS;
423 LEAVE; 418 LEAVE;
419
420 return !SvTRUE (ERRSV);
424 } 421 }
425 422
426 return !SvTRUE (ERRSV); 423 return 1;
427} 424}
428 425
429static void req_free (bdb_req req) 426static void req_free (bdb_req req)
430{ 427{
431 SvREFCNT_dec (req->callback); 428 SvREFCNT_dec (req->callback);
485 482
486 respipe_osf [0] = TO_SOCKET (respipe [0]); 483 respipe_osf [0] = TO_SOCKET (respipe [0]);
487 respipe_osf [1] = TO_SOCKET (respipe [1]); 484 respipe_osf [1] = TO_SOCKET (respipe [1]);
488} 485}
489 486
487static void bdb_request (bdb_req req);
490X_THREAD_PROC (bdb_proc); 488X_THREAD_PROC (bdb_proc);
491 489
492static void start_thread (void) 490static void start_thread (void)
493{ 491{
494 worker *wrk = calloc (1, sizeof (worker)); 492 worker *wrk = calloc (1, sizeof (worker));
541 } 539 }
542 540
543 // synthesize callback if none given 541 // synthesize callback if none given
544 if (!req->callback) 542 if (!req->callback)
545 { 543 {
544 if (SvOK (prepare_cb))
545 {
546 int count; 546 int count;
547 547
548 dSP; 548 dSP;
549 PUSHMARK (SP); 549 PUSHMARK (SP);
550 PUTBACK; 550 PUTBACK;
551 count = call_sv (prepare_cb, G_ARRAY); 551 count = call_sv (prepare_cb, G_ARRAY);
552 SPAGAIN; 552 SPAGAIN;
553 553
554 if (count != 2) 554 if (count != 2)
555 croak ("prepare callback must return exactly two values\n"); 555 croak ("sync prepare callback must return exactly two values\n");
556 556
557 wait_callback = POPs; 557 wait_callback = POPs;
558 req->callback = SvREFCNT_inc (POPs); 558 req->callback = SvREFCNT_inc (POPs);
559 }
560 else
561 {
562 // execute request synchronously
563 bdb_request (req);
564 req_invoke (req);
565 req_free (req);
566 return;
567 }
559 } 568 }
560 569
561 ++nreqs; 570 ++nreqs;
562 571
563 X_LOCK (reqlock); 572 X_LOCK (reqlock);
1036 } \ 1045 } \
1037 else if (sv_derived_from ((arg), # class)) \ 1046 else if (sv_derived_from ((arg), # class)) \
1038 { \ 1047 { \
1039 IV tmp = SvIV ((SV*) SvRV (arg)); \ 1048 IV tmp = SvIV ((SV*) SvRV (arg)); \
1040 (var) = INT2PTR (type, tmp); \ 1049 (var) = INT2PTR (type, tmp); \
1041 if (!var && nullok != 2) \ 1050 if (!var && nullok != 2) \
1042 croak (# var " is not a valid " # class " object anymore"); \ 1051 croak (# var " is not a valid " # class " object anymore"); \
1043 } \ 1052 } \
1044 else \ 1053 else \
1045 croak (# var " is not of type " # class); 1054 croak (# var " is not of type " # class);
1055
1056#define ARG_MUTABLE(name) \
1057 if (SvREADONLY (name)) \
1058 croak ("argument " #name " is read-only/constant, but the request requires it to be mutable");
1046 1059
1047static void 1060static void
1048ptr_nuke (SV *sv) 1061ptr_nuke (SV *sv)
1049{ 1062{
1050 assert (SvROK (sv)); 1063 assert (SvROK (sv));
1328 }; 1341 };
1329 1342
1330 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1343 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1331 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1344 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1332 1345
1346 prepare_cb = &PL_sv_undef;
1347
1333 { 1348 {
1334 /* we currently only allow version, minor-version and patchlevel to go up to 255 */ 1349 /* we currently only allow version, minor-version and patchlevel to go up to 255 */
1335 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH }; 1350 char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1336 1351
1337 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3)); 1352 newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
1475 RETVAL = started; 1490 RETVAL = started;
1476 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock); 1491 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1477 OUTPUT: 1492 OUTPUT:
1478 RETVAL 1493 RETVAL
1479 1494
1480void 1495SV *
1481set_sync_prepare (SV *cb) 1496set_sync_prepare (SV *cb)
1482 PROTOTYPE: & 1497 PROTOTYPE: &
1483 CODE: 1498 CODE:
1484 SvREFCNT_dec (prepare_cb); 1499 RETVAL = prepare_cb;
1485 prepare_cb = newSVsv (cb); 1500 prepare_cb = newSVsv (cb);
1501 OUTPUT:
1502 RETVAL
1486 1503
1487char * 1504char *
1488strerror (int errorno = errno) 1505strerror (int errorno = errno)
1489 PROTOTYPE: ;$ 1506 PROTOTYPE: ;$
1490 CODE: 1507 CODE:
1532db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0) 1549db_env_close (DB_ENV *env, U32 flags = 0, SV *callback = 0)
1533 PREINIT: 1550 PREINIT:
1534 CALLBACK 1551 CALLBACK
1535 CODE: 1552 CODE:
1536{ 1553{
1554 ptr_nuke (ST (0));
1537 dREQ (REQ_ENV_CLOSE, 1); 1555 dREQ (REQ_ENV_CLOSE, 0);
1538 req->env = env; 1556 req->env = env;
1539 req->uint1 = flags; 1557 req->uint1 = flags;
1540 REQ_SEND; 1558 REQ_SEND;
1541 ptr_nuke (ST (0));
1542} 1559}
1543 1560
1544void 1561void
1545db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0) 1562db_env_txn_checkpoint (DB_ENV *env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV *callback = 0)
1546 PREINIT: 1563 PREINIT:
1656db_close (DB *db, U32 flags = 0, SV *callback = 0) 1673db_close (DB *db, U32 flags = 0, SV *callback = 0)
1657 PREINIT: 1674 PREINIT:
1658 CALLBACK 1675 CALLBACK
1659 CODE: 1676 CODE:
1660{ 1677{
1678 ptr_nuke (ST (0));
1661 dREQ (REQ_DB_CLOSE, 1); 1679 dREQ (REQ_DB_CLOSE, 0);
1662 req->db = db; 1680 req->db = db;
1663 req->uint1 = flags; 1681 req->uint1 = flags;
1664 req->sv1 = (SV *)db->app_private; 1682 req->sv1 = (SV *)db->app_private;
1665 REQ_SEND; 1683 REQ_SEND;
1666 ptr_nuke (ST (0));
1667} 1684}
1668 1685
1669#if DB_VERSION_MINOR >= 4 1686#if DB_VERSION_MINOR >= 4
1670 1687
1671void 1688void
1709 req->uint1 = flags; 1726 req->uint1 = flags;
1710 REQ_SEND; 1727 REQ_SEND;
1711} 1728}
1712 1729
1713void 1730void
1714db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = 0) 1731db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *key_range, U32 flags = 0, SV *callback = 0)
1715 PREINIT: 1732 PREINIT:
1716 CALLBACK 1733 CALLBACK
1717 CODE: 1734 CODE:
1718{ 1735{
1719 dREQ (REQ_DB_KEY_RANGE, 2); 1736 dREQ (REQ_DB_KEY_RANGE, 2);
1757} 1774}
1758 1775
1759#endif 1776#endif
1760 1777
1761void 1778void
1762db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1779db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1763 PREINIT: 1780 PREINIT:
1764 CALLBACK 1781 CALLBACK
1765 CODE: 1782 CODE:
1766 if (SvREADONLY (data))
1767 croak ("can't modify read-only data scalar in db_get");
1768{ 1783{
1784 //TODO: key is somtimesmutable
1769 dREQ (REQ_DB_GET, 2); 1785 dREQ (REQ_DB_GET, 2);
1770 req->db = db; 1786 req->db = db;
1771 req->txn = txn; 1787 req->txn = txn;
1772 req->uint1 = flags; 1788 req->uint1 = flags;
1773 sv_to_dbt (&req->dbt1, key); 1789 sv_to_dbt (&req->dbt1, key);
1775 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1791 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1776 REQ_SEND; 1792 REQ_SEND;
1777} 1793}
1778 1794
1779void 1795void
1780db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1796db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1781 PREINIT: 1797 PREINIT:
1782 CALLBACK 1798 CALLBACK
1783 CODE: 1799 CODE:
1784 if (SvREADONLY (data))
1785 croak ("can't modify read-only data scalar in db_pget");
1786{ 1800{
1801 //TODO: key is somtimesmutable
1787 dREQ (REQ_DB_PGET, 2); 1802 dREQ (REQ_DB_PGET, 2);
1788 req->db = db; 1803 req->db = db;
1789 req->txn = txn; 1804 req->txn = txn;
1790 req->uint1 = flags; 1805 req->uint1 = flags;
1806
1791 sv_to_dbt (&req->dbt1, key); 1807 sv_to_dbt (&req->dbt1, key);
1792 sv_to_dbt (&req->dbt2, pkey); 1808
1809 req->dbt2.flags = DB_DBT_MALLOC;
1810 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1811
1793 req->dbt3.flags = DB_DBT_MALLOC; 1812 req->dbt3.flags = DB_DBT_MALLOC;
1794 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1813 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1795 REQ_SEND; 1814 REQ_SEND;
1796} 1815}
1797 1816
1813db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0) 1832db_txn_commit (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1814 PREINIT: 1833 PREINIT:
1815 CALLBACK 1834 CALLBACK
1816 CODE: 1835 CODE:
1817{ 1836{
1837 ptr_nuke (ST (0));
1818 dREQ (REQ_TXN_COMMIT, 1); 1838 dREQ (REQ_TXN_COMMIT, 0);
1819 req->txn = txn; 1839 req->txn = txn;
1820 req->uint1 = flags; 1840 req->uint1 = flags;
1821 REQ_SEND; 1841 REQ_SEND;
1842}
1843
1844void
1845db_txn_abort (DB_TXN *txn, SV *callback = 0)
1846 PREINIT:
1847 CALLBACK
1848 CODE:
1849{
1822 ptr_nuke (ST (0)); 1850 ptr_nuke (ST (0));
1823}
1824
1825void
1826db_txn_abort (DB_TXN *txn, SV *callback = 0)
1827 PREINIT:
1828 CALLBACK
1829 CODE:
1830{
1831 dREQ (REQ_TXN_ABORT, 1); 1851 dREQ (REQ_TXN_ABORT, 0);
1832 req->txn = txn; 1852 req->txn = txn;
1833 REQ_SEND; 1853 REQ_SEND;
1854}
1855
1856void
1857db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1858 PREINIT:
1859 CALLBACK
1860 CODE:
1861{
1834 ptr_nuke (ST (0)); 1862 ptr_nuke (ST (0));
1835}
1836
1837void
1838db_txn_finish (DB_TXN *txn, U32 flags = 0, SV *callback = 0)
1839 PREINIT:
1840 CALLBACK
1841 CODE:
1842{
1843 dREQ (REQ_TXN_FINISH, 1); 1863 dREQ (REQ_TXN_FINISH, 0);
1844 req->txn = txn; 1864 req->txn = txn;
1845 req->uint1 = flags; 1865 req->uint1 = flags;
1846 REQ_SEND; 1866 REQ_SEND;
1867}
1868
1869void
1870db_c_close (DBC *dbc, SV *callback = 0)
1871 PREINIT:
1872 CALLBACK
1873 CODE:
1874{
1847 ptr_nuke (ST (0)); 1875 ptr_nuke (ST (0));
1848}
1849
1850void
1851db_c_close (DBC *dbc, SV *callback = 0)
1852 PREINIT:
1853 CALLBACK
1854 CODE:
1855{
1856 dREQ (REQ_C_CLOSE, 1); 1876 dREQ (REQ_C_CLOSE, 0);
1857 req->dbc = dbc; 1877 req->dbc = dbc;
1858 REQ_SEND; 1878 REQ_SEND;
1859 ptr_nuke (ST (0));
1860} 1879}
1861 1880
1862void 1881void
1863db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0) 1882db_c_count (DBC *dbc, SV *count, U32 flags = 0, SV *callback = 0)
1864 PREINIT: 1883 PREINIT:
1884 req->uint1 = flags; 1903 req->uint1 = flags;
1885 REQ_SEND; 1904 REQ_SEND;
1886} 1905}
1887 1906
1888void 1907void
1889db_c_get (DBC *dbc, SV *key, SV *data, U32 flags = 0, SV *callback = 0) 1908db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1890 PREINIT: 1909 PREINIT:
1891 CALLBACK 1910 CALLBACK
1892 CODE: 1911 CODE:
1893{ 1912{
1913 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");
1915
1894 dREQ (REQ_C_GET, 1); 1916 dREQ (REQ_C_GET, 1);
1895 req->dbc = dbc; 1917 req->dbc = dbc;
1896 req->uint1 = flags; 1918 req->uint1 = flags;
1897 if ((flags & DB_SET) == DB_SET 1919 if (flags & DB_OPFLAGS_MASK == DB_SET)
1898 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1899 sv_to_dbt (&req->dbt1, key); 1920 sv_to_dbt (&req->dbt1, key);
1900 else 1921 else
1922 {
1923 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
1924 sv_to_dbt (&req->dbt1, key);
1925 else
1901 req->dbt1.flags = DB_DBT_MALLOC; 1926 req->dbt1.flags = DB_DBT_MALLOC;
1902 1927
1903 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1928 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1929 }
1904 1930
1905 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 1931 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1906 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 1932 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1907 sv_to_dbt (&req->dbt3, data); 1933 sv_to_dbt (&req->dbt3, data);
1908 else 1934 else
1909 req->dbt3.flags = DB_DBT_MALLOC; 1935 req->dbt3.flags = DB_DBT_MALLOC;
1910 1936
1911 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1937 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1912 REQ_SEND; 1938 REQ_SEND;
1913} 1939}
1914 1940
1915void 1941void
1916db_c_pget (DBC *dbc, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = 0) 1942db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1917 PREINIT: 1943 PREINIT:
1918 CALLBACK 1944 CALLBACK
1919 CODE: 1945 CODE:
1920{ 1946{
1947 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");
1949
1921 dREQ (REQ_C_PGET, 1); 1950 dREQ (REQ_C_PGET, 1);
1922 req->dbc = dbc; 1951 req->dbc = dbc;
1923 req->uint1 = flags; 1952 req->uint1 = flags;
1924 if ((flags & DB_SET) == DB_SET 1953 if (flags & DB_OPFLAGS_MASK == DB_SET)
1925 || (flags & DB_SET_RANGE) == DB_SET_RANGE)
1926 sv_to_dbt (&req->dbt1, key); 1954 sv_to_dbt (&req->dbt1, key);
1927 else 1955 else
1956 {
1957 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
1958 sv_to_dbt (&req->dbt1, key);
1959 else
1928 req->dbt1.flags = DB_DBT_MALLOC; 1960 req->dbt1.flags = DB_DBT_MALLOC;
1929 1961
1930 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1962 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1963 }
1931 1964
1932 req->dbt2.flags = DB_DBT_MALLOC; 1965 req->dbt2.flags = DB_DBT_MALLOC;
1933 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 1966 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1934 1967
1935 if ((flags & DB_GET_BOTH) == DB_GET_BOTH 1968 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1936 || (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE) 1969 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1937 sv_to_dbt (&req->dbt3, data); 1970 sv_to_dbt (&req->dbt3, data);
1938 else 1971 else
1939 req->dbt3.flags = DB_DBT_MALLOC; 1972 req->dbt3.flags = DB_DBT_MALLOC;
1940 1973
1941 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1974 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1975db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0) 2008db_sequence_close (DB_SEQUENCE *seq, U32 flags = 0, SV *callback = 0)
1976 PREINIT: 2009 PREINIT:
1977 CALLBACK 2010 CALLBACK
1978 CODE: 2011 CODE:
1979{ 2012{
2013 ptr_nuke (ST (0));
1980 dREQ (REQ_SEQ_CLOSE, 1); 2014 dREQ (REQ_SEQ_CLOSE, 0);
1981 req->seq = seq; 2015 req->seq = seq;
1982 req->uint1 = flags; 2016 req->uint1 = flags;
1983 REQ_SEND; 2017 REQ_SEND;
1984 ptr_nuke (ST (0));
1985} 2018}
1986 2019
1987void 2020void
1988db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0) 2021db_sequence_get (DB_SEQUENCE *seq, DB_TXN_ornull *txnid, int delta, SV_mutable *seq_value, U32 flags = DB_TXN_NOSYNC, SV *callback = 0)
1989 PREINIT: 2022 PREINIT:
1990 CALLBACK 2023 CALLBACK
1991 CODE: 2024 CODE:
1992{ 2025{
1993 dREQ (REQ_SEQ_GET, 2); 2026 dREQ (REQ_SEQ_GET, 2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines