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

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.4 by root, Thu Sep 27 20:05:38 2001 UTC vs.
Revision 1.23 by root, Fri Feb 16 22:11:17 2007 UTC

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

Diff Legend

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

Comparing Compress-LZF/LZF.xs (file contents): Revision 1.4 by root, Thu Sep 27 20:05:38 2001 UTC vs. Revision 1.23 by root, Fri Feb 16 22:11:17 2007 UTC

Diff Legend

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.4 by root, Thu Sep 27 20:05:38 2001 UTC vs.
Revision 1.23 by root, Fri Feb 16 22:11:17 2007 UTC