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

Comparing BDB/BDB.xs (file contents):
Revision 1.62 by root, Mon Oct 20 04:21:53 2008 UTC vs.
Revision 1.64 by root, Wed Nov 12 16:52:51 2008 UTC

…		…
149		149
150	enum {	150	enum {
151	REQ_QUIT,	151	REQ_QUIT,
152	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,
153	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,
154	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,
155	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,
156	REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,	157	REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
157	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,
158	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,
…		…
377		378
378	av_push (av, newSVnv (req->key_range.less));	379	av_push (av, newSVnv (req->key_range.less));
379	av_push (av, newSVnv (req->key_range.equal));	380	av_push (av, newSVnv (req->key_range.equal));
380	av_push (av, newSVnv (req->key_range.greater));	381	av_push (av, newSVnv (req->key_range.greater));
381		382
		383	av = (AV )newRV_noinc ((SV )av);
		384
382	SvREADONLY_off (req->sv1);	385	SvREADONLY_off (req->sv1);
383	sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));	386	sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
		387	SvREFCNT_dec (av);
384	SvREFCNT_dec (req->sv1);	388	SvREFCNT_dec (req->sv1);
385	}	389	}
386	break;	390	break;
387		391
388	#if DB_VERSION_MINOR >= 3	392	#if DB_VERSION_MINOR >= 3
…		…
395	sv_setnv_mg (req->sv1, (NV)req->seq_t);	399	sv_setnv_mg (req->sv1, (NV)req->seq_t);
396		400
397	SvREFCNT_dec (req->sv1);	401	SvREFCNT_dec (req->sv1);
398	break;	402	break;
399	#endif	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;
400	}	422	}
401		423
402	errno = req->result;	424	errno = req->result;
403		425
404	if (req->callback)	426	if (req->callback)
…		…
869		891
870	case REQ_SEQ_REMOVE:	892	case REQ_SEQ_REMOVE:
871	req->result = req->seq->remove (req->seq, req->txn, req->uint1);	893	req->result = req->seq->remove (req->seq, req->txn, req->uint1);
872	break;	894	break;
873	#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;
874		904
875	default:	905	default:
876	req->result = ENOSYS;	906	req->result = ENOSYS;
877	break;	907	break;
878	}	908	}
…		…
1132	}	1162	}
1133	}	1163	}
1134		1164
1135	return 0;	1165	return 0;
1136	}	1166	}
		1167
		1168	/*****************************************************************************/
		1169
		1170	#if 0
		1171	static int
		1172	bt_pfxc_compare (DB db, const DBT dbt1, const DBT *dbt2)
		1173	{
		1174	ssize_t size1 = dbt1->size;
		1175	ssize_t size2 = dbt2->size;
		1176	int res = memcmp ((void )dbt1->data, (void )dbt2->data,
		1177	size1 <= size2 ? size1 : size2);
		1178
		1179	if (res)
		1180	return res;
		1181	else if (size1 - size2)
		1182	return size1 - size2;
		1183	else
		1184	return 0;
		1185	}
		1186
		1187	static size_t
		1188	bt_pfxc_prefix_x (DB db, const DBT dbt1, const DBT *dbt2)
		1189	{
		1190	ssize_t size1 = dbt1->size;
		1191	ssize_t size2 = dbt2->size;
		1192	u_int8_t p1 = (u_int8_t )dbt1->data;
		1193	u_int8_t p2 = (u_int8_t )dbt2->data;
		1194	u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2);
		1195
		1196	while (p1 < pe)
		1197	if (p1++ != p2++)
		1198	return p1 - (u_int8_t *)dbt1->data - 1;
		1199
		1200	if (size1 < size2) return size1 + 1;
		1201	if (size1 > size2) return size2 + 1;
		1202
		1203	return size1;
		1204	}
		1205	#endif
		1206
		1207	/*****************************************************************************/
1137		1208
1138	/* stupid windows defines CALLBACK as well */	1209	/* stupid windows defines CALLBACK as well */
1139	#undef CALLBACK	1210	#undef CALLBACK
1140	#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));	1211	#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1141		1212
…		…
1278	const_iv (REP_UNAVAIL)	1349	const_iv (REP_UNAVAIL)
1279	const_iv (RUNRECOVERY)	1350	const_iv (RUNRECOVERY)
1280	const_iv (SECONDARY_BAD)	1351	const_iv (SECONDARY_BAD)
1281	const_iv (VERIFY_BAD)	1352	const_iv (VERIFY_BAD)
1282		1353
		1354	const_iv (ARCH_ABS)
		1355	const_iv (ARCH_DATA)
		1356	const_iv (ARCH_LOG)
		1357	const_iv (ARCH_REMOVE)
		1358
1283	const_iv (VERB_DEADLOCK)	1359	const_iv (VERB_DEADLOCK)
1284	const_iv (VERB_RECOVERY)	1360	const_iv (VERB_RECOVERY)
1285	const_iv (VERB_REPLICATION)	1361	const_iv (VERB_REPLICATION)
1286	const_iv (VERB_WAITSFOR)	1362	const_iv (VERB_WAITSFOR)
1287		1363
…		…
1320	const_iv (PRIORITY_VERY_LOW)	1396	const_iv (PRIORITY_VERY_LOW)
1321	const_iv (PRIORITY_LOW)	1397	const_iv (PRIORITY_LOW)
1322	const_iv (PRIORITY_DEFAULT)	1398	const_iv (PRIORITY_DEFAULT)
1323	const_iv (PRIORITY_HIGH)	1399	const_iv (PRIORITY_HIGH)
1324	const_iv (PRIORITY_VERY_HIGH)	1400	const_iv (PRIORITY_VERY_HIGH)
		1401	const_iv (IGNORE_LEASE)
1325	#endif	1402	#endif
1326	#if DB_VERSION_MINOR >= 7	1403	#if DB_VERSION_MINOR >= 7
1327	const_iv (IGNORE_LEASE)
1328	//const_iv (MULTIPLE_KEY)	1404	//const_iv (MULTIPLE_KEY)
1329	const_iv (LOG_DIRECT)	1405	const_iv (LOG_DIRECT)
1330	const_iv (LOG_DSYNC)	1406	const_iv (LOG_DSYNC)
1331	const_iv (LOG_AUTO_REMOVE)	1407	const_iv (LOG_AUTO_REMOVE)
1332	const_iv (LOG_IN_MEMORY)	1408	const_iv (LOG_IN_MEMORY)
…		…
1637	req->buf3 = strdup_ornull (newname);	1713	req->buf3 = strdup_ornull (newname);
1638	req->uint1 = flags;	1714	req->uint1 = flags;
1639	REQ_SEND;	1715	REQ_SEND;
1640	}	1716	}
1641		1717
		1718	void
		1719	db_env_log_archive (DB_ENV env, SV_mutable listp, U32 flags = 0, SV *callback = 0)
		1720	PREINIT:
		1721	CALLBACK
		1722	CODE:
		1723	{
		1724	dREQ (REQ_ENV_LOG_ARCHIVE, 1);
		1725	req->sv1 = SvREFCNT_inc (listp);
		1726	req->env = env;
		1727	req->uint1 = flags;
		1728	REQ_SEND;
		1729	}
		1730
1642	DB *	1731	DB *
1643	db_create (DB_ENV *env = 0, U32 flags = 0)	1732	db_create (DB_ENV *env = 0, U32 flags = 0)
1644	CODE:	1733	CODE:
1645	{	1734	{
1646	errno = db_create (&RETVAL, env, flags);	1735	errno = db_create (&RETVAL, env, flags);

Diff Legend

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

Comparing BDB/BDB.xs (file contents): Revision 1.62 by root, Mon Oct 20 04:21:53 2008 UTC vs. Revision 1.64 by root, Wed Nov 12 16:52:51 2008 UTC

Diff Legend

Comparing BDB/BDB.xs (file contents):
Revision 1.62 by root, Mon Oct 20 04:21:53 2008 UTC vs.
Revision 1.64 by root, Wed Nov 12 16:52:51 2008 UTC