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

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.2 by root, Thu Sep 27 19:24:55 2001 UTC vs.
Revision 1.20 by root, Fri Jul 7 15:47:10 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	}
…		…
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))
		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)");
165		195
166	ret = NEWSV (0, usize);	196	ret = NEWSV (0, usize);
167	SvPOK_only (ret);	197	SvPOK_only (ret);
168	dst = SvPVX (ret);	198	dst = SvPVX (ret);
169		199
170	if (lzf_decompress (src, csize, dst, usize) != usize)	200	if (lzf_decompress (src, csize, dst, usize) != usize)
171	croak ("compressed data corrupted", csize, skip, usize);	201	croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
172	}	202	}
173	else	203	else
174	{	204	{
175	usize = csize - 1;	205	usize = csize - 1;
176	ret = NEWSV (0, usize);	206	ret = NEWSV (0, usize);
…		…
189		219
190	static void	220	static void
191	need_storable(void)	221	need_storable(void)
192	{	222	{
193	#if PATCHLEVEL < 6	223	#if PATCHLEVEL < 6
		224	char req[8192];
		225	sprintf (req, "require %s;", SvPV_nolen (serializer_package));
194	perl_eval_pv ("require Storable;", 1);	226	perl_eval_pv (req, 1);
195	#else	227	#else
196	load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv);	228	load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
197	#endif	229	#endif
198		230
199	storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV));	231	storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV));
200	storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV));	232	storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
201	}	233	}
202		234
203	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;
204		254
205	void	255	void
206	compress(data)	256	compress(data)
207	SV * data	257	SV * data
208	PROTOTYPE: $	258	PROTOTYPE: $
209	PPCODE:	259	PPCODE:
210	XPUSHs (sv_2mortal (compress_sv (data, 0, 1)));	260	XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
211		261
212	void	262	void
213	decompress(data)	263	decompress(data)
214	SV * data	264	SV * data
215	PROTOTYPE: $	265	PROTOTYPE: $
…		…
223	sfreeze_cr = 1	273	sfreeze_cr = 1
224	sfreeze_c = 2	274	sfreeze_c = 2
225	PROTOTYPE: $	275	PROTOTYPE: $
226	PPCODE:	276	PPCODE:
227		277
228	if (SvROK (sv)) /* mstore */	278	SvGETMAGIC (sv);
		279
		280	if (!SvOK (sv))
		281	XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
		282	else if (SvROK (sv)
		283	\|\| (SvTYPE(sv) != SVt_IV
		284	&& SvTYPE(sv) != SVt_NV
		285	&& SvTYPE(sv) != SVt_PV
		286	&& SvTYPE(sv) != SVt_PVIV
		287	&& SvTYPE(sv) != SVt_PVNV
		288	&& SvTYPE(sv) != SVt_PVMG)) /* mstore */
229	{	289	{
		290	int deref = !SvROK (sv);
		291
230	if (!storable_mstore)	292	if (!storable_mstore)
231	need_storable ();	293	need_storable ();
		294
		295	if (deref)
		296	sv = newRV_noinc (sv);
232		297
233	PUSHMARK (SP);	298	PUSHMARK (SP);
234	XPUSHs (sv);	299	XPUSHs (sv);
235	PUTBACK;	300	PUTBACK;
236		301
…		…
239		304
240	SPAGAIN;	305	SPAGAIN;
241		306
242	sv = POPs;	307	sv = POPs;
243		308
244	if (SvPVX (sv)[0] != MAGIC_R)	309	if (SvPVX (sv)[0] == MAGIC_R)
245	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	}
246		323
247	if (ix) /* compress */	324	if (ix) /* compress */
248	XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0)));	325	sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
249	else	326
250	XPUSHs (sv);	327	XPUSHs (sv);
251	}	328	}
252	else if (IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))	329	else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
253	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 */
254	else if (ix == 2) /* compress always */	331	else if (ix == 2) /* compress always */
255	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	}
256	else /* don't compress */	339	else /* don't compress */
257	XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));	340	XPUSHs (sv_2mortal (newSVsv (sv)));
258		341
259	void	342	void
260	sthaw(sv)	343	sthaw(sv)
261	SV * sv	344	SV * sv
262	PROTOTYPE: $	345	PROTOTYPE: $
263	PPCODE:	346	PPCODE:
264	char hdr = SvPVX (sv)[0];	347	{
		348	STRLEN svlen;
		349	int deref = 0;
265		350
266	if (IN_RANGE (hdr, MAGIC_LO, MAGIC_HI))	351	SvGETMAGIC (sv);
		352	if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
267	{	353	{
		354	redo:
		355
268	switch (SvPVX (sv)[0])	356	switch (SvPVX (sv)[0])
269	{	357	{
		358	case MAGIC_undef:
		359	if (svlen <= 1)
		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	}
		387	break;
		388
270	case MAGIC_U:	389	case MAGIC_U:
271	XPUSHs (sv_2mortal (decompress_sv (sv, 0)));	390	XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
272	break;	391	break;
273		392
274	case MAGIC_C:	393	case MAGIC_C:
275	XPUSHs (sv_2mortal (decompress_sv (sv, 1)));	394	XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
276	break;	395	break;
277		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;
278	case MAGIC_CR:	404	case MAGIC_CR:
279	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
280	case MAGIC_R:	412	case MAGIC_R:
		413	handle_MAGIC_R:
281	if (!storable_mstore)	414	if (!storable_mstore)
282	need_storable ();	415	need_storable ();
283		416
284	PUSHMARK (SP);	417	PUSHMARK (SP);
285	XPUSHs (sv);	418	XPUSHs (sv);
…		…
288	if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))	421	if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
289	croak ("Storable::mstore didn't return a single scalar");	422	croak ("Storable::mstore didn't return a single scalar");
290		423
291	SPAGAIN;	424	SPAGAIN;
292		425
293	/XPUSHs (POPs);/	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)));
294		435
295	break;	436	break;
296		437
297	default:	438	default:
298	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?");
299	}	440	}
300	}	441	}
301	else	442	else
302	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.2 by root, Thu Sep 27 19:24:55 2001 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.2 by root, Thu Sep 27 19:24:55 2001 UTC vs.
Revision 1.20 by root, Fri Jul 7 15:47:10 2006 UTC