ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Compress-LZF/LZF.xs
(Generate patch)

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.10 by root, Tue Mar 26 17:49:24 2002 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
… …
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) */
27#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */ 30#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */ 31#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
29#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 */
30 34
31#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))
32 36
37static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
33static CV *storable_mstore, *storable_mretrieve; 38static CV *storable_mstore, *storable_mretrieve;
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
34 45
35static SV * 46static SV *
36compress_sv (SV *data, char cprepend, int uprepend) 47compress_sv (SV *data, char cprepend, int uprepend)
37{ 48{
49 LZF_STATE *state;
38 STRLEN usize, csize; 50 STRLEN usize, csize;
39 char *src = (char *)SvPV (data, usize); 51 char *src = (char *)SvPV (data, usize);
40 52
41 if (usize) 53 if (usize)
42 { 54 {
… …
48 dst = (unsigned char *)SvPVX (ret); 60 dst = (unsigned char *)SvPVX (ret);
49 61
50 if (cprepend) 62 if (cprepend)
51 dst[skip++] = cprepend; 63 dst[skip++] = cprepend;
52 64
53 if (usize < 0x80) 65 if (usize <= 0x7f)
54 { 66 {
55 dst[skip++] = usize; 67 dst[skip++] = usize;
56 } 68 }
57 else if (usize < 0x800) 69 else if (usize <= 0x7ff)
58 { 70 {
59 dst[skip++] = (( usize >> 6) | 0xc0); 71 dst[skip++] = (( usize >> 6) | 0xc0);
60 dst[skip++] = (( usize & 0x3f) | 0x80); 72 dst[skip++] = (( usize & 0x3f) | 0x80);
61 } 73 }
62 else if (usize < 0x10000) 74 else if (usize <= 0xffff)
63 { 75 {
64 dst[skip++] = (( usize >> 12) | 0xe0); 76 dst[skip++] = (( usize >> 12) | 0xe0);
65 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 77 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
66 dst[skip++] = (( usize & 0x3f) | 0x80); 78 dst[skip++] = (( usize & 0x3f) | 0x80);
67 } 79 }
68 else if (usize < 0x200000) 80 else if (usize <= 0x1fffff)
69 { 81 {
70 dst[skip++] = (( usize >> 18) | 0xf0); 82 dst[skip++] = (( usize >> 18) | 0xf0);
71 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 83 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
72 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 84 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
73 dst[skip++] = (( usize & 0x3f) | 0x80); 85 dst[skip++] = (( usize & 0x3f) | 0x80);
74 } 86 }
75 else if (usize < 0x4000000) 87 else if (usize <= 0x3ffffff)
76 { 88 {
77 dst[skip++] = (( usize >> 24) | 0xf8); 89 dst[skip++] = (( usize >> 24) | 0xf8);
78 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 90 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
79 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 91 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
80 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 92 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
81 dst[skip++] = (( usize & 0x3f) | 0x80); 93 dst[skip++] = (( usize & 0x3f) | 0x80);
82 } 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 }
83 else 104 else
84 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");
85 110
86 /* 11 bytes is the smallest compressible string */ 111 /* 11 bytes is the smallest compressible string */
87 csize = usize < 11 ? 0 : 112 csize = usize < 11 ? 0 :
88 lzf_compress (src, usize, 113 lzf_compress (src, usize, dst + skip, usize - skip, *state);
89 dst + skip, 114
90 usize - skip); 115 Safefree (state);
91 116
92 if (csize) 117 if (csize)
93 { 118 {
94 SvCUR_set (ret, csize + skip); 119 SvCUR_set (ret, csize + skip);
95 } 120 }
… …
126 151
127 csize -= skip; 152 csize -= skip;
128 153
129 if (src[0]) 154 if (src[0])
130 { 155 {
131 if (!(src[0] & 0x80)) 156 if (!(src[0] & 0x80) && csize >= 1)
132 { 157 {
133 csize -= 1; 158 csize -= 1;
134 usize = *src++ & 0xff; 159 usize = *src++ & 0xff;
135 } 160 }
136 else if (!(src[0] & 0x20)) 161 else if (!(src[0] & 0x20) && csize >= 2)
137 { 162 {
138 csize -= 2; 163 csize -= 2;
139 usize = *src++ & 0x1f; 164 usize = *src++ & 0x1f;
140 usize = (usize << 6) | (*src++ & 0x3f); 165 usize = (usize << 6) | (*src++ & 0x3f);
141 } 166 }
142 else if (!(src[0] & 0x10)) 167 else if (!(src[0] & 0x10) && csize >= 3)
143 { 168 {
144 csize -= 3; 169 csize -= 3;
145 usize = *src++ & 0x0f; 170 usize = *src++ & 0x0f;
146 usize = (usize << 6) | (*src++ & 0x3f); 171 usize = (usize << 6) | (*src++ & 0x3f);
147 usize = (usize << 6) | (*src++ & 0x3f); 172 usize = (usize << 6) | (*src++ & 0x3f);
148 } 173 }
149 else if (!(src[0] & 0x08)) 174 else if (!(src[0] & 0x08) && csize >= 4)
150 { 175 {
151 csize -= 4; 176 csize -= 4;
152 usize = *src++ & 0x07; 177 usize = *src++ & 0x07;
153 usize = (usize << 6) | (*src++ & 0x3f); 178 usize = (usize << 6) | (*src++ & 0x3f);
154 usize = (usize << 6) | (*src++ & 0x3f); 179 usize = (usize << 6) | (*src++ & 0x3f);
155 usize = (usize << 6) | (*src++ & 0x3f); 180 usize = (usize << 6) | (*src++ & 0x3f);
156 } 181 }
157 else if (!(src[0] & 0x04)) 182 else if (!(src[0] & 0x04) && csize >= 5)
158 { 183 {
159 csize -= 5; 184 csize -= 5;
160 usize = *src++ & 0x03; 185 usize = *src++ & 0x03;
161 usize = (usize << 6) | (*src++ & 0x3f); 186 usize = (usize << 6) | (*src++ & 0x3f);
162 usize = (usize << 6) | (*src++ & 0x3f); 187 usize = (usize << 6) | (*src++ & 0x3f);
163 usize = (usize << 6) | (*src++ & 0x3f); 188 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 189 usize = (usize << 6) | (*src++ & 0x3f);
165 } 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 }
166 else 201 else
167 croak ("compressed data corrupted"); 202 croak ("compressed data corrupted (invalid length)");
203
204 if (!usize)
205 croak ("compressed data corrupted (invalid length)");
168 206
169 ret = NEWSV (0, usize); 207 ret = NEWSV (0, usize);
170 SvPOK_only (ret); 208 SvPOK_only (ret);
171 dst = SvPVX (ret); 209 dst = SvPVX (ret);
172 210
173 if (lzf_decompress (src, csize, dst, usize) != usize) 211 if (lzf_decompress (src, csize, dst, usize) != usize)
212 {
213 SvREFCNT_dec (ret);
174 croak ("compressed data corrupted", csize, skip, usize); 214 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
215 }
175 } 216 }
176 else 217 else
177 { 218 {
178 usize = csize - 1; 219 usize = csize - 1;
179 ret = NEWSV (0, usize); 220 ret = NEWSV (0, usize | 1);
180 SvPOK_only (ret); 221 SvPOK_only (ret);
181 222
182 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 223 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
183 } 224 }
184 225
… …
192 233
193static void 234static void
194need_storable(void) 235need_storable(void)
195{ 236{
196#if PATCHLEVEL < 6 237#if PATCHLEVEL < 6
238 char req[8192];
239 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
197 perl_eval_pv ("require Storable;", 1); 240 perl_eval_pv (req, 1);
198#else 241#else
199 load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv); 242 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
200#endif 243#endif
201 244
202 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV)); 245 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV));
203 storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV)); 246 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
204} 247}
205 248
206MODULE = Compress::LZF PACKAGE = Compress::LZF 249MODULE = Compress::LZF PACKAGE = Compress::LZF
250
251BOOT:
252 serializer_package = newSVpv ("Storable", 0);
253 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
254 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
255
256void
257set_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;
207 268
208void 269void
209compress(data) 270compress(data)
210 SV * data 271 SV * data
211 PROTOTYPE: $ 272 PROTOTYPE: $
… …
230 291
231 SvGETMAGIC (sv); 292 SvGETMAGIC (sv);
232 293
233 if (!SvOK (sv)) 294 if (!SvOK (sv))
234 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 295 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
296 else if (SvROK (sv)
235 else if (SvTYPE(sv) != SVt_IV 297 || (SvTYPE(sv) != SVt_IV
236 && SvTYPE(sv) != SVt_NV 298 && SvTYPE(sv) != SVt_NV
237 && SvTYPE(sv) != SVt_PV 299 && SvTYPE(sv) != SVt_PV
300 && SvTYPE(sv) != SVt_PVIV
301 && SvTYPE(sv) != SVt_PVNV
238 && SvTYPE(sv) != SVt_PVMG+99999) /* mstore */ 302 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
239 { 303 {
240 int deref = !SvROK (sv); 304 int deref = !SvROK (sv);
241 305
242 if (!storable_mstore) 306 if (!storable_mstore)
243 need_storable (); 307 need_storable ();
… …
254 318
255 SPAGAIN; 319 SPAGAIN;
256 320
257 sv = POPs; 321 sv = POPs;
258 322
259 if (SvPVX (sv)[0] != MAGIC_R) 323 if (SvPVX (sv)[0] == MAGIC_R)
260 croak ("Storable format changed, need newer version of Compress::LZF"); 324 {
261
262 if (deref) 325 if (deref)
263 SvPVX (sv)[0] = MAGIC_R_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 }
264 337
265 if (ix) /* compress */ 338 if (ix) /* compress */
266 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 339 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
267 340
268 XPUSHs (sv); 341 XPUSHs (sv);
269 } 342 }
270 else if (SvTYPE (sv) == SVt_PV && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 343 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
271 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */ 344 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
272 else if (ix == 2) /* compress always */ 345 else if (ix == 2) /* compress always */
273 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1))); 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 }
274 else /* don't compress */ 353 else /* don't compress */
275 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 354 XPUSHs (sv_2mortal (newSVsv (sv)));
276 355
277void 356void
278sthaw(sv) 357sthaw(sv)
279 SV * sv 358 SV * sv
280 PROTOTYPE: $ 359 PROTOTYPE: $
281 PPCODE: 360 PPCODE:
282 361{
362 STRLEN svlen;
283 int deref = 0; 363 int deref = 0;
284 364
285 SvGETMAGIC (sv); 365 SvGETMAGIC (sv);
286 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI)) 366 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
287 { 367 {
368 redo:
369
288 switch (SvPVX (sv)[0]) 370 switch (SvPVX (sv)[0])
289 { 371 {
290 case MAGIC_undef: 372 case MAGIC_undef:
373 if (svlen <= 1)
291 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 }
292 break; 401 break;
293 402
294 case MAGIC_U: 403 case MAGIC_U:
295 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 404 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
296 break; 405 break;
… …
309 case MAGIC_CR: 418 case MAGIC_CR:
310 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 419 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
311 if (deref) 420 if (deref)
312 if (SvPVX (sv)[0] == MAGIC_R_deref) 421 if (SvPVX (sv)[0] == MAGIC_R_deref)
313 SvPVX (sv)[0] = MAGIC_R; 422 SvPVX (sv)[0] = MAGIC_R;
314 else 423
315 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 424 goto redo;
316 425
317 case MAGIC_R: 426 case MAGIC_R:
318 handle_MAGIC_R: 427 handle_MAGIC_R:
319 if (!storable_mstore) 428 if (!storable_mstore)
320 need_storable (); 429 need_storable ();
… …
334 443
335 if (SvPVX (sv)[0] == MAGIC_R) 444 if (SvPVX (sv)[0] == MAGIC_R)
336 SvPVX (sv)[0] = MAGIC_R_deref; 445 SvPVX (sv)[0] = MAGIC_R_deref;
337 } 446 }
338 else 447 else
339 XPUSHs (POPs); /* this is a nop, hopefully */ 448 SETs (sv_2mortal (newSVsv (TOPs)));
340 449
341 break; 450 break;
342 451
343 default: 452 default:
344 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?");
345 } 454 }
346 } 455 }
347 else 456 else
348 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 457 XPUSHs (sv_2mortal (newSVsv (sv)));
458}
459

Diff Legend

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