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

Comparing BDB/BDB.xs (file contents):
Revision 1.52 by root, Thu Sep 25 13:44:44 2008 UTC vs.
Revision 1.63 by root, Tue Oct 21 02:21:25 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
…		…
54	#if DB_VERSION_MINOR >= 3	53	#if DB_VERSION_MINOR >= 3
55	typedef DB_SEQUENCE DB_SEQUENCE_ornull;	54	typedef DB_SEQUENCE DB_SEQUENCE_ornull;
56	typedef DB_SEQUENCE DB_SEQUENCE_ornuked;	55	typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
57	#endif	56	#endif
58		57
59	typedef SV SV8; /* byte-sv, used for argument-checking */
60	typedef char *bdb_filename;	58	typedef char *bdb_filename;
61		59
62	static SV *prepare_cb;	60	static SV *prepare_cb;
63		61
64	#if DB_VERSION_MINOR >= 6	62	#if DB_VERSION_MINOR >= 6
…		…
135	dbt_to_sv (SV sv, DBT dbt)	133	dbt_to_sv (SV sv, DBT dbt)
136	{	134	{
137	if (sv)	135	if (sv)
138	{	136	{
139	SvREADONLY_off (sv);	137	SvREADONLY_off (sv);
140	sv_setsv_mg (sv, dbt->data ? newSVpvn (dbt->data, dbt->size) : &PL_sv_undef);	138
		139	if (dbt->data)
		140	sv_setpvn_mg (sv, dbt->data, dbt->size);
		141	else
		142	sv_setsv_mg (sv, &PL_sv_undef);
		143
141	SvREFCNT_dec (sv);	144	SvREFCNT_dec (sv);
142	}	145	}
143		146
144	//assert (dbt->flags & DBT_MALLOC \|\| !dbt->data);
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,
151	REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,	153	REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
		154	REQ_ENV_LOG_ARCHIVE,
152	REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,	155	REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
153	REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,	156	REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
154	REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,	157	REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
155	REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,	158	REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
156	REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,	159	REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
…		…
347	abort ();	350	abort ();
348	}	351	}
349		352
350	static int poll_cb (void);	353	static int poll_cb (void);
351	static void req_free (bdb_req req);	354	static void req_free (bdb_req req);
352	static void req_cancel (bdb_req req);
353		355
354	static int req_invoke (bdb_req req)	356	static 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	av = (AV )newRV_noinc ((SV )av);
		384
		385	SvREADONLY_off (req->sv1);
		386	sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
		387	SvREFCNT_dec (av);
		388	SvREFCNT_dec (req->sv1);
		389	}
		390	break;
		391
		392	#if DB_VERSION_MINOR >= 3
		393	case REQ_SEQ_GET:
		394	SvREADONLY_off (req->sv1);
		395
		396	if (sizeof (IV) > 4)
		397	sv_setiv_mg (req->sv1, (IV)req->seq_t);
		398	else
		399	sv_setnv_mg (req->sv1, (NV)req->seq_t);
		400
		401	SvREFCNT_dec (req->sv1);
		402	break;
		403	#endif
		404
		405	case REQ_ENV_LOG_ARCHIVE:
		406	{
		407	AV *av = newAV ();
		408	char listp = (char )req->buf1;
		409
		410	if (listp)
		411	while (*listp)
		412	av_push (av, newSVpv (*listp, 0)), ++listp;
		413
		414	av = (AV )newRV_noinc ((SV )av);
		415
		416	SvREADONLY_off (req->sv1);
		417	sv_setsv_mg (req->sv1, (SV *)av);
		418	SvREFCNT_dec (av);
		419	SvREFCNT_dec (req->sv1);
		420	}
		421	break;
		422	}
		423
		424	errno = req->result;
357		425
358	if (req->callback)	426	if (req->callback)
359	{	427	{
		428	dSP;
		429
360	ENTER;	430	ENTER;
361	SAVETMPS;	431	SAVETMPS;
362	PUSHMARK (SP);	432	PUSHMARK (SP);
363		433
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;	434	PUTBACK;
419	call_sv (req->callback, G_VOID \| G_EVAL);	435	call_sv (req->callback, G_VOID \| G_EVAL);
420	SPAGAIN;	436	SPAGAIN;
421		437
422	FREETMPS;	438	FREETMPS;
423	LEAVE;	439	LEAVE;
		440
		441	return !SvTRUE (ERRSV);
424	}	442	}
425		443
426	return !SvTRUE (ERRSV);	444	return 1;
427	}	445	}
428		446
429	static void req_free (bdb_req req)	447	static void req_free (bdb_req req)
430	{	448	{
431	SvREFCNT_dec (req->callback);	449	SvREFCNT_dec (req->callback);
…		…
485		503
486	respipe_osf [0] = TO_SOCKET (respipe [0]);	504	respipe_osf [0] = TO_SOCKET (respipe [0]);
487	respipe_osf [1] = TO_SOCKET (respipe [1]);	505	respipe_osf [1] = TO_SOCKET (respipe [1]);
488	}	506	}
489		507
		508	static void bdb_request (bdb_req req);
490	X_THREAD_PROC (bdb_proc);	509	X_THREAD_PROC (bdb_proc);
491		510
492	static void start_thread (void)	511	static void start_thread (void)
493	{	512	{
494	worker *wrk = calloc (1, sizeof (worker));	513	worker *wrk = calloc (1, sizeof (worker));
…		…
541	}	560	}
542		561
543	// synthesize callback if none given	562	// synthesize callback if none given
544	if (!req->callback)	563	if (!req->callback)
545	{	564	{
		565	if (SvOK (prepare_cb))
		566	{
546	int count;	567	int count;
547		568
548	dSP;	569	dSP;
549	PUSHMARK (SP);	570	PUSHMARK (SP);
550	PUTBACK;	571	PUTBACK;
551	count = call_sv (prepare_cb, G_ARRAY);	572	count = call_sv (prepare_cb, G_ARRAY);
552	SPAGAIN;	573	SPAGAIN;
553		574
554	if (count != 2)	575	if (count != 2)
555	croak ("prepare callback must return exactly two values\n");	576	croak ("sync prepare callback must return exactly two values\n");
556		577
557	wait_callback = POPs;	578	wait_callback = POPs;
558	req->callback = SvREFCNT_inc (POPs);	579	req->callback = SvREFCNT_inc (POPs);
		580	}
		581	else
		582	{
		583	// execute request synchronously
		584	bdb_request (req);
		585	req_invoke (req);
		586	req_free (req);
		587	return;
		588	}
559	}	589	}
560		590
561	++nreqs;	591	++nreqs;
562		592
563	X_LOCK (reqlock);	593	X_LOCK (reqlock);
…		…
760	req->result = req->db->close (req->db, req->uint1);	790	req->result = req->db->close (req->db, req->uint1);
761	break;	791	break;
762		792
763	#if DB_VERSION_MINOR >= 4	793	#if DB_VERSION_MINOR >= 4
764	case REQ_DB_COMPACT:	794	case REQ_DB_COMPACT:
765	req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);	795	req->result = req->db->compact (req->db, req->txn, req->dbt1.data ? &req->dbt1 : 0, req->dbt2.data ? &req->dbt2 : 0, 0, req->uint1, 0);
766	break;	796	break;
767	#endif	797	#endif
768		798
769	case REQ_DB_SYNC:	799	case REQ_DB_SYNC:
770	req->result = req->db->sync (req->db, req->uint1);	800	req->result = req->db->sync (req->db, req->uint1);
…		…
861		891
862	case REQ_SEQ_REMOVE:	892	case REQ_SEQ_REMOVE:
863	req->result = req->seq->remove (req->seq, req->txn, req->uint1);	893	req->result = req->seq->remove (req->seq, req->txn, req->uint1);
864	break;	894	break;
865	#endif	895	#endif
		896
		897	case REQ_ENV_LOG_ARCHIVE:
		898	{
		899	char *listp = 0; / DB_ARCH_REMOVE does not touch listp, contrary to docs */
		900	req->result = req->env->log_archive (req->env, &listp, req->uint1);
		901	req->buf1 = (char *)listp;
		902	}
		903	break;
866		904
867	default:	905	default:
868	req->result = ENOSYS;	906	req->result = ENOSYS;
869	break;	907	break;
870	}	908	}
…		…
1036	} \	1074	} \
1037	else if (sv_derived_from ((arg), # class)) \	1075	else if (sv_derived_from ((arg), # class)) \
1038	{ \	1076	{ \
1039	IV tmp = SvIV ((SV*) SvRV (arg)); \	1077	IV tmp = SvIV ((SV*) SvRV (arg)); \
1040	(var) = INT2PTR (type, tmp); \	1078	(var) = INT2PTR (type, tmp); \
1041	if (!var && nullok != 2) \	1079	if (!var && nullok != 2) \
1042	croak (# var " is not a valid " # class " object anymore"); \	1080	croak (# var " is not a valid " # class " object anymore"); \
1043	} \	1081	} \
1044	else \	1082	else \
1045	croak (# var " is not of type " # class);	1083	croak (# var " is not of type " # class);
		1084
		1085	#define ARG_MUTABLE(name) \
		1086	if (SvREADONLY (name)) \
		1087	croak ("argument " #name " is read-only/constant, but the request requires it to be mutable");
1046		1088
1047	static void	1089	static void
1048	ptr_nuke (SV *sv)	1090	ptr_nuke (SV *sv)
1049	{	1091	{
1050	assert (SvROK (sv));	1092	assert (SvROK (sv));
…		…
1121	}	1163	}
1122		1164
1123	return 0;	1165	return 0;
1124	}	1166	}
1125		1167
1126	/* stupid windoes defined CALLBACK as well */	1168	/* stupid windows defines CALLBACK as well */
1127	#undef CALLBACK	1169	#undef CALLBACK
1128	#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));	1170	#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1129		1171
1130	MODULE = BDB PACKAGE = BDB	1172	MODULE = BDB PACKAGE = BDB
1131		1173
…		…
1184	const_iv (NOSYNC)	1226	const_iv (NOSYNC)
1185	const_iv (CHKSUM)	1227	const_iv (CHKSUM)
1186	const_iv (ENCRYPT)	1228	const_iv (ENCRYPT)
1187	const_iv (DUP)	1229	const_iv (DUP)
1188	const_iv (DUPSORT)	1230	const_iv (DUPSORT)
1189	const_iv (RECNUM)	1231	//const_iv (RECNUM)
1190	const_iv (RENUMBER)	1232	const_iv (RENUMBER)
1191	const_iv (REVSPLITOFF)	1233	const_iv (REVSPLITOFF)
1192	const_iv (CONSUME)	1234	const_iv (CONSUME)
1193	const_iv (CONSUME_WAIT)	1235	const_iv (CONSUME_WAIT)
1194	const_iv (GET_BOTH)	1236	const_iv (GET_BOTH)
…		…
1266	const_iv (REP_UNAVAIL)	1308	const_iv (REP_UNAVAIL)
1267	const_iv (RUNRECOVERY)	1309	const_iv (RUNRECOVERY)
1268	const_iv (SECONDARY_BAD)	1310	const_iv (SECONDARY_BAD)
1269	const_iv (VERIFY_BAD)	1311	const_iv (VERIFY_BAD)
1270		1312
		1313	const_iv (ARCH_ABS)
		1314	const_iv (ARCH_DATA)
		1315	const_iv (ARCH_LOG)
		1316	const_iv (ARCH_REMOVE)
		1317
1271	const_iv (VERB_DEADLOCK)	1318	const_iv (VERB_DEADLOCK)
1272	const_iv (VERB_RECOVERY)	1319	const_iv (VERB_RECOVERY)
1273	const_iv (VERB_REPLICATION)	1320	const_iv (VERB_REPLICATION)
1274	const_iv (VERB_WAITSFOR)	1321	const_iv (VERB_WAITSFOR)
1275		1322
…		…
1308	const_iv (PRIORITY_VERY_LOW)	1355	const_iv (PRIORITY_VERY_LOW)
1309	const_iv (PRIORITY_LOW)	1356	const_iv (PRIORITY_LOW)
1310	const_iv (PRIORITY_DEFAULT)	1357	const_iv (PRIORITY_DEFAULT)
1311	const_iv (PRIORITY_HIGH)	1358	const_iv (PRIORITY_HIGH)
1312	const_iv (PRIORITY_VERY_HIGH)	1359	const_iv (PRIORITY_VERY_HIGH)
		1360	const_iv (IGNORE_LEASE)
1313	#endif	1361	#endif
1314	#if DB_VERSION_MINOR >= 7	1362	#if DB_VERSION_MINOR >= 7
		1363	//const_iv (MULTIPLE_KEY)
1315	const_iv (LOG_DIRECT)	1364	const_iv (LOG_DIRECT)
1316	const_iv (LOG_DSYNC)	1365	const_iv (LOG_DSYNC)
1317	const_iv (LOG_AUTO_REMOVE)	1366	const_iv (LOG_AUTO_REMOVE)
1318	const_iv (LOG_IN_MEMORY)	1367	const_iv (LOG_IN_MEMORY)
1319	const_iv (LOG_ZERO)	1368	const_iv (LOG_ZERO)
…		…
1328	};	1377	};
1329		1378
1330	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1379	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1331	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1380	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1332		1381
		1382	prepare_cb = &PL_sv_undef;
		1383
1333	{	1384	{
1334	/* we currently only allow version, minor-version and patchlevel to go up to 255 */	1385	/* 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 };	1386	char vstring[3] = { DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH };
1336		1387
1337	newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));	1388	newCONSTSUB (stash, "VERSION_v", newSVpvn (vstring, 3));
…		…
1475	RETVAL = started;	1526	RETVAL = started;
1476	if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);	1527	if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1477	OUTPUT:	1528	OUTPUT:
1478	RETVAL	1529	RETVAL
1479		1530
1480	void	1531	SV *
1481	set_sync_prepare (SV *cb)	1532	set_sync_prepare (SV *cb)
1482	PROTOTYPE: &	1533	PROTOTYPE: &
1483	CODE:	1534	CODE:
1484	SvREFCNT_dec (prepare_cb);	1535	RETVAL = prepare_cb;
1485	prepare_cb = newSVsv (cb);	1536	prepare_cb = newSVsv (cb);
		1537	OUTPUT:
		1538	RETVAL
1486		1539
1487	char *	1540	char *
1488	strerror (int errorno = errno)	1541	strerror (int errorno = errno)
1489	PROTOTYPE: ;$	1542	PROTOTYPE: ;$
1490	CODE:	1543	CODE:
…		…
1532	db_env_close (DB_ENV env, U32 flags = 0, SV callback = 0)	1585	db_env_close (DB_ENV env, U32 flags = 0, SV callback = 0)
1533	PREINIT:	1586	PREINIT:
1534	CALLBACK	1587	CALLBACK
1535	CODE:	1588	CODE:
1536	{	1589	{
1537	dREQ (REQ_ENV_CLOSE, 1);	1590	dREQ (REQ_ENV_CLOSE, 0);
		1591	ptr_nuke (ST (0));
1538	req->env = env;	1592	req->env = env;
1539	req->uint1 = flags;	1593	req->uint1 = flags;
1540	REQ_SEND;	1594	REQ_SEND;
1541	ptr_nuke (ST (0));
1542	}	1595	}
1543		1596
1544	void	1597	void
1545	db_env_txn_checkpoint (DB_ENV env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV callback = 0)	1598	db_env_txn_checkpoint (DB_ENV env, U32 kbyte = 0, U32 min = 0, U32 flags = 0, SV callback = 0)
1546	PREINIT:	1599	PREINIT:
…		…
1615	dREQ (REQ_ENV_DBRENAME, 2);	1668	dREQ (REQ_ENV_DBRENAME, 2);
1616	req->env = env;	1669	req->env = env;
1617	req->buf1 = strdup_ornull (file);	1670	req->buf1 = strdup_ornull (file);
1618	req->buf2 = strdup_ornull (database);	1671	req->buf2 = strdup_ornull (database);
1619	req->buf3 = strdup_ornull (newname);	1672	req->buf3 = strdup_ornull (newname);
		1673	req->uint1 = flags;
		1674	REQ_SEND;
		1675	}
		1676
		1677	void
		1678	db_env_log_archive (DB_ENV env, SV_mutable listp, U32 flags = 0, SV *callback = 0)
		1679	PREINIT:
		1680	CALLBACK
		1681	CODE:
		1682	{
		1683	dREQ (REQ_ENV_LOG_ARCHIVE, 1);
		1684	req->sv1 = SvREFCNT_inc (listp);
		1685	req->env = env;
1620	req->uint1 = flags;	1686	req->uint1 = flags;
1621	REQ_SEND;	1687	REQ_SEND;
1622	}	1688	}
1623		1689
1624	DB *	1690	DB *
…		…
1656	db_close (DB db, U32 flags = 0, SV callback = 0)	1722	db_close (DB db, U32 flags = 0, SV callback = 0)
1657	PREINIT:	1723	PREINIT:
1658	CALLBACK	1724	CALLBACK
1659	CODE:	1725	CODE:
1660	{	1726	{
1661	dREQ (REQ_DB_CLOSE, 1);	1727	dREQ (REQ_DB_CLOSE, 0);
		1728	ptr_nuke (ST (0));
1662	req->db = db;	1729	req->db = db;
1663	req->uint1 = flags;	1730	req->uint1 = flags;
1664	req->sv1 = (SV *)db->app_private;	1731	req->sv1 = (SV *)db->app_private;
1665	REQ_SEND;	1732	REQ_SEND;
1666	ptr_nuke (ST (0));
1667	}	1733	}
1668		1734
1669	#if DB_VERSION_MINOR >= 4	1735	#if DB_VERSION_MINOR >= 4
1670		1736
1671	void	1737	void
…		…
1675	CODE:	1741	CODE:
1676	{	1742	{
1677	dREQ (REQ_DB_COMPACT, 2);	1743	dREQ (REQ_DB_COMPACT, 2);
1678	req->db = db;	1744	req->db = db;
1679	req->txn = txn;	1745	req->txn = txn;
1680	sv_to_dbt (&req->dbt1, start);	1746	if (start) sv_to_dbt (&req->dbt1, start);
1681	sv_to_dbt (&req->dbt2, stop);	1747	if (stop ) sv_to_dbt (&req->dbt2, stop );
1682	req->uint1 = flags;	1748	req->uint1 = flags;
1683	REQ_SEND;	1749	REQ_SEND;
1684	}	1750	}
1685		1751
1686	#endif	1752	#endif
…		…
1709	req->uint1 = flags;	1775	req->uint1 = flags;
1710	REQ_SEND;	1776	REQ_SEND;
1711	}	1777	}
1712		1778
1713	void	1779	void
1714	db_key_range (DB db, DB_TXN_ornull txn, SV key, SV key_range, U32 flags = 0, SV *callback = 0)	1780	db_key_range (DB db, DB_TXN_ornull txn, SV key, SV_mutable key_range, U32 flags = 0, SV *callback = 0)
1715	PREINIT:	1781	PREINIT:
1716	CALLBACK	1782	CALLBACK
1717	CODE:	1783	CODE:
1718	{	1784	{
1719	dREQ (REQ_DB_KEY_RANGE, 2);	1785	dREQ (REQ_DB_KEY_RANGE, 2);
…		…
1757	}	1823	}
1758		1824
1759	#endif	1825	#endif
1760		1826
1761	void	1827	void
1762	db_get (DB db, DB_TXN_ornull txn, SV key, SV data, U32 flags = 0, SV *callback = 0)	1828	db_get (DB db, DB_TXN_ornull txn, SV key, SV_mutable data, U32 flags = 0, SV *callback = 0)
1763	PREINIT:	1829	PREINIT:
1764	CALLBACK	1830	CALLBACK
1765	CODE:	1831	CODE:
1766	if (SvREADONLY (data))
1767	croak ("can't modify read-only data scalar in db_get");
1768	{	1832	{
		1833	//TODO: key is somtimesmutable
1769	dREQ (REQ_DB_GET, 2);	1834	dREQ (REQ_DB_GET, 2);
1770	req->db = db;	1835	req->db = db;
1771	req->txn = txn;	1836	req->txn = txn;
1772	req->uint1 = flags;	1837	req->uint1 = flags;
1773	sv_to_dbt (&req->dbt1, key);	1838	sv_to_dbt (&req->dbt1, key);
…		…
1775	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);	1840	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1776	REQ_SEND;	1841	REQ_SEND;
1777	}	1842	}
1778		1843
1779	void	1844	void
1780	db_pget (DB db, DB_TXN_ornull txn, SV key, SV pkey, SV data, U32 flags = 0, SV callback = 0)	1845	db_pget (DB db, DB_TXN_ornull txn, SV key, SV_mutable pkey, SV_mutable data, U32 flags = 0, SV callback = 0)
1781	PREINIT:	1846	PREINIT:
1782	CALLBACK	1847	CALLBACK
1783	CODE:	1848	CODE:
1784	if (SvREADONLY (data))
1785	croak ("can't modify read-only data scalar in db_pget");
1786	{	1849	{
		1850	//TODO: key is somtimesmutable
1787	dREQ (REQ_DB_PGET, 2);	1851	dREQ (REQ_DB_PGET, 2);
1788	req->db = db;	1852	req->db = db;
1789	req->txn = txn;	1853	req->txn = txn;
1790	req->uint1 = flags;	1854	req->uint1 = flags;
		1855
1791	sv_to_dbt (&req->dbt1, key);	1856	sv_to_dbt (&req->dbt1, key);
1792	sv_to_dbt (&req->dbt2, pkey);	1857
		1858	req->dbt2.flags = DB_DBT_MALLOC;
		1859	req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
		1860
1793	req->dbt3.flags = DB_DBT_MALLOC;	1861	req->dbt3.flags = DB_DBT_MALLOC;
1794	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);	1862	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1795	REQ_SEND;	1863	REQ_SEND;
1796	}	1864	}
1797		1865
…		…
1813	db_txn_commit (DB_TXN txn, U32 flags = 0, SV callback = 0)	1881	db_txn_commit (DB_TXN txn, U32 flags = 0, SV callback = 0)
1814	PREINIT:	1882	PREINIT:
1815	CALLBACK	1883	CALLBACK
1816	CODE:	1884	CODE:
1817	{	1885	{
1818	dREQ (REQ_TXN_COMMIT, 1);	1886	dREQ (REQ_TXN_COMMIT, 0);
		1887	ptr_nuke (ST (0));
1819	req->txn = txn;	1888	req->txn = txn;
1820	req->uint1 = flags;	1889	req->uint1 = flags;
1821	REQ_SEND;	1890	REQ_SEND;
		1891	}
		1892
		1893	void
		1894	db_txn_abort (DB_TXN txn, SV callback = 0)
		1895	PREINIT:
		1896	CALLBACK
		1897	CODE:
		1898	{
		1899	dREQ (REQ_TXN_ABORT, 0);
1822	ptr_nuke (ST (0));	1900	ptr_nuke (ST (0));
1823	}
1824
1825	void
1826	db_txn_abort (DB_TXN txn, SV callback = 0)
1827	PREINIT:
1828	CALLBACK
1829	CODE:
1830	{
1831	dREQ (REQ_TXN_ABORT, 1);
1832	req->txn = txn;	1901	req->txn = txn;
1833	REQ_SEND;	1902	REQ_SEND;
		1903	}
		1904
		1905	void
		1906	db_txn_finish (DB_TXN txn, U32 flags = 0, SV callback = 0)
		1907	PREINIT:
		1908	CALLBACK
		1909	CODE:
		1910	{
		1911	dREQ (REQ_TXN_FINISH, 0);
1834	ptr_nuke (ST (0));	1912	ptr_nuke (ST (0));
1835	}
1836
1837	void
1838	db_txn_finish (DB_TXN txn, U32 flags = 0, SV callback = 0)
1839	PREINIT:
1840	CALLBACK
1841	CODE:
1842	{
1843	dREQ (REQ_TXN_FINISH, 1);
1844	req->txn = txn;	1913	req->txn = txn;
1845	req->uint1 = flags;	1914	req->uint1 = flags;
1846	REQ_SEND;	1915	REQ_SEND;
		1916	}
		1917
		1918	void
		1919	db_c_close (DBC dbc, SV callback = 0)
		1920	PREINIT:
		1921	CALLBACK
		1922	CODE:
		1923	{
		1924	dREQ (REQ_C_CLOSE, 0);
1847	ptr_nuke (ST (0));	1925	ptr_nuke (ST (0));
1848	}
1849
1850	void
1851	db_c_close (DBC dbc, SV callback = 0)
1852	PREINIT:
1853	CALLBACK
1854	CODE:
1855	{
1856	dREQ (REQ_C_CLOSE, 1);
1857	req->dbc = dbc;	1926	req->dbc = dbc;
1858	REQ_SEND;	1927	REQ_SEND;
1859	ptr_nuke (ST (0));
1860	}	1928	}
1861		1929
1862	void	1930	void
1863	db_c_count (DBC dbc, SV count, U32 flags = 0, SV *callback = 0)	1931	db_c_count (DBC dbc, SV count, U32 flags = 0, SV *callback = 0)
1864	PREINIT:	1932	PREINIT:
…		…
1884	req->uint1 = flags;	1952	req->uint1 = flags;
1885	REQ_SEND;	1953	REQ_SEND;
1886	}	1954	}
1887		1955
1888	void	1956	void
1889	db_c_get (DBC dbc, SV key, SV data, U32 flags = 0, SV callback = 0)	1957	db_c_get (DBC dbc, SV key, SV_mutable data, U32 flags = 0, SV callback = 0)
1890	PREINIT:	1958	PREINIT:
1891	CALLBACK	1959	CALLBACK
1892	CODE:	1960	CODE:
1893	{	1961	{
		1962	if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
		1963	croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
		1964	if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
		1965	croak ("argument \"%s\" must be byte/octet-encoded in %s",
		1966	"key",
		1967	"BDB::db_c_get");
		1968
		1969	{
1894	dREQ (REQ_C_GET, 1);	1970	dREQ (REQ_C_GET, 1);
1895	req->dbc = dbc;	1971	req->dbc = dbc;
1896	req->uint1 = flags;	1972	req->uint1 = flags;
1897	if ((flags & DB_SET) == DB_SET	1973	if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1898	\|\| (flags & DB_SET_RANGE) == DB_SET_RANGE)
1899	sv_to_dbt (&req->dbt1, key);	1974	sv_to_dbt (&req->dbt1, key);
1900	else	1975	else
		1976	{
		1977	if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
		1978	sv_to_dbt (&req->dbt1, key);
		1979	else
1901	req->dbt1.flags = DB_DBT_MALLOC;	1980	req->dbt1.flags = DB_DBT_MALLOC;
1902		1981
1903	req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);	1982	req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
		1983	}
1904		1984
1905	if ((flags & DB_GET_BOTH) == DB_GET_BOTH	1985	if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1906	\|\| (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE)	1986	\|\| (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1907	sv_to_dbt (&req->dbt3, data);	1987	sv_to_dbt (&req->dbt3, data);
1908	else	1988	else
1909	req->dbt3.flags = DB_DBT_MALLOC;	1989	req->dbt3.flags = DB_DBT_MALLOC;
1910		1990
1911	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);	1991	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1912	REQ_SEND;	1992	REQ_SEND;
		1993	}
1913	}	1994	}
1914		1995
1915	void	1996	void
1916	db_c_pget (DBC dbc, SV key, SV pkey, SV data, U32 flags = 0, SV *callback = 0)	1997	db_c_pget (DBC dbc, SV key, SV_mutable pkey, SV_mutable data, U32 flags = 0, SV *callback = 0)
1917	PREINIT:	1998	PREINIT:
1918	CALLBACK	1999	CALLBACK
1919	CODE:	2000	CODE:
1920	{	2001	{
		2002	if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
		2003	croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
		2004	if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
		2005	croak ("argument \"%s\" must be byte/octet-encoded in %s",
		2006	"key",
		2007	"BDB::db_c_pget");
		2008
		2009	{
1921	dREQ (REQ_C_PGET, 1);	2010	dREQ (REQ_C_PGET, 1);
1922	req->dbc = dbc;	2011	req->dbc = dbc;
1923	req->uint1 = flags;	2012	req->uint1 = flags;
1924	if ((flags & DB_SET) == DB_SET	2013	if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1925	\|\| (flags & DB_SET_RANGE) == DB_SET_RANGE)
1926	sv_to_dbt (&req->dbt1, key);	2014	sv_to_dbt (&req->dbt1, key);
1927	else	2015	else
		2016	{
		2017	if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
		2018	sv_to_dbt (&req->dbt1, key);
		2019	else
		2020	req->dbt1.flags = DB_DBT_MALLOC;
		2021
		2022	req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
		2023	}
		2024
1928	req->dbt1.flags = DB_DBT_MALLOC;	2025	req->dbt2.flags = DB_DBT_MALLOC;
1929
1930	req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1931
1932	req->dbt2.flags = DB_DBT_MALLOC;
1933	req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);	2026	req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1934		2027
1935	if ((flags & DB_GET_BOTH) == DB_GET_BOTH	2028	if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1936	\|\| (flags & DB_GET_BOTH_RANGE) == DB_GET_BOTH_RANGE)	2029	\|\| (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1937	sv_to_dbt (&req->dbt3, data);	2030	sv_to_dbt (&req->dbt3, data);
1938	else	2031	else
1939	req->dbt3.flags = DB_DBT_MALLOC;	2032	req->dbt3.flags = DB_DBT_MALLOC;
1940		2033
1941	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);	2034	req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
1942	REQ_SEND;	2035	REQ_SEND;
		2036	}
1943	}	2037	}
1944		2038
1945	void	2039	void
1946	db_c_del (DBC dbc, U32 flags = 0, SV callback = 0)	2040	db_c_del (DBC dbc, U32 flags = 0, SV callback = 0)
1947	PREINIT:	2041	PREINIT:
…		…
1975	db_sequence_close (DB_SEQUENCE seq, U32 flags = 0, SV callback = 0)	2069	db_sequence_close (DB_SEQUENCE seq, U32 flags = 0, SV callback = 0)
1976	PREINIT:	2070	PREINIT:
1977	CALLBACK	2071	CALLBACK
1978	CODE:	2072	CODE:
1979	{	2073	{
1980	dREQ (REQ_SEQ_CLOSE, 1);	2074	dREQ (REQ_SEQ_CLOSE, 0);
		2075	ptr_nuke (ST (0));
1981	req->seq = seq;	2076	req->seq = seq;
1982	req->uint1 = flags;	2077	req->uint1 = flags;
1983	REQ_SEND;	2078	REQ_SEND;
1984	ptr_nuke (ST (0));
1985	}	2079	}
1986		2080
1987	void	2081	void
1988	db_sequence_get (DB_SEQUENCE seq, DB_TXN_ornull txnid, int delta, SV seq_value, U32 flags = DB_TXN_NOSYNC, SV callback = 0)	2082	db_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:	2083	PREINIT:
1990	CALLBACK	2084	CALLBACK
1991	CODE:	2085	CODE:
1992	{	2086	{
1993	dREQ (REQ_SEQ_GET, 2);	2087	dREQ (REQ_SEQ_GET, 2);
…		…
2222	CODE:	2316	CODE:
2223	RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);	2317	RETVAL = db->set_cachesize (db, gbytes, bytes, ncache);
2224	OUTPUT:	2318	OUTPUT:
2225	RETVAL	2319	RETVAL
2226		2320
		2321	int set_pagesize (DB *db, U32 pagesize)
		2322	CODE:
		2323	RETVAL = db->set_pagesize (db, pagesize);
		2324	OUTPUT:
		2325	RETVAL
		2326
2227	int set_flags (DB *db, U32 flags)	2327	int set_flags (DB *db, U32 flags)
2228	CODE:	2328	CODE:
2229	RETVAL = db->set_flags (db, flags);	2329	RETVAL = db->set_flags (db, flags);
2230	OUTPUT:	2330	OUTPUT:
2231	RETVAL	2331	RETVAL

Diff Legend

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

Comparing BDB/BDB.xs (file contents): Revision 1.52 by root, Thu Sep 25 13:44:44 2008 UTC vs. Revision 1.63 by root, Tue Oct 21 02:21:25 2008 UTC

Diff Legend

Comparing BDB/BDB.xs (file contents):
Revision 1.52 by root, Thu Sep 25 13:44:44 2008 UTC vs.
Revision 1.63 by root, Tue Oct 21 02:21:25 2008 UTC