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

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.8 by root, Wed Feb 27 20:51:21 2002 UTC vs.
Revision 1.20 by root, Fri Jul 7 15:47:10 2006 UTC

…		…
22	#define MAGIC_U 0 /* uncompressed data follows */	22	#define MAGIC_U 0 /* uncompressed data follows */
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 */
		28	#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
27	#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 */
28		31
29	#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))
30		33
		34	static SV serializer_package, serializer_mstore, *serializer_mretrieve;
31	static CV storable_mstore, storable_mretrieve;	35	static CV storable_mstore, storable_mretrieve;
32		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
33	static SV *	43	static SV *
34	compress_sv (SV *data, char cprepend, char uprepend)	44	compress_sv (SV *data, char cprepend, int uprepend)
35	{	45	{
36	STRLEN usize, csize;	46	STRLEN usize, csize;
37	char src = (char )SvPV (data, usize);	47	char src = (char )SvPV (data, usize);
38		48
39	if (usize)	49	if (usize)
…		…
46	dst = (unsigned char *)SvPVX (ret);	56	dst = (unsigned char *)SvPVX (ret);
47		57
48	if (cprepend)	58	if (cprepend)
49	dst[skip++] = cprepend;	59	dst[skip++] = cprepend;
50		60
51	if (usize < 0x80)	61	if (usize <= 0x7f)
52	{	62	{
53	dst[skip++] = usize;	63	dst[skip++] = usize;
54	}	64	}
55	else if (usize < 0x800)	65	else if (usize <= 0x7ff)
56	{	66	{
57	dst[skip++] = (( usize >> 6) \| 0xc0);	67	dst[skip++] = (( usize >> 6) \| 0xc0);
58	dst[skip++] = (( usize & 0x3f) \| 0x80);	68	dst[skip++] = (( usize & 0x3f) \| 0x80);
59	}	69	}
60	else if (usize < 0x10000)	70	else if (usize <= 0xffff)
61	{	71	{
62	dst[skip++] = (( usize >> 12) \| 0xe0);	72	dst[skip++] = (( usize >> 12) \| 0xe0);
63	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);	73	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);
64	dst[skip++] = (( usize & 0x3f) \| 0x80);	74	dst[skip++] = (( usize & 0x3f) \| 0x80);
65	}	75	}
66	else if (usize < 0x200000)	76	else if (usize <= 0x1fffff)
67	{	77	{
68	dst[skip++] = (( usize >> 18) \| 0xf0);	78	dst[skip++] = (( usize >> 18) \| 0xf0);
69	dst[skip++] = (((usize >> 12) & 0x3f) \| 0x80);	79	dst[skip++] = (((usize >> 12) & 0x3f) \| 0x80);
70	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);	80	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);
71	dst[skip++] = (( usize & 0x3f) \| 0x80);	81	dst[skip++] = (( usize & 0x3f) \| 0x80);
72	}	82	}
73	else if (usize < 0x4000000)	83	else if (usize <= 0x3ffffff)
74	{	84	{
75	dst[skip++] = (( usize >> 24) \| 0xf8);	85	dst[skip++] = (( usize >> 24) \| 0xf8);
76	dst[skip++] = (((usize >> 18) & 0x3f) \| 0x80);	86	dst[skip++] = (((usize >> 18) & 0x3f) \| 0x80);
77	dst[skip++] = (((usize >> 12) & 0x3f) \| 0x80);	87	dst[skip++] = (((usize >> 12) & 0x3f) \| 0x80);
78	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);	88	dst[skip++] = (((usize >> 6) & 0x3f) \| 0x80);
79	dst[skip++] = (( usize & 0x3f) \| 0x80);	89	dst[skip++] = (( usize & 0x3f) \| 0x80);
80	}	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	}
81	else	100	else
82	croak ("compress can only compress up to %ld bytes", 0x4000000-1);	101	croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
83		102
84	/* 11 bytes is the smallest compressible string */	103	/* 11 bytes is the smallest compressible string */
85	csize = usize < 11 ? 0 :	104	csize = usize < 11 ? 0 :
86	lzf_compress (src, usize,	105	lzf_compress (src, usize,
87	dst + skip,	106	dst + skip,
…		…
89		108
90	if (csize)	109	if (csize)
91	{	110	{
92	SvCUR_set (ret, csize + skip);	111	SvCUR_set (ret, csize + skip);
93	}	112	}
94	else if (!uprepend)	113	else if (uprepend < 0)
95	{	114	{
96	SvREFCNT_dec (ret);	115	SvREFCNT_dec (ret);
97	ret = SvREFCNT_inc (data);	116	ret = SvREFCNT_inc (data);
98	}	117	}
99	else	118	else
100	{	119	{
101	*dst++ = 0;	120	*dst++ = uprepend;
102		121
103	Move ((void )src, (void )dst, usize, unsigned char);	122	Move ((void )src, (void )dst, usize, unsigned char);
104		123
105	SvCUR_set (ret, usize + 1);	124	SvCUR_set (ret, usize + 1);
106	}	125	}
…		…
159	usize = (usize << 6) \| (*src++ & 0x3f);	178	usize = (usize << 6) \| (*src++ & 0x3f);
160	usize = (usize << 6) \| (*src++ & 0x3f);	179	usize = (usize << 6) \| (*src++ & 0x3f);
161	usize = (usize << 6) \| (*src++ & 0x3f);	180	usize = (usize << 6) \| (*src++ & 0x3f);
162	usize = (usize << 6) \| (*src++ & 0x3f);	181	usize = (usize << 6) \| (*src++ & 0x3f);
163	}	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	}
164	else	193	else
165	croak ("compressed data corrupted");	194	croak ("compressed data corrupted (invalid length)");
166		195
167	ret = NEWSV (0, usize);	196	ret = NEWSV (0, usize);
168	SvPOK_only (ret);	197	SvPOK_only (ret);
169	dst = SvPVX (ret);	198	dst = SvPVX (ret);
170		199
171	if (lzf_decompress (src, csize, dst, usize) != usize)	200	if (lzf_decompress (src, csize, dst, usize) != usize)
172	croak ("compressed data corrupted", csize, skip, usize);	201	croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
173	}	202	}
174	else	203	else
175	{	204	{
176	usize = csize - 1;	205	usize = csize - 1;
177	ret = NEWSV (0, usize);	206	ret = NEWSV (0, usize);
…		…
190		219
191	static void	220	static void
192	need_storable(void)	221	need_storable(void)
193	{	222	{
194	#if PATCHLEVEL < 6	223	#if PATCHLEVEL < 6
		224	char req[8192];
		225	sprintf (req, "require %s;", SvPV_nolen (serializer_package));
195	perl_eval_pv ("require Storable;", 1);	226	perl_eval_pv (req, 1);
196	#else	227	#else
197	load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv);	228	load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
198	#endif	229	#endif
199		230
200	storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV));	231	storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV));
201	storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV));	232	storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
202	}	233	}
203		234
204	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;
205		254
206	void	255	void
207	compress(data)	256	compress(data)
208	SV * data	257	SV * data
209	PROTOTYPE: $	258	PROTOTYPE: $
210	PPCODE:	259	PPCODE:
211	XPUSHs (sv_2mortal (compress_sv (data, 0, 1)));	260	XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
212		261
213	void	262	void
214	decompress(data)	263	decompress(data)
215	SV * data	264	SV * data
216	PROTOTYPE: $	265	PROTOTYPE: $
…		…
224	sfreeze_cr = 1	273	sfreeze_cr = 1
225	sfreeze_c = 2	274	sfreeze_c = 2
226	PROTOTYPE: $	275	PROTOTYPE: $
227	PPCODE:	276	PPCODE:
228		277
		278	SvGETMAGIC (sv);
		279
229	if (!SvOK (sv))	280	if (!SvOK (sv))
230	XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */	281	XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
		282	else if (SvROK (sv)
231	else if (SvTYPE(sv) != SVt_IV	283	\|\| (SvTYPE(sv) != SVt_IV
232	&& SvTYPE(sv) != SVt_NV	284	&& SvTYPE(sv) != SVt_NV
233	&& SvTYPE(sv) != SVt_PV	285	&& SvTYPE(sv) != SVt_PV
		286	&& SvTYPE(sv) != SVt_PVIV
		287	&& SvTYPE(sv) != SVt_PVNV
234	&& SvTYPE(sv) != SVt_PVMG) /* mstore */	288	&& SvTYPE(sv) != SVt_PVMG)) /* mstore */
235	{	289	{
		290	int deref = !SvROK (sv);
		291
236	if (!storable_mstore)	292	if (!storable_mstore)
237	need_storable ();	293	need_storable ();
		294
		295	if (deref)
		296	sv = newRV_noinc (sv);
238		297
239	PUSHMARK (SP);	298	PUSHMARK (SP);
240	XPUSHs (sv);	299	XPUSHs (sv);
241	PUTBACK;	300	PUTBACK;
242		301
…		…
245		304
246	SPAGAIN;	305	SPAGAIN;
247		306
248	sv = POPs;	307	sv = POPs;
249		308
250	if (SvPVX (sv)[0] != MAGIC_R)	309	if (SvPVX (sv)[0] == MAGIC_R)
251	croak ("Storable format changed, need newer version of Compress::LZF");	310	{
		311	if (deref)
		312	SvPVX (sv)[0] = MAGIC_R_deref;
		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	}
252		323
253	if (ix) /* compress */	324	if (ix) /* compress */
254	XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0)));	325	sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
255	else	326
256	XPUSHs (sv);	327	XPUSHs (sv);
257	}	328	}
258	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))
259	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 */
260	else if (ix == 2) /* compress always */	331	else if (ix == 2) /* compress always */
261	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	}
262	else /* don't compress */	339	else /* don't compress */
263	XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));	340	XPUSHs (sv_2mortal (newSVsv (sv)));
264		341
265	void	342	void
266	sthaw(sv)	343	sthaw(sv)
267	SV * sv	344	SV * sv
268	PROTOTYPE: $	345	PROTOTYPE: $
269	PPCODE:	346	PPCODE:
		347	{
		348	STRLEN svlen;
		349	int deref = 0;
270		350
271	SvGETMAGIC (sv);	351	SvGETMAGIC (sv);
272	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))
273	{	353	{
		354	redo:
		355
274	switch (SvPVX (sv)[0])	356	switch (SvPVX (sv)[0])
275	{	357	{
276	case MAGIC_undef:	358	case MAGIC_undef:
		359	if (svlen <= 1)
277	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	}
278	break;	387	break;
279		388
280	case MAGIC_U:	389	case MAGIC_U:
281	XPUSHs (sv_2mortal (decompress_sv (sv, 0)));	390	XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
282	break;	391	break;
283		392
284	case MAGIC_C:	393	case MAGIC_C:
285	XPUSHs (sv_2mortal (decompress_sv (sv, 1)));	394	XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
286	break;	395	break;
287		396
		397	case MAGIC_R_deref:
		398	deref = 1;
		399	SvPVX (sv)[0] = MAGIC_R;
		400	goto handle_MAGIC_R;
		401
		402	case MAGIC_CR_deref:
		403	deref = 1;
288	case MAGIC_CR:	404	case MAGIC_CR:
289	sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */	405	sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
		406	if (deref)
		407	if (SvPVX (sv)[0] == MAGIC_R_deref)
		408	SvPVX (sv)[0] = MAGIC_R;
		409
		410	goto redo;
		411
290	case MAGIC_R:	412	case MAGIC_R:
		413	handle_MAGIC_R:
291	if (!storable_mstore)	414	if (!storable_mstore)
292	need_storable ();	415	need_storable ();
293		416
294	PUSHMARK (SP);	417	PUSHMARK (SP);
295	XPUSHs (sv);	418	XPUSHs (sv);
…		…
298	if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))	421	if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
299	croak ("Storable::mstore didn't return a single scalar");	422	croak ("Storable::mstore didn't return a single scalar");
300		423
301	SPAGAIN;	424	SPAGAIN;
302		425
303	/XPUSHs (POPs); this is a nop, hopefully /	426	if (deref)
		427	{
		428	SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
		429
		430	if (SvPVX (sv)[0] == MAGIC_R)
		431	SvPVX (sv)[0] = MAGIC_R_deref;
		432	}
		433	else
		434	SETs (sv_2mortal (newSVsv (TOPs)));
304		435
305	break;	436	break;
306		437
307	default:	438	default:
308	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?");
309	}	440	}
310	}	441	}
311	else	442	else
312	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.8 by root, Wed Feb 27 20:51:21 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.8 by root, Wed Feb 27 20:51:21 2002 UTC vs.
Revision 1.20 by root, Fri Jul 7 15:47:10 2006 UTC