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.1 by root, Thu Sep 27 18:36:34 2001 UTC vs.
Revision 1.22 by root, Wed Sep 27 19:01:48 2006 UTC

… …
8#include "patchlevel.h" 8#include "patchlevel.h"
9#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55)) 9#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55))
10static STRLEN nolen_na; 10static STRLEN nolen_na;
11# define SvPV_nolen(sv) SvPV ((sv), nolen_na) 11# define SvPV_nolen(sv) SvPV ((sv), nolen_na)
12#endif 12#endif
13#if PATCHLEVEL < 6
14# define call_sv perl_call_sv
15#endif
13 16
14#include "lzf_c.c" 17#include "lzf_c.c"
15#include "lzf_d.c" 18#include "lzf_d.c"
16 19
17/* we re-use the storable header for our purposes */ 20/* we re-use the storable header for our purposes */
18#define MAGIC_LO 0 21#define MAGIC_LO 0
19#define MAGIC_U 0 /* uncompressed data follows */ 22#define MAGIC_U 0 /* uncompressed data follows */
20#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 */
21#define MAGIC_R 4 /* storable (reference, freeze) */ 26#define MAGIC_R 4 /* storable (reference, freeze) */
22#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) */
23#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 */
24 31
25#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))
26 33
34static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
27static CV *storable_mstore, *storable_mretrieve; 35static CV *storable_mstore, *storable_mretrieve;
28 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
29static SV * 43static SV *
30compress_sv (SV *data, char cprepend, char uprepend) 44compress_sv (SV *data, char cprepend, int uprepend)
31{ 45{
32 STRLEN usize, csize; 46 STRLEN usize, csize;
33 char *src = (char *)SvPV (data, usize); 47 char *src = (char *)SvPV (data, usize);
34 48
35 if (usize) 49 if (usize)
… …
42 dst = (unsigned char *)SvPVX (ret); 56 dst = (unsigned char *)SvPVX (ret);
43 57
44 if (cprepend) 58 if (cprepend)
45 dst[skip++] = cprepend; 59 dst[skip++] = cprepend;
46 60
47 if (usize < 0x80) 61 if (usize <= 0x7f)
48 { 62 {
49 dst[skip++] = usize; 63 dst[skip++] = usize;
50 } 64 }
51 else if (usize < 0x800) 65 else if (usize <= 0x7ff)
52 { 66 {
53 dst[skip++] = (( usize >> 6) | 0xc0); 67 dst[skip++] = (( usize >> 6) | 0xc0);
54 dst[skip++] = (( usize & 0x3f) | 0x80); 68 dst[skip++] = (( usize & 0x3f) | 0x80);
55 } 69 }
56 else if (usize < 0x10000) 70 else if (usize <= 0xffff)
57 { 71 {
58 dst[skip++] = (( usize >> 12) | 0xe0); 72 dst[skip++] = (( usize >> 12) | 0xe0);
59 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 73 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
60 dst[skip++] = (( usize & 0x3f) | 0x80); 74 dst[skip++] = (( usize & 0x3f) | 0x80);
61 } 75 }
62 else if (usize < 0x200000) 76 else if (usize <= 0x1fffff)
63 { 77 {
64 dst[skip++] = (( usize >> 18) | 0xf0); 78 dst[skip++] = (( usize >> 18) | 0xf0);
65 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 79 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
66 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 80 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
67 dst[skip++] = (( usize & 0x3f) | 0x80); 81 dst[skip++] = (( usize & 0x3f) | 0x80);
68 } 82 }
69 else if (usize < 0x4000000) 83 else if (usize <= 0x3ffffff)
70 { 84 {
71 dst[skip++] = (( usize >> 24) | 0xf8); 85 dst[skip++] = (( usize >> 24) | 0xf8);
72 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 86 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
73 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 87 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
74 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 88 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
75 dst[skip++] = (( usize & 0x3f) | 0x80); 89 dst[skip++] = (( usize & 0x3f) | 0x80);
76 } 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 }
77 else 100 else
78 croak ("compress can only compress up to %ld bytes", 0x4000000-1); 101 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
79 102
80 /* 11 bytes is the smallest compressible string */ 103 /* 11 bytes is the smallest compressible string */
81 csize = usize < 11 ? 0 : 104 csize = usize < 11 ? 0 :
82 lzf_compress (src, usize, 105 lzf_compress (src, usize,
83 dst + skip, 106 dst + skip,
… …
85 108
86 if (csize) 109 if (csize)
87 { 110 {
88 SvCUR_set (ret, csize + skip); 111 SvCUR_set (ret, csize + skip);
89 } 112 }
90 else if (!uprepend) 113 else if (uprepend < 0)
91 { 114 {
92 SvREFCNT_dec (ret); 115 SvREFCNT_dec (ret);
93 ret = SvREFCNT_inc (data); 116 ret = SvREFCNT_inc (data);
94 } 117 }
95 else 118 else
96 { 119 {
97 *dst++ = 0; 120 *dst++ = uprepend;
98 121
99 Move ((void *)src, (void *)dst, usize, unsigned char); 122 Move ((void *)src, (void *)dst, usize, unsigned char);
100 123
101 SvCUR_set (ret, usize + 1); 124 SvCUR_set (ret, usize + 1);
102 } 125 }
… …
120 143
121 csize -= skip; 144 csize -= skip;
122 145
123 if (src[0]) 146 if (src[0])
124 { 147 {
125 if (!(src[0] & 0x80)) 148 if (!(src[0] & 0x80) && csize >= 1)
126 { 149 {
127 csize -= 1; 150 csize -= 1;
128 usize = *src++ & 0xff; 151 usize = *src++ & 0xff;
129 } 152 }
130 else if (!(src[0] & 0x20)) 153 else if (!(src[0] & 0x20) && csize >= 2)
131 { 154 {
132 csize -= 2; 155 csize -= 2;
133 usize = *src++ & 0x1f; 156 usize = *src++ & 0x1f;
134 usize = (usize << 6) | (*src++ & 0x3f); 157 usize = (usize << 6) | (*src++ & 0x3f);
135 } 158 }
136 else if (!(src[0] & 0x10)) 159 else if (!(src[0] & 0x10) && csize >= 3)
137 { 160 {
138 csize -= 3; 161 csize -= 3;
139 usize = *src++ & 0x0f; 162 usize = *src++ & 0x0f;
140 usize = (usize << 6) | (*src++ & 0x3f); 163 usize = (usize << 6) | (*src++ & 0x3f);
141 usize = (usize << 6) | (*src++ & 0x3f); 164 usize = (usize << 6) | (*src++ & 0x3f);
142 } 165 }
143 else if (!(src[0] & 0x08)) 166 else if (!(src[0] & 0x08) && csize >= 4)
144 { 167 {
145 csize -= 4; 168 csize -= 4;
146 usize = *src++ & 0x07; 169 usize = *src++ & 0x07;
147 usize = (usize << 6) | (*src++ & 0x3f); 170 usize = (usize << 6) | (*src++ & 0x3f);
148 usize = (usize << 6) | (*src++ & 0x3f); 171 usize = (usize << 6) | (*src++ & 0x3f);
149 usize = (usize << 6) | (*src++ & 0x3f); 172 usize = (usize << 6) | (*src++ & 0x3f);
150 } 173 }
151 else if (!(src[0] & 0x04)) 174 else if (!(src[0] & 0x04) && csize >= 5)
152 { 175 {
153 csize -= 5; 176 csize -= 5;
154 usize = *src++ & 0x03; 177 usize = *src++ & 0x03;
155 usize = (usize << 6) | (*src++ & 0x3f); 178 usize = (usize << 6) | (*src++ & 0x3f);
156 usize = (usize << 6) | (*src++ & 0x3f); 179 usize = (usize << 6) | (*src++ & 0x3f);
157 usize = (usize << 6) | (*src++ & 0x3f); 180 usize = (usize << 6) | (*src++ & 0x3f);
158 usize = (usize << 6) | (*src++ & 0x3f); 181 usize = (usize << 6) | (*src++ & 0x3f);
159 } 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 }
160 else 193 else
161 croak ("compressed data corrupted"); 194 croak ("compressed data corrupted (invalid length)");
195
196 if (!usize)
197 croak ("compressed data corrupted (invalid length)");
162 198
163 ret = NEWSV (0, usize); 199 ret = NEWSV (0, usize);
164 SvPOK_only (ret); 200 SvPOK_only (ret);
165 dst = SvPVX (ret); 201 dst = SvPVX (ret);
166 202
167 if (lzf_decompress (src, csize, dst, usize) != usize) 203 if (lzf_decompress (src, csize, dst, usize) != usize)
204 {
205 SvREFCNT_dec (ret);
168 croak ("compressed data corrupted", csize, skip, usize); 206 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
207 }
169 } 208 }
170 else 209 else
171 { 210 {
172 usize = csize - 1; 211 usize = csize - 1;
173 ret = NEWSV (0, usize); 212 ret = NEWSV (0, usize | 1);
174 SvPOK_only (ret); 213 SvPOK_only (ret);
175 214
176 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 215 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
177 } 216 }
178 217
… …
185} 224}
186 225
187static void 226static void
188need_storable(void) 227need_storable(void)
189{ 228{
229#if PATCHLEVEL < 6
230 char req[8192];
231 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
232 perl_eval_pv (req, 1);
233#else
190 load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv); 234 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
235#endif
191 236
192 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV)); 237 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV));
193 storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV)); 238 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
194} 239}
195 240
196MODULE = 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;
197 260
198void 261void
199compress(data) 262compress(data)
200 SV * data 263 SV * data
201 PROTOTYPE: $ 264 PROTOTYPE: $
202 PPCODE: 265 PPCODE:
203 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 266 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
204 267
205void 268void
206decompress(data) 269decompress(data)
207 SV * data 270 SV * data
208 PROTOTYPE: $ 271 PROTOTYPE: $
… …
216 sfreeze_cr = 1 279 sfreeze_cr = 1
217 sfreeze_c = 2 280 sfreeze_c = 2
218 PROTOTYPE: $ 281 PROTOTYPE: $
219 PPCODE: 282 PPCODE:
220 283
221 if (SvROK (sv)) /* mstore */ 284 SvGETMAGIC (sv);
285
286 if (!SvOK (sv))
287 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
288 else if (SvROK (sv)
289 || (SvTYPE(sv) != SVt_IV
290 && SvTYPE(sv) != SVt_NV
291 && SvTYPE(sv) != SVt_PV
292 && SvTYPE(sv) != SVt_PVIV
293 && SvTYPE(sv) != SVt_PVNV
294 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
222 { 295 {
296 int deref = !SvROK (sv);
297
223 if (!storable_mstore) 298 if (!storable_mstore)
224 need_storable (); 299 need_storable ();
300
301 if (deref)
302 sv = newRV_noinc (sv);
225 303
226 PUSHMARK (SP); 304 PUSHMARK (SP);
227 XPUSHs (sv); 305 XPUSHs (sv);
228 PUTBACK; 306 PUTBACK;
229 307
… …
232 310
233 SPAGAIN; 311 SPAGAIN;
234 312
235 sv = POPs; 313 sv = POPs;
236 314
237 if (SvPVX (sv)[0] != MAGIC_R) 315 if (SvPVX (sv)[0] == MAGIC_R)
238 croak ("Storable format changed, need newer version of Compress::LZF"); 316 {
317 if (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 }
239 329
240 if (ix) /* compress */ 330 if (ix) /* compress */
241 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0))); 331 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
242 else 332
243 XPUSHs (sv); 333 XPUSHs (sv);
244 } 334 }
245 else if (IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 335 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
246 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */ 336 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
247 else if (ix == 2) /* compress always */ 337 else if (ix == 2) /* compress always */
248 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 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 }
249 else /* don't compress */ 345 else /* don't compress */
250 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 346 XPUSHs (sv_2mortal (newSVsv (sv)));
251 347
252void 348void
253sthaw(sv) 349sthaw(sv)
254 SV * sv 350 SV * sv
255 PROTOTYPE: $ 351 PROTOTYPE: $
256 PPCODE: 352 PPCODE:
257 char hdr = SvPVX (sv)[0]; 353{
354 STRLEN svlen;
355 int deref = 0;
258 356
259 if (IN_RANGE (hdr, MAGIC_LO, MAGIC_HI)) 357 SvGETMAGIC (sv);
358 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
260 { 359 {
360 redo:
361
261 switch (SvPVX (sv)[0]) 362 switch (SvPVX (sv)[0])
262 { 363 {
364 case MAGIC_undef:
365 if (svlen <= 1)
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 }
393 break;
394
263 case MAGIC_U: 395 case MAGIC_U:
264 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 396 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
265 break; 397 break;
266 398
267 case MAGIC_C: 399 case MAGIC_C:
268 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 400 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
269 break; 401 break;
270 402
403 case MAGIC_R_deref:
404 deref = 1;
405 SvPVX (sv)[0] = MAGIC_R;
406 goto handle_MAGIC_R;
407
408 case MAGIC_CR_deref:
409 deref = 1;
271 case MAGIC_CR: 410 case MAGIC_CR:
272 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 411 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
412 if (deref)
413 if (SvPVX (sv)[0] == MAGIC_R_deref)
414 SvPVX (sv)[0] = MAGIC_R;
415
416 goto redo;
417
273 case MAGIC_R: 418 case MAGIC_R:
419 handle_MAGIC_R:
274 if (!storable_mstore) 420 if (!storable_mstore)
275 need_storable (); 421 need_storable ();
276 422
277 PUSHMARK (SP); 423 PUSHMARK (SP);
278 XPUSHs (sv); 424 XPUSHs (sv);
… …
281 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 427 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
282 croak ("Storable::mstore didn't return a single scalar"); 428 croak ("Storable::mstore didn't return a single scalar");
283 429
284 SPAGAIN; 430 SPAGAIN;
285 431
286 /*XPUSHs (POPs);*/ 432 if (deref)
433 {
434 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
435
436 if (SvPVX (sv)[0] == MAGIC_R)
437 SvPVX (sv)[0] = MAGIC_R_deref;
438 }
439 else
440 SETs (sv_2mortal (newSVsv (TOPs)));
287 441
288 break; 442 break;
289 443
290 default: 444 default:
291 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?");
292 } 446 }
293 } 447 }
294 else 448 else
295 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 449 XPUSHs (sv_2mortal (newSVsv (sv)));
450}
451

Diff Legend

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