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