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.19 by pcg, Tue Aug 3 15:07:51 2004 UTC vs.
Revision 1.20 by root, Fri Jul 7 15:47:10 2006 UTC

… …
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 */ 27#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */ 28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
29#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 */
30 31
31#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))
32 33
33static SV *serializer_package, *serializer_mstore, *serializer_mretrieve; 34static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
34static CV *storable_mstore, *storable_mretrieve; 35static CV *storable_mstore, *storable_mretrieve;
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
35 42
36static SV * 43static SV *
37compress_sv (SV *data, char cprepend, int uprepend) 44compress_sv (SV *data, char cprepend, int uprepend)
38{ 45{
39 STRLEN usize, csize; 46 STRLEN usize, csize;
… …
49 dst = (unsigned char *)SvPVX (ret); 56 dst = (unsigned char *)SvPVX (ret);
50 57
51 if (cprepend) 58 if (cprepend)
52 dst[skip++] = cprepend; 59 dst[skip++] = cprepend;
53 60
54 if (usize < 0x80) 61 if (usize <= 0x7f)
55 { 62 {
56 dst[skip++] = usize; 63 dst[skip++] = usize;
57 } 64 }
58 else if (usize < 0x800) 65 else if (usize <= 0x7ff)
59 { 66 {
60 dst[skip++] = (( usize >> 6) | 0xc0); 67 dst[skip++] = (( usize >> 6) | 0xc0);
61 dst[skip++] = (( usize & 0x3f) | 0x80); 68 dst[skip++] = (( usize & 0x3f) | 0x80);
62 } 69 }
63 else if (usize < 0x10000) 70 else if (usize <= 0xffff)
64 { 71 {
65 dst[skip++] = (( usize >> 12) | 0xe0); 72 dst[skip++] = (( usize >> 12) | 0xe0);
66 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 73 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
67 dst[skip++] = (( usize & 0x3f) | 0x80); 74 dst[skip++] = (( usize & 0x3f) | 0x80);
68 } 75 }
69 else if (usize < 0x200000) 76 else if (usize <= 0x1fffff)
70 { 77 {
71 dst[skip++] = (( usize >> 18) | 0xf0); 78 dst[skip++] = (( usize >> 18) | 0xf0);
72 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 79 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
73 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 80 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
74 dst[skip++] = (( usize & 0x3f) | 0x80); 81 dst[skip++] = (( usize & 0x3f) | 0x80);
75 } 82 }
76 else if (usize < 0x4000000) 83 else if (usize <= 0x3ffffff)
77 { 84 {
78 dst[skip++] = (( usize >> 24) | 0xf8); 85 dst[skip++] = (( usize >> 24) | 0xf8);
79 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 86 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
80 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 87 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
81 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 88 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
82 dst[skip++] = (( usize & 0x3f) | 0x80); 89 dst[skip++] = (( usize & 0x3f) | 0x80);
83 } 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 }
84 else 100 else
85 croak ("compress can only compress up to %ld bytes", 0x4000000-1); 101 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
86 102
87 /* 11 bytes is the smallest compressible string */ 103 /* 11 bytes is the smallest compressible string */
88 csize = usize < 11 ? 0 : 104 csize = usize < 11 ? 0 :
89 lzf_compress (src, usize, 105 lzf_compress (src, usize,
90 dst + skip, 106 dst + skip,
… …
157 } 173 }
158 else if (!(src[0] & 0x04)) 174 else if (!(src[0] & 0x04))
159 { 175 {
160 csize -= 5; 176 csize -= 5;
161 usize = *src++ & 0x03; 177 usize = *src++ & 0x03;
178 usize = (usize << 6) | (*src++ & 0x3f);
179 usize = (usize << 6) | (*src++ & 0x3f);
180 usize = (usize << 6) | (*src++ & 0x3f);
181 usize = (usize << 6) | (*src++ & 0x3f);
182 }
183 else if (!(src[0] & 0x02))
184 {
185 csize -= 6;
186 usize = *src++ & 0x01;
187 usize = (usize << 6) | (*src++ & 0x3f);
162 usize = (usize << 6) | (*src++ & 0x3f); 188 usize = (usize << 6) | (*src++ & 0x3f);
163 usize = (usize << 6) | (*src++ & 0x3f); 189 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 190 usize = (usize << 6) | (*src++ & 0x3f);
165 usize = (usize << 6) | (*src++ & 0x3f); 191 usize = (usize << 6) | (*src++ & 0x3f);
166 } 192 }
… …
208 234
209MODULE = Compress::LZF PACKAGE = Compress::LZF 235MODULE = Compress::LZF PACKAGE = Compress::LZF
210 236
211BOOT: 237BOOT:
212 serializer_package = newSVpv ("Storable", 0); 238 serializer_package = newSVpv ("Storable", 0);
213 serializer_mstore = newSVpv ("Storable::mstore", 0); 239 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
214 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0); 240 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
215 241
216void 242void
217set_serializer(package, mstore, mretrieve) 243set_serializer(package, mstore, mretrieve)
218 SV * package 244 SV * package
… …
278 304
279 SPAGAIN; 305 SPAGAIN;
280 306
281 sv = POPs; 307 sv = POPs;
282 308
283 if (SvPVX (sv)[0] != MAGIC_R) 309 if (SvPVX (sv)[0] == MAGIC_R)
284 croak ("Storable format changed, need newer version of Compress::LZF"); 310 {
285
286 if (deref) 311 if (deref)
287 SvPVX (sv)[0] = MAGIC_R_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 }
288 323
289 if (ix) /* compress */ 324 if (ix) /* compress */
290 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 325 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
291 326
292 XPUSHs (sv); 327 XPUSHs (sv);
… …
307void 342void
308sthaw(sv) 343sthaw(sv)
309 SV * sv 344 SV * sv
310 PROTOTYPE: $ 345 PROTOTYPE: $
311 PPCODE: 346 PPCODE:
312 347{
348 STRLEN svlen;
313 int deref = 0; 349 int deref = 0;
314 350
315 SvGETMAGIC (sv); 351 SvGETMAGIC (sv);
316 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))
317 { 353 {
354 redo:
355
318 switch (SvPVX (sv)[0]) 356 switch (SvPVX (sv)[0])
319 { 357 {
320 case MAGIC_undef: 358 case MAGIC_undef:
359 if (svlen <= 1)
321 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 }
322 break; 387 break;
323 388
324 case MAGIC_U: 389 case MAGIC_U:
325 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 390 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
326 break; 391 break;
… …
339 case MAGIC_CR: 404 case MAGIC_CR:
340 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 405 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
341 if (deref) 406 if (deref)
342 if (SvPVX (sv)[0] == MAGIC_R_deref) 407 if (SvPVX (sv)[0] == MAGIC_R_deref)
343 SvPVX (sv)[0] = MAGIC_R; 408 SvPVX (sv)[0] = MAGIC_R;
344 else 409
345 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 410 goto redo;
346 411
347 case MAGIC_R: 412 case MAGIC_R:
348 handle_MAGIC_R: 413 handle_MAGIC_R:
349 if (!storable_mstore) 414 if (!storable_mstore)
350 need_storable (); 415 need_storable ();
… …
374 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?");
375 } 440 }
376 } 441 }
377 else 442 else
378 XPUSHs (sv_2mortal (newSVsv (sv))); 443 XPUSHs (sv_2mortal (newSVsv (sv)));
444}
379 445

Diff Legend

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