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