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

Diff Legend

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