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.3 by root, Thu Sep 27 19:51:26 2001 UTC vs.
Revision 1.21 by root, Wed Sep 27 15:52:47 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
34static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
30static CV *storable_mstore, *storable_mretrieve; 35static 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
32static SV * 43static SV *
33compress_sv (SV *data, char cprepend, char uprepend) 44compress_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)
171 croak ("compressed data corrupted", csize, skip, usize); 204 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
172 } 205 }
173 else 206 else
174 { 207 {
175 usize = csize - 1; 208 usize = csize - 1;
176 ret = NEWSV (0, usize); 209 ret = NEWSV (0, usize | 1);
177 SvPOK_only (ret); 210 SvPOK_only (ret);
178 211
179 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 212 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
180 } 213 }
181 214
… …
189 222
190static void 223static void
191need_storable(void) 224need_storable(void)
192{ 225{
193#if PATCHLEVEL < 6 226#if PATCHLEVEL < 6
227 char req[8192];
228 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
194 perl_eval_pv ("require Storable;", 1); 229 perl_eval_pv (req, 1);
195#else 230#else
196 load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv); 231 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
197#endif 232#endif
198 233
199 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV)); 234 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV));
200 storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV)); 235 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
201} 236}
202 237
203MODULE = Compress::LZF PACKAGE = Compress::LZF 238MODULE = Compress::LZF PACKAGE = Compress::LZF
239
240BOOT:
241 serializer_package = newSVpv ("Storable", 0);
242 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
243 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
244
245void
246set_serializer(package, mstore, mretrieve)
247 SV * package
248 SV * mstore
249 SV * mretrieve
250 PROTOTYPE: $$$
251 PPCODE:
252 SvSetSV (serializer_package , package );
253 SvSetSV (serializer_mstore , mstore );
254 SvSetSV (serializer_mretrieve, mretrieve);
255 storable_mstore =
256 storable_mretrieve = 0;
204 257
205void 258void
206compress(data) 259compress(data)
207 SV * data 260 SV * data
208 PROTOTYPE: $ 261 PROTOTYPE: $
209 PPCODE: 262 PPCODE:
210 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 263 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
211 264
212void 265void
213decompress(data) 266decompress(data)
214 SV * data 267 SV * data
215 PROTOTYPE: $ 268 PROTOTYPE: $
… …
223 sfreeze_cr = 1 276 sfreeze_cr = 1
224 sfreeze_c = 2 277 sfreeze_c = 2
225 PROTOTYPE: $ 278 PROTOTYPE: $
226 PPCODE: 279 PPCODE:
227 280
281 SvGETMAGIC (sv);
282
283 if (!SvOK (sv))
284 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
285 else if (SvROK (sv)
228 if (SvTYPE(sv) != SVt_IV 286 || (SvTYPE(sv) != SVt_IV
229 && SvTYPE(sv) != SVt_NV 287 && SvTYPE(sv) != SVt_NV
288 && SvTYPE(sv) != SVt_PV
289 && SvTYPE(sv) != SVt_PVIV
290 && SvTYPE(sv) != SVt_PVNV
230 && SvTYPE(sv) != SVt_PV) /* mstore */ 291 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
231 { 292 {
293 int deref = !SvROK (sv);
294
232 if (!storable_mstore) 295 if (!storable_mstore)
233 need_storable (); 296 need_storable ();
297
298 if (deref)
299 sv = newRV_noinc (sv);
234 300
235 PUSHMARK (SP); 301 PUSHMARK (SP);
236 XPUSHs (sv); 302 XPUSHs (sv);
237 PUTBACK; 303 PUTBACK;
238 304
… …
241 307
242 SPAGAIN; 308 SPAGAIN;
243 309
244 sv = POPs; 310 sv = POPs;
245 311
246 if (SvPVX (sv)[0] != MAGIC_R) 312 if (SvPVX (sv)[0] == MAGIC_R)
247 croak ("Storable format changed, need newer version of Compress::LZF"); 313 {
314 if (deref)
315 SvPVX (sv)[0] = MAGIC_R_deref;
316 }
317 else
318 {
319 char pfx[2];
320
321 pfx[0] = MAGIC_undef;
322 pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
323
324 sv_insert (sv, 0, 0, pfx, 2);
325 }
248 326
249 if (ix) /* compress */ 327 if (ix) /* compress */
250 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0))); 328 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
251 else 329
252 XPUSHs (sv); 330 XPUSHs (sv);
253 } 331 }
254 else if (IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 332 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 */ 333 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
256 else if (ix == 2) /* compress always */ 334 else if (ix == 2) /* compress always */
257 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 335 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
336 else if (SvNIOK (sv)) /* don't compress */
337 {
338 STRLEN len;
339 char *s = SvPV (sv, len);
340 XPUSHs (sv_2mortal (newSVpvn (s, len)));
341 }
258 else /* don't compress */ 342 else /* don't compress */
259 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 343 XPUSHs (sv_2mortal (newSVsv (sv)));
260 344
261void 345void
262sthaw(sv) 346sthaw(sv)
263 SV * sv 347 SV * sv
264 PROTOTYPE: $ 348 PROTOTYPE: $
265 PPCODE: 349 PPCODE:
266 char hdr = SvPVX (sv)[0]; 350{
351 STRLEN svlen;
352 int deref = 0;
267 353
268 if (IN_RANGE (hdr, MAGIC_LO, MAGIC_HI)) 354 SvGETMAGIC (sv);
355 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
269 { 356 {
357 redo:
358
270 switch (SvPVX (sv)[0]) 359 switch (SvPVX (sv)[0])
271 { 360 {
361 case MAGIC_undef:
362 if (svlen <= 1)
363 XPUSHs (sv_2mortal (NEWSV (0, 0)));
364 else
365 {
366 if (SvPVX (sv)[1] == MAGIC_R_deref)
367 deref = 1;
368 else if (SvPVX (sv)[1] != MAGIC_R)
369 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
370
371 sv_chop (sv, SvPVX (sv) + 2);
372
373 if (!storable_mstore)
374 need_storable ();
375
376 PUSHMARK (SP);
377 XPUSHs (sv);
378 PUTBACK;
379
380 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
381 croak ("Storable::mstore didn't return a single scalar");
382
383 SPAGAIN;
384
385 if (deref)
386 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
387 else
388 SETs (sv_2mortal (newSVsv (TOPs)));
389 }
390 break;
391
272 case MAGIC_U: 392 case MAGIC_U:
273 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 393 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
274 break; 394 break;
275 395
276 case MAGIC_C: 396 case MAGIC_C:
277 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 397 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
278 break; 398 break;
279 399
400 case MAGIC_R_deref:
401 deref = 1;
402 SvPVX (sv)[0] = MAGIC_R;
403 goto handle_MAGIC_R;
404
405 case MAGIC_CR_deref:
406 deref = 1;
280 case MAGIC_CR: 407 case MAGIC_CR:
281 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 408 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
409 if (deref)
410 if (SvPVX (sv)[0] == MAGIC_R_deref)
411 SvPVX (sv)[0] = MAGIC_R;
412
413 goto redo;
414
282 case MAGIC_R: 415 case MAGIC_R:
416 handle_MAGIC_R:
283 if (!storable_mstore) 417 if (!storable_mstore)
284 need_storable (); 418 need_storable ();
285 419
286 PUSHMARK (SP); 420 PUSHMARK (SP);
287 XPUSHs (sv); 421 XPUSHs (sv);
… …
290 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 424 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
291 croak ("Storable::mstore didn't return a single scalar"); 425 croak ("Storable::mstore didn't return a single scalar");
292 426
293 SPAGAIN; 427 SPAGAIN;
294 428
295 /*XPUSHs (POPs);*/ 429 if (deref)
430 {
431 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
432
433 if (SvPVX (sv)[0] == MAGIC_R)
434 SvPVX (sv)[0] = MAGIC_R_deref;
435 }
436 else
437 SETs (sv_2mortal (newSVsv (TOPs)));
296 438
297 break; 439 break;
298 440
299 default: 441 default:
300 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 442 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
301 } 443 }
302 } 444 }
303 else 445 else
304 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 446 XPUSHs (sv_2mortal (newSVsv (sv)));
447}
448

Diff Legend

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