[ViewVC] Diff of: cvs/BDB/BDB.xs

Comparing BDB/BDB.xs (file contents):
Revision 1.53 by root, Thu Sep 25 22:09:02 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
		44	typedef SV SV_mutable;
		45
44	typedef DB_ENV DB_ENV_ornull;	46	typedef DB_ENV DB_ENV_ornull;
45	typedef DB_TXN DB_TXN_ornull;	47	typedef DB_TXN DB_TXN_ornull;
46	typedef DBC DBC_ornull;	48	typedef DBC DBC_ornull;
47	typedef DB DB_ornull;	49	typedef DB DB_ornull;
48		50
…		…
135	dbt_to_sv (SV sv, DBT dbt)	137	dbt_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
148	enum {	154	enum {
149	REQ_QUIT,	155	REQ_QUIT,
…		…
359	SvREFCNT_dec (req->sv1);	365	SvREFCNT_dec (req->sv1);
360	break;	366	break;
361		367
362	case REQ_DB_GET:	368	case REQ_DB_GET:
363	case REQ_DB_PGET:	369	case REQ_DB_PGET:
364	dbt_to_sv (req->sv3, &req->dbt3);
365	break;
366
367	case REQ_C_GET:	370	case REQ_C_GET:
368	case REQ_C_PGET:	371	case REQ_C_PGET:
		372	case REQ_DB_PUT:
		373	case REQ_C_PUT:
369	dbt_to_sv (req->sv1, &req->dbt1);	374	dbt_to_sv (req->sv1, &req->dbt1);
370	dbt_to_sv (req->sv2, &req->dbt2);	375	dbt_to_sv (req->sv2, &req->dbt2);
371	dbt_to_sv (req->sv3, &req->dbt3);	376	dbt_to_sv (req->sv3, &req->dbt3);
372	break;
373
374	case REQ_DB_PUT:
375	case REQ_C_PUT:
376	dbt_to_sv (0, &req->dbt1);
377	dbt_to_sv (0, &req->dbt2);
378	break;	377	break;
379		378
380	case REQ_DB_KEY_RANGE:	379	case REQ_DB_KEY_RANGE:
381	{	380	{
382	AV *av = newAV ();	381	AV *av = newAV ();
…		…
555	PUTBACK;	554	PUTBACK;
556	count = call_sv (prepare_cb, G_ARRAY);	555	count = call_sv (prepare_cb, G_ARRAY);
557	SPAGAIN;	556	SPAGAIN;
558		557
559	if (count != 2)	558	if (count != 2)
560	croak ("prepare callback must return exactly two values\n");	559	croak ("sync prepare callback must return exactly two values\n");
561		560
562	wait_callback = POPs;	561	wait_callback = POPs;
563	req->callback = SvREFCNT_inc (POPs);	562	req->callback = SvREFCNT_inc (POPs);
564	}	563	}
565	else	564	else
…		…
1050	} \	1049	} \
1051	else if (sv_derived_from ((arg), # class)) \	1050	else if (sv_derived_from ((arg), # class)) \
1052	{ \	1051	{ \
1053	IV tmp = SvIV ((SV*) SvRV (arg)); \	1052	IV tmp = SvIV ((SV*) SvRV (arg)); \
1054	(var) = INT2PTR (type, tmp); \	1053	(var) = INT2PTR (type, tmp); \
1055	if (!var && nullok != 2) \	1054	if (!var && nullok != 2) \
1056	croak (# var " is not a valid " # class " object anymore"); \	1055	croak (# var " is not a valid " # class " object anymore"); \
1057	} \	1056	} \
1058	else \	1057	else \
1059	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");
1060		1063
1061	static void	1064	static void
1062	ptr_nuke (SV *sv)	1065	ptr_nuke (SV *sv)
1063	{	1066	{
1064	assert (SvROK (sv));	1067	assert (SvROK (sv));
…		…
1550	db_env_close (DB_ENV env, U32 flags = 0, SV callback = 0)	1553	db_env_close (DB_ENV env, U32 flags = 0, SV callback = 0)
1551	PREINIT:	1554	PREINIT:
1552	CALLBACK	1555	CALLBACK
1553	CODE:	1556	CODE:
1554	{	1557	{
		1558	ptr_nuke (ST (0));
1555	dREQ (REQ_ENV_CLOSE, 1);	1559	dREQ (REQ_ENV_CLOSE, 0);
1556	req->env = env;	1560	req->env = env;
1557	req->uint1 = flags;	1561	req->uint1 = flags;
1558	REQ_SEND;	1562	REQ_SEND;
1559	ptr_nuke (ST (0));
1560	}	1563	}
1561		1564
1562	void	1565	void
1563	db_env_txn_checkpoint (DB_ENV env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV callback = 0)	1566	db_env_txn_checkpoint (DB_ENV env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV callback = 0)
1564	PREINIT:	1567	PREINIT:
…		…
1674	db_close (DB db, U32 flags = 0, SV callback = 0)	1677	db_close (DB db, U32 flags = 0, SV callback = 0)
1675	PREINIT:	1678	PREINIT:
1676	CALLBACK	1679	CALLBACK
1677	CODE:	1680	CODE:
1678	{	1681	{
		1682	ptr_nuke (ST (0));
1679	dREQ (REQ_DB_CLOSE, 1);	1683	dREQ (REQ_DB_CLOSE, 0);
1680	req->db = db;	1684	req->db = db;
1681	req->uint1 = flags;	1685	req->uint1 = flags;
1682	req->sv1 = (SV *)db->app_private;	1686	req->sv1 = (SV *)db->app_private;
1683	REQ_SEND;	1687	REQ_SEND;
1684	ptr_nuke (ST (0));
1685	}	1688	}
1686		1689
1687	#if DB_VERSION_MINOR >= 4	1690	#if DB_VERSION_MINOR >= 4
1688		1691
1689	void	1692	void
…		…
1727	req->uint1 = flags;	1730	req->uint1 = flags;
1728	REQ_SEND;	1731	REQ_SEND;
1729	}	1732	}
1730		1733
1731	void	1734	void
1732	db_key_range (DB db, DB_TXN_ornull txn, SV key, SV key_range, U32 flags = 0, SV *callback = 0)	1735	db_key_range (DB db, DB_TXN_ornull txn, SV key, SV_mutable key_range, U32 flags = 0, SV *callback = 0)
1733	PREINIT:	1736	PREINIT:
1734	CALLBACK	1737	CALLBACK
1735	CODE:	1738	CODE:
1736	{	1739	{
1737	dREQ (REQ_DB_KEY_RANGE, 2);	1740	dREQ (REQ_DB_KEY_RANGE, 2);
…		…
1775	}	1778	}
1776		1779
1777	#endif	1780	#endif
1778		1781
1779	void	1782	void
1780	db_get (DB db, DB_TXN_ornull txn, SV key, SV data, U32 flags = 0, SV *callback = 0)	1783	db_get (DB db, DB_TXN_ornull txn, SV key, SV_mutable data, U32 flags = 0, SV *callback = 0)
1781	PREINIT:	1784	PREINIT:
1782	CALLBACK	1785	CALLBACK
1783	CODE:	1786	CODE:
1784	if (SvREADONLY (data))
1785	croak ("can't modify read-only data scalar in db_get");
1786	{	1787	{
		1788	//TODO: key is somtimesmutable
1787	dREQ (REQ_DB_GET, 2);	1789	dREQ (REQ_DB_GET, 2);
1788	req->db = db;	1790	req->db = db;
1789	req->txn = txn;	1791	req->txn = txn;
1790	req->uint1 = flags;	1792	req->uint1 = flags;
1791	sv_to_dbt (&req->dbt1, key);	1793	sv_to_dbt (&req->dbt1, key);
…		…
1793	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);	1795	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1794	REQ_SEND;	1796	REQ_SEND;
1795	}	1797	}
1796		1798
1797	void	1799	void
1798	db_pget (DB db, DB_TXN_ornull txn, SV key, SV pkey, SV data, U32 flags = 0, SV callback = 0)	1800	db_pget (DB db, DB_TXN_ornull txn, SV key, SV_mutable pkey, SV_mutable data, U32 flags = 0, SV callback = 0)
1799	PREINIT:	1801	PREINIT:
1800	CALLBACK	1802	CALLBACK
1801	CODE:	1803	CODE:
1802	if (SvREADONLY (data))
1803	croak ("can't modify read-only data scalar in db_pget");
1804	{	1804	{
		1805	//TODO: key is somtimesmutable
1805	dREQ (REQ_DB_PGET, 2);	1806	dREQ (REQ_DB_PGET, 2);
1806	req->db = db;	1807	req->db = db;
1807	req->txn = txn;	1808	req->txn = txn;
1808	req->uint1 = flags;	1809	req->uint1 = flags;
		1810
1809	sv_to_dbt (&req->dbt1, key);	1811	sv_to_dbt (&req->dbt1, key);
1810	sv_to_dbt (&req->dbt2, pkey);	1812
		1813	req->dbt2.flags = DB_DBT_MALLOC;
		1814	req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
		1815
1811	req->dbt3.flags = DB_DBT_MALLOC;	1816	req->dbt3.flags = DB_DBT_MALLOC;
1812	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);	1817	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1813	REQ_SEND;	1818	REQ_SEND;
1814	}	1819	}
1815		1820
…		…
1831	db_txn_commit (DB_TXN txn, U32 flags = 0, SV callback = 0)	1836	db_txn_commit (DB_TXN txn, U32 flags = 0, SV callback = 0)
1832	PREINIT:	1837	PREINIT:
1833	CALLBACK	1838	CALLBACK
1834	CODE:	1839	CODE:
1835	{	1840	{
		1841	ptr_nuke (ST (0));
1836	dREQ (REQ_TXN_COMMIT, 1);	1842	dREQ (REQ_TXN_COMMIT, 0);
1837	req->txn = txn;	1843	req->txn = txn;
1838	req->uint1 = flags;	1844	req->uint1 = flags;
1839	REQ_SEND;	1845	REQ_SEND;
		1846	}
		1847
		1848	void
		1849	db_txn_abort (DB_TXN txn, SV callback = 0)
		1850	PREINIT:
		1851	CALLBACK
		1852	CODE:
		1853	{
1840	ptr_nuke (ST (0));	1854	ptr_nuke (ST (0));
1841	}
1842
1843	void
1844	db_txn_abort (DB_TXN txn, SV callback = 0)
1845	PREINIT:
1846	CALLBACK
1847	CODE:
1848	{
1849	dREQ (REQ_TXN_ABORT, 1);	1855	dREQ (REQ_TXN_ABORT, 0);
1850	req->txn = txn;	1856	req->txn = txn;
1851	REQ_SEND;	1857	REQ_SEND;
		1858	}
		1859
		1860	void
		1861	db_txn_finish (DB_TXN txn, U32 flags = 0, SV callback = 0)
		1862	PREINIT:
		1863	CALLBACK
		1864	CODE:
		1865	{
1852	ptr_nuke (ST (0));	1866	ptr_nuke (ST (0));
1853	}
1854
1855	void
1856	db_txn_finish (DB_TXN txn, U32 flags = 0, SV callback = 0)
1857	PREINIT:
1858	CALLBACK
1859	CODE:
1860	{
1861	dREQ (REQ_TXN_FINISH, 1);	1867	dREQ (REQ_TXN_FINISH, 0);
1862	req->txn = txn;	1868	req->txn = txn;
1863	req->uint1 = flags;	1869	req->uint1 = flags;
1864	REQ_SEND;	1870	REQ_SEND;
		1871	}
		1872
		1873	void
		1874	db_c_close (DBC dbc, SV callback = 0)
		1875	PREINIT:
		1876	CALLBACK
		1877	CODE:
		1878	{
1865	ptr_nuke (ST (0));	1879	ptr_nuke (ST (0));
1866	}
1867
1868	void
1869	db_c_close (DBC dbc, SV callback = 0)
1870	PREINIT:
1871	CALLBACK
1872	CODE:
1873	{
1874	dREQ (REQ_C_CLOSE, 1);	1880	dREQ (REQ_C_CLOSE, 0);
1875	req->dbc = dbc;	1881	req->dbc = dbc;
1876	REQ_SEND;	1882	REQ_SEND;
1877	ptr_nuke (ST (0));
1878	}	1883	}
1879		1884
1880	void	1885	void
1881	db_c_count (DBC dbc, SV count, U32 flags = 0, SV *callback = 0)	1886	db_c_count (DBC dbc, SV count, U32 flags = 0, SV *callback = 0)
1882	PREINIT:	1887	PREINIT:
…		…
1902	req->uint1 = flags;	1907	req->uint1 = flags;
1903	REQ_SEND;	1908	REQ_SEND;
1904	}	1909	}
1905		1910
1906	void	1911	void
1907	db_c_get (DBC dbc, SV key, SV data, U32 flags = 0, SV callback = 0)	1912	db_c_get (DBC dbc, SV key, SV_mutable data, U32 flags = 0, SV callback = 0)
1908	PREINIT:	1913	PREINIT:
1909	CALLBACK	1914	CALLBACK
1910	CODE:	1915	CODE:
1911	{	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
1912	dREQ (REQ_C_GET, 1);	1920	dREQ (REQ_C_GET, 1);
1913	req->dbc = dbc;	1921	req->dbc = dbc;
1914	req->uint1 = flags;	1922	req->uint1 = flags;
1915	if ((flags & DB_SET) == DB_SET	1923	if (flags & DB_OPFLAGS_MASK == DB_SET)
1916	\|\| (flags & DB_SET_RANGE) == DB_SET_RANGE)
1917	sv_to_dbt (&req->dbt1, key);	1924	sv_to_dbt (&req->dbt1, key);
1918	else	1925	else
		1926	{
		1927	if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
		1928	sv_to_dbt (&req->dbt1, key);
		1929	else
1919	req->dbt1.flags = DB_DBT_MALLOC;	1930	req->dbt1.flags = DB_DBT_MALLOC;
1920		1931
1921	req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);	1932	req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
		1933	}
1922		1934
1923	if ((flags & DB_GET_BOTH) == DB_GET_BOTH	1935	if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1924	\|\| (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE)	1936	\|\| flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1925	sv_to_dbt (&req->dbt3, data);	1937	sv_to_dbt (&req->dbt3, data);
1926	else	1938	else
1927	req->dbt3.flags = DB_DBT_MALLOC;	1939	req->dbt3.flags = DB_DBT_MALLOC;
1928		1940
1929	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);	1941	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1930	REQ_SEND;	1942	REQ_SEND;
1931	}	1943	}
1932		1944
1933	void	1945	void
1934	db_c_pget (DBC dbc, SV key, SV pkey, SV data, U32 flags = 0, SV *callback = 0)	1946	db_c_pget (DBC dbc, SV key, SV_mutable pkey, SV_mutable data, U32 flags = 0, SV *callback = 0)
1935	PREINIT:	1947	PREINIT:
1936	CALLBACK	1948	CALLBACK
1937	CODE:	1949	CODE:
1938	{	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
1939	dREQ (REQ_C_PGET, 1);	1954	dREQ (REQ_C_PGET, 1);
1940	req->dbc = dbc;	1955	req->dbc = dbc;
1941	req->uint1 = flags;	1956	req->uint1 = flags;
1942	if ((flags & DB_SET) == DB_SET	1957	if (flags & DB_OPFLAGS_MASK == DB_SET)
1943	\|\| (flags & DB_SET_RANGE) == DB_SET_RANGE)
1944	sv_to_dbt (&req->dbt1, key);	1958	sv_to_dbt (&req->dbt1, key);
1945	else	1959	else
		1960	{
		1961	if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE)
		1962	sv_to_dbt (&req->dbt1, key);
		1963	else
1946	req->dbt1.flags = DB_DBT_MALLOC;	1964	req->dbt1.flags = DB_DBT_MALLOC;
1947		1965
1948	req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);	1966	req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
		1967	}
1949		1968
1950	req->dbt2.flags = DB_DBT_MALLOC;	1969	req->dbt2.flags = DB_DBT_MALLOC;
1951	req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);	1970	req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1952		1971
1953	if ((flags & DB_GET_BOTH) == DB_GET_BOTH	1972	if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH
1954	\|\| (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE)	1973	\|\| flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE)
1955	sv_to_dbt (&req->dbt3, data);	1974	sv_to_dbt (&req->dbt3, data);
1956	else	1975	else
1957	req->dbt3.flags = DB_DBT_MALLOC;	1976	req->dbt3.flags = DB_DBT_MALLOC;
1958		1977
1959	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);	1978	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
…		…
1993	db_sequence_close (DB_SEQUENCE seq, U32 flags = 0, SV callback = 0)	2012	db_sequence_close (DB_SEQUENCE seq, U32 flags = 0, SV callback = 0)
1994	PREINIT:	2013	PREINIT:
1995	CALLBACK	2014	CALLBACK
1996	CODE:	2015	CODE:
1997	{	2016	{
		2017	ptr_nuke (ST (0));
1998	dREQ (REQ_SEQ_CLOSE, 1);	2018	dREQ (REQ_SEQ_CLOSE, 0);
1999	req->seq = seq;	2019	req->seq = seq;
2000	req->uint1 = flags;	2020	req->uint1 = flags;
2001	REQ_SEND;	2021	REQ_SEND;
2002	ptr_nuke (ST (0));
2003	}	2022	}
2004		2023
2005	void	2024	void
2006	db_sequence_get (DB_SEQUENCE seq, DB_TXN_ornull txnid, int delta, SV seq_value, U32 flags = DB_TXN_NOSYNC, SV callback = 0)	2025	db_sequence_get (DB_SEQUENCE seq, DB_TXN_ornull txnid, int delta, SV_mutable seq_value, U32 flags = DB_TXN_NOSYNC, SV callback = 0)
2007	PREINIT:	2026	PREINIT:
2008	CALLBACK	2027	CALLBACK
2009	CODE:	2028	CODE:
2010	{	2029	{
2011	dREQ (REQ_SEQ_GET, 2);	2030	dREQ (REQ_SEQ_GET, 2);

Diff Legend

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

Comparing BDB/BDB.xs (file contents): Revision 1.53 by root, Thu Sep 25 22:09:02 2008 UTC vs. Revision 1.55 by root, Fri Sep 26 02:37:33 2008 UTC

Diff Legend

Comparing BDB/BDB.xs (file contents):
Revision 1.53 by root, Thu Sep 25 22:09:02 2008 UTC vs.
Revision 1.55 by root, Fri Sep 26 02:37:33 2008 UTC