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

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.3 by root, Thu Sep 27 19:51:26 2001 UTC vs.
Revision 1.22 by root, Wed Sep 27 19:01:48 2006 UTC

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

Diff Legend

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

Comparing Compress-LZF/LZF.xs (file contents): Revision 1.3 by root, Thu Sep 27 19:51:26 2001 UTC vs. Revision 1.22 by root, Wed Sep 27 19:01:48 2006 UTC

Diff Legend

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.3 by root, Thu Sep 27 19:51:26 2001 UTC vs.
Revision 1.22 by root, Wed Sep 27 19:01:48 2006 UTC