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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines