[ViewVC] Diff of: cvs/Compress-LZF/LZF.xs

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.9 by root, Sun Mar 3 04:45:18 2002 UTC vs.
Revision 1.20 by root, Fri Jul 7 15:47:10 2006 UTC

…		…
23	#define MAGIC_C 1 /* compressed data follows */	23	#define MAGIC_C 1 /* compressed data follows */
24	#define MAGIC_undef 2 /* the special value undef */	24	#define MAGIC_undef 2 /* the special value undef */
25	#define MAGIC_CR 3 /* storable (reference, freeze), compressed */	25	#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
26	#define MAGIC_R 4 /* storable (reference, freeze) */	26	#define MAGIC_R 4 /* storable (reference, freeze) */
27	#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */	27	#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
28	#define MAGIC_R_deref 6 /* storable NO (reference, freeze) */	28	#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
29	#define MAGIC_HI 7 /* room for one higher storable major */	29	#define MAGIC_HI 7 /* room for one higher storable major */
		30	/* for historical reasons, MAGIC_undef + MAGIC_R and MAGIC_undef + MAGIC_R_deref are used, too */
30		31
31	#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))	32	#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
32		33
		34	static SV serializer_package, serializer_mstore, *serializer_mretrieve;
33	static CV storable_mstore, storable_mretrieve;	35	static CV storable_mstore, storable_mretrieve;
34		36
		37	#if Size_t_size > 4
		38	# define MAX_LENGTH ((Size_t)0x80000000L)
		39	#else
		40	# define MAX_LENGTH ((Size_t) 0x8000000L)
		41	#endif
		42
35	static SV *	43	static SV *
36	compress_sv (SV *data, char cprepend, char uprepend)	44	compress_sv (SV *data, char cprepend, int uprepend)
37	{	45	{
38	STRLEN usize, csize;	46	STRLEN usize, csize;
39	char src = (char )SvPV (data, usize);	47	char src = (char )SvPV (data, usize);
40		48
41	if (usize)	49	if (usize)
…		…
48	dst = (unsigned char *)SvPVX (ret);	56	dst = (unsigned char *)SvPVX (ret);
49		57
50	if (cprepend)	58	if (cprepend)
51	dst[skip++] = cprepend;	59	dst[skip++] = cprepend;
52		60
53	if (usize < 0x80)	61	if (usize <= 0x7f)
54	{	62	{
55	dst[skip++] = usize;	63	dst[skip++] = usize;
56	}	64	}
57	else if (usize < 0x800)	65	else if (usize <= 0x7ff)
58	{	66	{
59	dst[skip++] = (( usize >> 6) \| 0xc0);	67	dst[skip++] = (( usize >> 6) \| 0xc0);
60	dst[skip++] = (( usize & 0x3f) \| 0x80);	68	dst[skip++] = (( usize & 0x3f) \| 0x80);
61	}	69	}
62	else if (usize < 0x10000)	70	else if (usize <= 0xffff)
63	{	71	{
64	dst[skip++] = (( usize >> 12) \| 0xe0);	72	dst[skip++] = (( usize >> 12) \| 0xe0);
65	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);	73	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);
66	dst[skip++] = (( usize & 0x3f) \| 0x80);	74	dst[skip++] = (( usize & 0x3f) \| 0x80);
67	}	75	}
68	else if (usize < 0x200000)	76	else if (usize <= 0x1fffff)
69	{	77	{
70	dst[skip++] = (( usize >> 18) \| 0xf0);	78	dst[skip++] = (( usize >> 18) \| 0xf0);
71	dst[skip++] = (((usize >> 12) & 0x3f) \| 0x80);	79	dst[skip++] = (((usize >> 12) & 0x3f) \| 0x80);
72	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);	80	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);
73	dst[skip++] = (( usize & 0x3f) \| 0x80);	81	dst[skip++] = (( usize & 0x3f) \| 0x80);
74	}	82	}
75	else if (usize < 0x4000000)	83	else if (usize <= 0x3ffffff)
76	{	84	{
77	dst[skip++] = (( usize >> 24) \| 0xf8);	85	dst[skip++] = (( usize >> 24) \| 0xf8);
78	dst[skip++] = (((usize >> 18) & 0x3f) \| 0x80);	86	dst[skip++] = (((usize >> 18) & 0x3f) \| 0x80);
79	dst[skip++] = (((usize >> 12) & 0x3f) \| 0x80);	87	dst[skip++] = (((usize >> 12) & 0x3f) \| 0x80);
80	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);	88	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);
81	dst[skip++] = (( usize & 0x3f) \| 0x80);	89	dst[skip++] = (( usize & 0x3f) \| 0x80);
82	}	90	}
		91	else if (usize <= 0x7fffffff)
		92	{
		93	dst[skip++] = (( usize >> 30) \| 0xfc);
		94	dst[skip++] = (((usize >> 24) & 0x3f) \| 0x80);
		95	dst[skip++] = (((usize >> 18) & 0x3f) \| 0x80);
		96	dst[skip++] = (((usize >> 12) & 0x3f) \| 0x80);
		97	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);
		98	dst[skip++] = (( usize & 0x3f) \| 0x80);
		99	}
83	else	100	else
84	croak ("compress can only compress up to %ld bytes", 0x4000000-1);	101	croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
85		102
86	/* 11 bytes is the smallest compressible string */	103	/* 11 bytes is the smallest compressible string */
87	csize = usize < 11 ? 0 :	104	csize = usize < 11 ? 0 :
88	lzf_compress (src, usize,	105	lzf_compress (src, usize,
89	dst + skip,	106	dst + skip,
…		…
91		108
92	if (csize)	109	if (csize)
93	{	110	{
94	SvCUR_set (ret, csize + skip);	111	SvCUR_set (ret, csize + skip);
95	}	112	}
96	else if (!uprepend)	113	else if (uprepend < 0)
97	{	114	{
98	SvREFCNT_dec (ret);	115	SvREFCNT_dec (ret);
99	ret = SvREFCNT_inc (data);	116	ret = SvREFCNT_inc (data);
100	}	117	}
101	else	118	else
102	{	119	{
103	*dst++ = 0;	120	*dst++ = uprepend;
104		121
105	Move ((void )src, (void )dst, usize, unsigned char);	122	Move ((void )src, (void )dst, usize, unsigned char);
106		123
107	SvCUR_set (ret, usize + 1);	124	SvCUR_set (ret, usize + 1);
108	}	125	}
…		…
161	usize = (usize << 6) \| (*src++ & 0x3f);	178	usize = (usize << 6) \| (*src++ & 0x3f);
162	usize = (usize << 6) \| (*src++ & 0x3f);	179	usize = (usize << 6) \| (*src++ & 0x3f);
163	usize = (usize << 6) \| (*src++ & 0x3f);	180	usize = (usize << 6) \| (*src++ & 0x3f);
164	usize = (usize << 6) \| (*src++ & 0x3f);	181	usize = (usize << 6) \| (*src++ & 0x3f);
165	}	182	}
		183	else if (!(src[0] & 0x02))
		184	{
		185	csize -= 6;
		186	usize = *src++ & 0x01;
		187	usize = (usize << 6) \| (*src++ & 0x3f);
		188	usize = (usize << 6) \| (*src++ & 0x3f);
		189	usize = (usize << 6) \| (*src++ & 0x3f);
		190	usize = (usize << 6) \| (*src++ & 0x3f);
		191	usize = (usize << 6) \| (*src++ & 0x3f);
		192	}
166	else	193	else
167	croak ("compressed data corrupted");	194	croak ("compressed data corrupted (invalid length)");
168		195
169	ret = NEWSV (0, usize);	196	ret = NEWSV (0, usize);
170	SvPOK_only (ret);	197	SvPOK_only (ret);
171	dst = SvPVX (ret);	198	dst = SvPVX (ret);
172		199
173	if (lzf_decompress (src, csize, dst, usize) != usize)	200	if (lzf_decompress (src, csize, dst, usize) != usize)
174	croak ("compressed data corrupted", csize, skip, usize);	201	croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
175	}	202	}
176	else	203	else
177	{	204	{
178	usize = csize - 1;	205	usize = csize - 1;
179	ret = NEWSV (0, usize);	206	ret = NEWSV (0, usize);
…		…
192		219
193	static void	220	static void
194	need_storable(void)	221	need_storable(void)
195	{	222	{
196	#if PATCHLEVEL < 6	223	#if PATCHLEVEL < 6
		224	char req[8192];
		225	sprintf (req, "require %s;", SvPV_nolen (serializer_package));
197	perl_eval_pv ("require Storable;", 1);	226	perl_eval_pv (req, 1);
198	#else	227	#else
199	load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv);	228	load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
200	#endif	229	#endif
201		230
202	storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV));	231	storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV));
203	storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV));	232	storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
204	}	233	}
205		234
206	MODULE = Compress::LZF PACKAGE = Compress::LZF	235	MODULE = Compress::LZF PACKAGE = Compress::LZF
		236
		237	BOOT:
		238	serializer_package = newSVpv ("Storable", 0);
		239	serializer_mstore = newSVpv ("Storable::net_mstore", 0);
		240	serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
		241
		242	void
		243	set_serializer(package, mstore, mretrieve)
		244	SV * package
		245	SV * mstore
		246	SV * mretrieve
		247	PROTOTYPE: $$$
		248	PPCODE:
		249	SvSetSV (serializer_package , package );
		250	SvSetSV (serializer_mstore , mstore );
		251	SvSetSV (serializer_mretrieve, mretrieve);
		252	storable_mstore =
		253	storable_mretrieve = 0;
207		254
208	void	255	void
209	compress(data)	256	compress(data)
210	SV * data	257	SV * data
211	PROTOTYPE: $	258	PROTOTYPE: $
212	PPCODE:	259	PPCODE:
213	XPUSHs (sv_2mortal (compress_sv (data, 0, 1)));	260	XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
214		261
215	void	262	void
216	decompress(data)	263	decompress(data)
217	SV * data	264	SV * data
218	PROTOTYPE: $	265	PROTOTYPE: $
…		…
226	sfreeze_cr = 1	273	sfreeze_cr = 1
227	sfreeze_c = 2	274	sfreeze_c = 2
228	PROTOTYPE: $	275	PROTOTYPE: $
229	PPCODE:	276	PPCODE:
230		277
		278	SvGETMAGIC (sv);
		279
231	if (!SvOK (sv))	280	if (!SvOK (sv))
232	XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */	281	XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
		282	else if (SvROK (sv)
233	else if (SvTYPE(sv) != SVt_IV	283	\|\| (SvTYPE(sv) != SVt_IV
234	&& SvTYPE(sv) != SVt_NV	284	&& SvTYPE(sv) != SVt_NV
		285	&& SvTYPE(sv) != SVt_PV
		286	&& SvTYPE(sv) != SVt_PVIV
		287	&& SvTYPE(sv) != SVt_PVNV
235	&& SvTYPE(sv) != SVt_PV) /* mstore */	288	&& SvTYPE(sv) != SVt_PVMG)) /* mstore */
236	{	289	{
237	int deref = !SvROK (sv);	290	int deref = !SvROK (sv);
238		291
239	if (!storable_mstore)	292	if (!storable_mstore)
240	need_storable ();	293	need_storable ();
…		…
251		304
252	SPAGAIN;	305	SPAGAIN;
253		306
254	sv = POPs;	307	sv = POPs;
255		308
256	if (SvPVX (sv)[0] != MAGIC_R)	309	if (SvPVX (sv)[0] == MAGIC_R)
257	croak ("Storable format changed, need newer version of Compress::LZF");
258
259	if (ix) /* compress */
260	XPUSHs (sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, 0)));
261	else
262	{	310	{
263	if (deref)	311	if (deref)
264	SvPVX (sv)[0] = MAGIC_R_deref;	312	SvPVX (sv)[0] = MAGIC_R_deref;
265
266	XPUSHs (sv);
267	}	313	}
		314	else
		315	{
		316	char pfx[2];
		317
		318	pfx[0] = MAGIC_undef;
		319	pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
		320
		321	sv_insert (sv, 0, 0, pfx, 2);
		322	}
		323
		324	if (ix) /* compress */
		325	sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
		326
		327	XPUSHs (sv);
268	}	328	}
269	else if (sv && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))	329	else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
270	XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */	330	XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
271	else if (ix == 2) /* compress always */	331	else if (ix == 2) /* compress always */
272	XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0)));	332	XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
		333	else if (SvNIOK (sv)) /* don't compress */
		334	{
		335	STRLEN len;
		336	char *s = SvPV (sv, len);
		337	XPUSHs (sv_2mortal (newSVpvn (s, len)));
		338	}
273	else /* don't compress */	339	else /* don't compress */
274	XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));	340	XPUSHs (sv_2mortal (newSVsv (sv)));
275		341
276	void	342	void
277	sthaw(sv)	343	sthaw(sv)
278	SV * sv	344	SV * sv
279	PROTOTYPE: $	345	PROTOTYPE: $
280	PPCODE:	346	PPCODE:
281		347	{
		348	STRLEN svlen;
282	int deref = 0;	349	int deref = 0;
283		350
284	SvGETMAGIC (sv);	351	SvGETMAGIC (sv);
285	if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI))	352	if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
286	{	353	{
		354	redo:
		355
287	switch (SvPVX (sv)[0])	356	switch (SvPVX (sv)[0])
288	{	357	{
289	case MAGIC_undef:	358	case MAGIC_undef:
		359	if (svlen <= 1)
290	XPUSHs (sv_2mortal (NEWSV (0, 0)));	360	XPUSHs (sv_2mortal (NEWSV (0, 0)));
		361	else
		362	{
		363	if (SvPVX (sv)[1] == MAGIC_R_deref)
		364	deref = 1;
		365	else if (SvPVX (sv)[1] != MAGIC_R)
		366	croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
		367
		368	sv_chop (sv, SvPVX (sv) + 2);
		369
		370	if (!storable_mstore)
		371	need_storable ();
		372
		373	PUSHMARK (SP);
		374	XPUSHs (sv);
		375	PUTBACK;
		376
		377	if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
		378	croak ("Storable::mstore didn't return a single scalar");
		379
		380	SPAGAIN;
		381
		382	if (deref)
		383	SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
		384	else
		385	SETs (sv_2mortal (newSVsv (TOPs)));
		386	}
291	break;	387	break;
292		388
293	case MAGIC_U:	389	case MAGIC_U:
294	XPUSHs (sv_2mortal (decompress_sv (sv, 0)));	390	XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
295	break;	391	break;
296		392
297	case MAGIC_C:	393	case MAGIC_C:
298	XPUSHs (sv_2mortal (decompress_sv (sv, 1)));	394	XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
299	break;	395	break;
		396
		397	case MAGIC_R_deref:
		398	deref = 1;
		399	SvPVX (sv)[0] = MAGIC_R;
		400	goto handle_MAGIC_R;
300		401
301	case MAGIC_CR_deref:	402	case MAGIC_CR_deref:
302	deref = 1;	403	deref = 1;
303	case MAGIC_CR:	404	case MAGIC_CR:
304	sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */	405	sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
305	case MAGIC_R_deref:	406	if (deref)
306	if (SvPVX (sv)[0] == MAGIC_R_deref)	407	if (SvPVX (sv)[0] == MAGIC_R_deref)
307	{
308	deref = 1;
309	SvPVX (sv)[0] = MAGIC_R;	408	SvPVX (sv)[0] = MAGIC_R;
310	}	409
		410	goto redo;
		411
311	case MAGIC_R:	412	case MAGIC_R:
		413	handle_MAGIC_R:
312	if (!storable_mstore)	414	if (!storable_mstore)
313	need_storable ();	415	need_storable ();
314		416
315	PUSHMARK (SP);	417	PUSHMARK (SP);
316	XPUSHs (sv);	418	XPUSHs (sv);
…		…
321		423
322	SPAGAIN;	424	SPAGAIN;
323		425
324	if (deref)	426	if (deref)
325	{	427	{
326	SV *ref = SvREFCNT_inc (SvRV (TOPs));	428	SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
327
328	SvREFCNT_dec (TOPs); /* destroy superfluous ref */
329	SETs (ref);
330		429
331	if (SvPVX (sv)[0] == MAGIC_R)	430	if (SvPVX (sv)[0] == MAGIC_R)
332	SvPVX (sv)[0] = MAGIC_R;	431	SvPVX (sv)[0] = MAGIC_R_deref;
333	}	432	}
334		433	else
335	XPUSHs (POPs); /* this is a nop, hopefully */	434	SETs (sv_2mortal (newSVsv (TOPs)));
336		435
337	break;	436	break;
338		437
339	default:	438	default:
340	croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");	439	croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
341	}	440	}
342	}	441	}
343	else	442	else
344	XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));	443	XPUSHs (sv_2mortal (newSVsv (sv)));
		444	}
		445

Diff Legend

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

Comparing Compress-LZF/LZF.xs (file contents): Revision 1.9 by root, Sun Mar 3 04:45:18 2002 UTC vs. Revision 1.20 by root, Fri Jul 7 15:47:10 2006 UTC

Diff Legend

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.9 by root, Sun Mar 3 04:45:18 2002 UTC vs.
Revision 1.20 by root, Fri Jul 7 15:47:10 2006 UTC