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.22 by root, Wed Sep 27 19:01:48 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
34static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
33static 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
34 42
35static SV * 43static SV *
36compress_sv (SV *data, char cprepend, int uprepend) 44compress_sv (SV *data, char cprepend, int uprepend)
37{ 45{
38 STRLEN usize, csize; 46 STRLEN usize, csize;
… …
48 dst = (unsigned char *)SvPVX (ret); 56 dst = (unsigned char *)SvPVX (ret);
49 57
50 if (cprepend) 58 if (cprepend)
51 dst[skip++] = cprepend; 59 dst[skip++] = cprepend;
52 60
53 if (usize < 0x80) 61 if (usize <= 0x7f)
54 { 62 {
55 dst[skip++] = usize; 63 dst[skip++] = usize;
56 } 64 }
57 else if (usize < 0x800) 65 else if (usize <= 0x7ff)
58 { 66 {
59 dst[skip++] = (( usize >> 6) | 0xc0); 67 dst[skip++] = (( usize >> 6) | 0xc0);
60 dst[skip++] = (( usize & 0x3f) | 0x80); 68 dst[skip++] = (( usize & 0x3f) | 0x80);
61 } 69 }
62 else if (usize < 0x10000) 70 else if (usize <= 0xffff)
63 { 71 {
64 dst[skip++] = (( usize >> 12) | 0xe0); 72 dst[skip++] = (( usize >> 12) | 0xe0);
65 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 73 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
66 dst[skip++] = (( usize & 0x3f) | 0x80); 74 dst[skip++] = (( usize & 0x3f) | 0x80);
67 } 75 }
68 else if (usize < 0x200000) 76 else if (usize <= 0x1fffff)
69 { 77 {
70 dst[skip++] = (( usize >> 18) | 0xf0); 78 dst[skip++] = (( usize >> 18) | 0xf0);
71 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 79 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
72 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 80 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
73 dst[skip++] = (( usize & 0x3f) | 0x80); 81 dst[skip++] = (( usize & 0x3f) | 0x80);
74 } 82 }
75 else if (usize < 0x4000000) 83 else if (usize <= 0x3ffffff)
76 { 84 {
77 dst[skip++] = (( usize >> 24) | 0xf8); 85 dst[skip++] = (( usize >> 24) | 0xf8);
78 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 86 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
79 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 87 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
80 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 88 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
81 dst[skip++] = (( usize & 0x3f) | 0x80); 89 dst[skip++] = (( usize & 0x3f) | 0x80);
82 } 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 }
83 else 100 else
84 croak ("compress can only compress up to %ld bytes", 0x4000000-1); 101 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
85 102
86 /* 11 bytes is the smallest compressible string */ 103 /* 11 bytes is the smallest compressible string */
87 csize = usize < 11 ? 0 : 104 csize = usize < 11 ? 0 :
88 lzf_compress (src, usize, 105 lzf_compress (src, usize,
89 dst + skip, 106 dst + skip,
… …
126 143
127 csize -= skip; 144 csize -= skip;
128 145
129 if (src[0]) 146 if (src[0])
130 { 147 {
131 if (!(src[0] & 0x80)) 148 if (!(src[0] & 0x80) && csize >= 1)
132 { 149 {
133 csize -= 1; 150 csize -= 1;
134 usize = *src++ & 0xff; 151 usize = *src++ & 0xff;
135 } 152 }
136 else if (!(src[0] & 0x20)) 153 else if (!(src[0] & 0x20) && csize >= 2)
137 { 154 {
138 csize -= 2; 155 csize -= 2;
139 usize = *src++ & 0x1f; 156 usize = *src++ & 0x1f;
140 usize = (usize << 6) | (*src++ & 0x3f); 157 usize = (usize << 6) | (*src++ & 0x3f);
141 } 158 }
142 else if (!(src[0] & 0x10)) 159 else if (!(src[0] & 0x10) && csize >= 3)
143 { 160 {
144 csize -= 3; 161 csize -= 3;
145 usize = *src++ & 0x0f; 162 usize = *src++ & 0x0f;
146 usize = (usize << 6) | (*src++ & 0x3f); 163 usize = (usize << 6) | (*src++ & 0x3f);
147 usize = (usize << 6) | (*src++ & 0x3f); 164 usize = (usize << 6) | (*src++ & 0x3f);
148 } 165 }
149 else if (!(src[0] & 0x08)) 166 else if (!(src[0] & 0x08) && csize >= 4)
150 { 167 {
151 csize -= 4; 168 csize -= 4;
152 usize = *src++ & 0x07; 169 usize = *src++ & 0x07;
153 usize = (usize << 6) | (*src++ & 0x3f); 170 usize = (usize << 6) | (*src++ & 0x3f);
154 usize = (usize << 6) | (*src++ & 0x3f); 171 usize = (usize << 6) | (*src++ & 0x3f);
155 usize = (usize << 6) | (*src++ & 0x3f); 172 usize = (usize << 6) | (*src++ & 0x3f);
156 } 173 }
157 else if (!(src[0] & 0x04)) 174 else if (!(src[0] & 0x04) && csize >= 5)
158 { 175 {
159 csize -= 5; 176 csize -= 5;
160 usize = *src++ & 0x03; 177 usize = *src++ & 0x03;
161 usize = (usize << 6) | (*src++ & 0x3f); 178 usize = (usize << 6) | (*src++ & 0x3f);
162 usize = (usize << 6) | (*src++ & 0x3f); 179 usize = (usize << 6) | (*src++ & 0x3f);
163 usize = (usize << 6) | (*src++ & 0x3f); 180 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 181 usize = (usize << 6) | (*src++ & 0x3f);
165 } 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 }
166 else 193 else
167 croak ("compressed data corrupted"); 194 croak ("compressed data corrupted (invalid length)");
195
196 if (!usize)
197 croak ("compressed data corrupted (invalid length)");
168 198
169 ret = NEWSV (0, usize); 199 ret = NEWSV (0, usize);
170 SvPOK_only (ret); 200 SvPOK_only (ret);
171 dst = SvPVX (ret); 201 dst = SvPVX (ret);
172 202
173 if (lzf_decompress (src, csize, dst, usize) != usize) 203 if (lzf_decompress (src, csize, dst, usize) != usize)
204 {
205 SvREFCNT_dec (ret);
174 croak ("compressed data corrupted", csize, skip, usize); 206 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
207 }
175 } 208 }
176 else 209 else
177 { 210 {
178 usize = csize - 1; 211 usize = csize - 1;
179 ret = NEWSV (0, usize); 212 ret = NEWSV (0, usize | 1);
180 SvPOK_only (ret); 213 SvPOK_only (ret);
181 214
182 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 215 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
183 } 216 }
184 217
… …
192 225
193static void 226static void
194need_storable(void) 227need_storable(void)
195{ 228{
196#if PATCHLEVEL < 6 229#if PATCHLEVEL < 6
230 char req[8192];
231 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
197 perl_eval_pv ("require Storable;", 1); 232 perl_eval_pv (req, 1);
198#else 233#else
199 load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv); 234 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
200#endif 235#endif
201 236
202 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV)); 237 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV));
203 storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV)); 238 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
204} 239}
205 240
206MODULE = Compress::LZF PACKAGE = Compress::LZF 241MODULE = Compress::LZF PACKAGE = Compress::LZF
242
243BOOT:
244 serializer_package = newSVpv ("Storable", 0);
245 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
246 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
247
248void
249set_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;
207 260
208void 261void
209compress(data) 262compress(data)
210 SV * data 263 SV * data
211 PROTOTYPE: $ 264 PROTOTYPE: $
… …
230 283
231 SvGETMAGIC (sv); 284 SvGETMAGIC (sv);
232 285
233 if (!SvOK (sv)) 286 if (!SvOK (sv))
234 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 287 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
288 else if (SvROK (sv)
235 else if (SvTYPE(sv) != SVt_IV 289 || (SvTYPE(sv) != SVt_IV
236 && SvTYPE(sv) != SVt_NV 290 && SvTYPE(sv) != SVt_NV
237 && SvTYPE(sv) != SVt_PV 291 && SvTYPE(sv) != SVt_PV
292 && SvTYPE(sv) != SVt_PVIV
293 && SvTYPE(sv) != SVt_PVNV
238 && SvTYPE(sv) != SVt_PVMG+99999) /* mstore */ 294 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
239 { 295 {
240 int deref = !SvROK (sv); 296 int deref = !SvROK (sv);
241 297
242 if (!storable_mstore) 298 if (!storable_mstore)
243 need_storable (); 299 need_storable ();
… …
254 310
255 SPAGAIN; 311 SPAGAIN;
256 312
257 sv = POPs; 313 sv = POPs;
258 314
259 if (SvPVX (sv)[0] != MAGIC_R) 315 if (SvPVX (sv)[0] == MAGIC_R)
260 croak ("Storable format changed, need newer version of Compress::LZF"); 316 {
261
262 if (deref) 317 if (deref)
263 SvPVX (sv)[0] = MAGIC_R_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 }
264 329
265 if (ix) /* compress */ 330 if (ix) /* compress */
266 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 331 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
267 332
268 XPUSHs (sv); 333 XPUSHs (sv);
269 } 334 }
270 else if (SvTYPE (sv) == SVt_PV && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 335 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 */ 336 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
272 else if (ix == 2) /* compress always */ 337 else if (ix == 2) /* compress always */
273 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1))); 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 }
274 else /* don't compress */ 345 else /* don't compress */
275 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 346 XPUSHs (sv_2mortal (newSVsv (sv)));
276 347
277void 348void
278sthaw(sv) 349sthaw(sv)
279 SV * sv 350 SV * sv
280 PROTOTYPE: $ 351 PROTOTYPE: $
281 PPCODE: 352 PPCODE:
282 353{
354 STRLEN svlen;
283 int deref = 0; 355 int deref = 0;
284 356
285 SvGETMAGIC (sv); 357 SvGETMAGIC (sv);
286 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI)) 358 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
287 { 359 {
360 redo:
361
288 switch (SvPVX (sv)[0]) 362 switch (SvPVX (sv)[0])
289 { 363 {
290 case MAGIC_undef: 364 case MAGIC_undef:
365 if (svlen <= 1)
291 XPUSHs (sv_2mortal (NEWSV (0, 0))); 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 }
292 break; 393 break;
293 394
294 case MAGIC_U: 395 case MAGIC_U:
295 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 396 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
296 break; 397 break;
… …
309 case MAGIC_CR: 410 case MAGIC_CR:
310 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 411 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
311 if (deref) 412 if (deref)
312 if (SvPVX (sv)[0] == MAGIC_R_deref) 413 if (SvPVX (sv)[0] == MAGIC_R_deref)
313 SvPVX (sv)[0] = MAGIC_R; 414 SvPVX (sv)[0] = MAGIC_R;
314 else 415
315 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 416 goto redo;
316 417
317 case MAGIC_R: 418 case MAGIC_R:
318 handle_MAGIC_R: 419 handle_MAGIC_R:
319 if (!storable_mstore) 420 if (!storable_mstore)
320 need_storable (); 421 need_storable ();
… …
334 435
335 if (SvPVX (sv)[0] == MAGIC_R) 436 if (SvPVX (sv)[0] == MAGIC_R)
336 SvPVX (sv)[0] = MAGIC_R_deref; 437 SvPVX (sv)[0] = MAGIC_R_deref;
337 } 438 }
338 else 439 else
339 XPUSHs (POPs); /* this is a nop, hopefully */ 440 SETs (sv_2mortal (newSVsv (TOPs)));
340 441
341 break; 442 break;
342 443
343 default: 444 default:
344 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?");
345 } 446 }
346 } 447 }
347 else 448 else
348 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 449 XPUSHs (sv_2mortal (newSVsv (sv)));
450}
451

Diff Legend

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