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.23 by root, Fri Feb 16 22:11:17 2007 UTC vs.
Revision 1.34 by root, Mon Jun 29 23:51:28 2015 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5/* try to be compatible with older perls */ 5#include "perlmulticore.h"
6/* SvPV_nolen() macro first defined in 5.005_55 */
7/* this is slow, not threadsafe, but works */
8#include "patchlevel.h"
9#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55))
10static STRLEN nolen_na;
11# define SvPV_nolen(sv) SvPV ((sv), nolen_na)
12#endif
13#if PATCHLEVEL < 6
14# define call_sv perl_call_sv
15#endif
16 6
17#define LZF_STANDALONE 1 7#define LZF_STANDALONE 1
18#define LZF_STATE_ARG 1 8#define LZF_STATE_ARG 1
19 9
20#include "lzf_c.c" 10#include "lzf_c.c"
21#include "lzf_d.c" 11#include "lzf_d.c"
12#include "lzf_c_best.c"
22 13
23/* we re-use the storable header for our purposes */ 14/* we re-use the storable header for our purposes */
24#define MAGIC_LO 0 15#define MAGIC_LO 0
25#define MAGIC_U 0 /* uncompressed data follows */ 16#define MAGIC_U 0 /* uncompressed data follows */
26#define MAGIC_C 1 /* compressed data follows */ 17#define MAGIC_C 1 /* compressed data follows */
… …
42#else 33#else
43# define MAX_LENGTH ((Size_t) 0x8000000L) 34# define MAX_LENGTH ((Size_t) 0x8000000L)
44#endif 35#endif
45 36
46static SV * 37static SV *
47compress_sv (SV *data, char cprepend, int uprepend) 38compress_sv (SV *data, char cprepend, int uprepend, int best)
48{ 39{
49 LZF_STATE *state; 40 void *state;
50 STRLEN usize, csize; 41 STRLEN usize, csize;
51 char *src = (char *)SvPV (data, usize); 42 char *src = (char *)SvPVbyte (data, usize);
52 43
53 if (usize) 44 if (usize)
54 { 45 {
55 SV *ret = NEWSV (0, usize + 1); 46 SV *ret = NEWSV (0, usize + 1);
56 unsigned char *dst; 47 unsigned char *dst;
… …
64 55
65 if (usize <= 0x7f) 56 if (usize <= 0x7f)
66 { 57 {
67 dst[skip++] = usize; 58 dst[skip++] = usize;
68 } 59 }
69 else if (usize <= 0x7ff) 60 else if (usize <= 0x7ff)
70 { 61 {
71 dst[skip++] = (( usize >> 6) | 0xc0); 62 dst[skip++] = (( usize >> 6) | 0xc0);
72 dst[skip++] = (( usize & 0x3f) | 0x80); 63 dst[skip++] = (( usize & 0x3f) | 0x80);
73 } 64 }
74 else if (usize <= 0xffff) 65 else if (usize <= 0xffff)
75 { 66 {
76 dst[skip++] = (( usize >> 12) | 0xe0); 67 dst[skip++] = (( usize >> 12) | 0xe0);
77 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 68 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
78 dst[skip++] = (( usize & 0x3f) | 0x80); 69 dst[skip++] = (( usize & 0x3f) | 0x80);
79 } 70 }
80 else if (usize <= 0x1fffff) 71 else if (usize <= 0x1fffff)
81 { 72 {
82 dst[skip++] = (( usize >> 18) | 0xf0); 73 dst[skip++] = (( usize >> 18) | 0xf0);
83 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 74 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
84 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 75 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
85 dst[skip++] = (( usize & 0x3f) | 0x80); 76 dst[skip++] = (( usize & 0x3f) | 0x80);
86 } 77 }
87 else if (usize <= 0x3ffffff) 78 else if (usize <= 0x3ffffff)
88 { 79 {
89 dst[skip++] = (( usize >> 24) | 0xf8); 80 dst[skip++] = (( usize >> 24) | 0xf8);
90 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 81 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
91 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 82 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
92 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 83 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
93 dst[skip++] = (( usize & 0x3f) | 0x80); 84 dst[skip++] = (( usize & 0x3f) | 0x80);
94 } 85 }
95 else if (usize <= 0x7fffffff) 86 else if (usize <= 0x7fffffff)
96 { 87 {
97 dst[skip++] = (( usize >> 30) | 0xfc); 88 dst[skip++] = (( usize >> 30) | 0xfc);
98 dst[skip++] = (((usize >> 24) & 0x3f) | 0x80); 89 dst[skip++] = (((usize >> 24) & 0x3f) | 0x80);
99 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 90 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
100 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 91 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
… …
102 dst[skip++] = (( usize & 0x3f) | 0x80); 93 dst[skip++] = (( usize & 0x3f) | 0x80);
103 } 94 }
104 else 95 else
105 croak ("compress can only compress up to %ld bytes", 0x7fffffffL); 96 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
106 97
107 New (0, state, 1, LZF_STATE); 98 if (usize > 2000) perlinterp_release ();
99
100 state = malloc (best ? sizeof (LZF_STATE_BEST) : sizeof (LZF_STATE));
108 if (!state) 101 if (!state)
102 {
103 if (usize > 2000) perlinterp_acquire ();
109 croak ("Compress::LZF unable to allocate memory for compression state"); 104 croak ("Compress::LZF unable to allocate memory for compression state");
105 }
110 106
111 /* 11 bytes is the smallest compressible string */ 107 /* 11 bytes is the smallest compressible string */
112 csize = usize < 11 ? 0 : 108 csize = usize < 11 ? 0 :
109 (best ? lzf_compress_best (src, usize, dst + skip, usize - skip, *(LZF_STATE_BEST *)state)
113 lzf_compress (src, usize, dst + skip, usize - skip, *state); 110 : lzf_compress (src, usize, dst + skip, usize - skip, *(LZF_STATE *)state));
114 111
115 Safefree (state); 112 free (state);
113
114 if (usize > 2000) perlinterp_acquire ();
116 115
117 if (csize) 116 if (csize)
118 { 117 {
119 SvCUR_set (ret, csize + skip); 118 SvCUR_set (ret, csize + skip);
120 } 119 }
… …
140 139
141static SV * 140static SV *
142decompress_sv (SV *data, int skip) 141decompress_sv (SV *data, int skip)
143{ 142{
144 STRLEN usize, csize; 143 STRLEN usize, csize;
145 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 144 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
146 145
147 if (csize) 146 if (csize)
148 { 147 {
149 void *dst; 148 void *dst;
150 SV *ret; 149 SV *ret;
150 int res;
151 151
152 csize -= skip; 152 csize -= skip;
153 153
154 if (src[0]) 154 if (src[0])
155 { 155 {
… …
201 else 201 else
202 croak ("compressed data corrupted (invalid length)"); 202 croak ("compressed data corrupted (invalid length)");
203 203
204 if (!usize) 204 if (!usize)
205 croak ("compressed data corrupted (invalid length)"); 205 croak ("compressed data corrupted (invalid length)");
206 206
207 ret = NEWSV (0, usize); 207 ret = NEWSV (0, usize);
208 SvPOK_only (ret); 208 SvPOK_only (ret);
209 dst = SvPVX (ret); 209 dst = SvPVX (ret);
210 210
211 if (usize > 4000) perlinterp_release ();
211 if (lzf_decompress (src, csize, dst, usize) != usize) 212 res = lzf_decompress (src, csize, dst, usize) != usize;
213 if (usize > 4000) perlinterp_acquire ();
214
215 if (res)
212 { 216 {
213 SvREFCNT_dec (ret); 217 SvREFCNT_dec (ret);
214 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 218 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
215 } 219 }
216 } 220 }
… …
230 else 234 else
231 return newSVpvn ("", 0); 235 return newSVpvn ("", 0);
232} 236}
233 237
234static void 238static void
235need_storable(void) 239need_storable (void)
236{ 240{
237#if PATCHLEVEL < 6 241 eval_sv (sv_2mortal (newSVpvf ("require %s", SvPVbyte_nolen (serializer_package))), G_VOID | G_DISCARD);
238 char req[8192];
239 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
240 perl_eval_pv (req, 1);
241#else
242 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
243#endif
244 242
245 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV)); 243 storable_mstore = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mstore ), TRUE, SVt_PVCV)));
246 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV)); 244 storable_mretrieve = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV)));
247} 245}
248 246
249MODULE = Compress::LZF PACKAGE = Compress::LZF 247MODULE = Compress::LZF PACKAGE = Compress::LZF
250 248
251BOOT: 249BOOT:
… …
261 PROTOTYPE: $$$ 259 PROTOTYPE: $$$
262 PPCODE: 260 PPCODE:
263 SvSetSV (serializer_package , package ); 261 SvSetSV (serializer_package , package );
264 SvSetSV (serializer_mstore , mstore ); 262 SvSetSV (serializer_mstore , mstore );
265 SvSetSV (serializer_mretrieve, mretrieve); 263 SvSetSV (serializer_mretrieve, mretrieve);
266 storable_mstore = 264 SvREFCNT_dec (storable_mstore ); storable_mstore = 0;
267 storable_mretrieve = 0; 265 SvREFCNT_dec (storable_mretrieve); storable_mretrieve = 0;
268 266
269void 267void
270compress(data) 268compress(data)
271 SV * data 269 SV * data
270 ALIAS:
271 compress_best = 1
272 PROTOTYPE: $ 272 PROTOTYPE: $
273 PPCODE: 273 PPCODE:
274 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U))); 274 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U, ix)));
275 275
276void 276void
277decompress(data) 277decompress(data)
278 SV * data 278 SV * data
279 PROTOTYPE: $ 279 PROTOTYPE: $
… …
282 282
283void 283void
284sfreeze(sv) 284sfreeze(sv)
285 SV * sv 285 SV * sv
286 ALIAS: 286 ALIAS:
287 sfreeze = 0
287 sfreeze_cr = 1 288 sfreeze_cr = 1
288 sfreeze_c = 2 289 sfreeze_c = 2
290 sfreeze_best = 4
291 sfreeze_cr_best = 5
292 sfreeze_c_best = 6
289 PROTOTYPE: $ 293 PROTOTYPE: $
290 PPCODE: 294 PPCODE:
295{
296 int best = ix & 4;
297 ix &= 3;
291 298
292 SvGETMAGIC (sv); 299 SvGETMAGIC (sv);
293 300
294 if (!SvOK (sv)) 301 if (!SvOK (sv))
295 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 302 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
296 else if (SvROK (sv) 303 else if (SvROK (sv)
304 || SvUTF8 (sv)
297 || (SvTYPE(sv) != SVt_IV 305 || (SvTYPE(sv) != SVt_IV
298 && SvTYPE(sv) != SVt_NV 306 && SvTYPE(sv) != SVt_NV
299 && SvTYPE(sv) != SVt_PV 307 && SvTYPE(sv) != SVt_PV
300 && SvTYPE(sv) != SVt_PVIV 308 && SvTYPE(sv) != SVt_PVIV
301 && SvTYPE(sv) != SVt_PVNV 309 && SvTYPE(sv) != SVt_PVNV
302 && SvTYPE(sv) != SVt_PVMG)) /* mstore */ 310 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
303 { 311 {
304 int deref = !SvROK (sv); 312 int deref = !SvROK (sv);
313 char *pv;
305 314
306 if (!storable_mstore) 315 if (!storable_mstore)
316 {
317 PUTBACK;
307 need_storable (); 318 need_storable ();
319 SPAGAIN;
320 }
308 321
309 if (deref) 322 if (deref)
310 sv = newRV_noinc (sv); 323 sv = newRV_noinc (sv);
311 324
312 PUSHMARK (SP); 325 PUSHMARK (SP);
313 XPUSHs (sv); 326 XPUSHs (sv);
314 PUTBACK; 327 PUTBACK;
315 328
316 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR)) 329 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR))
317 croak ("Storable::mstore didn't return a single scalar"); 330 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mstore));
318 331
319 SPAGAIN; 332 SPAGAIN;
320 333
321 sv = POPs; 334 sv = POPs;
335 pv = SvPV_nolen (sv);
322 336
323 if (SvPVX (sv)[0] == MAGIC_R) 337 if (*pv == MAGIC_R)
324 { 338 {
325 if (deref) 339 if (deref)
326 SvPVX (sv)[0] = MAGIC_R_deref; 340 *pv = MAGIC_R_deref;
327 } 341 }
328 else 342 else
329 { 343 {
330 char pfx[2]; 344 char pfx[2];
331 345
… …
334 348
335 sv_insert (sv, 0, 0, pfx, 2); 349 sv_insert (sv, 0, 0, pfx, 2);
336 } 350 }
337 351
338 if (ix) /* compress */ 352 if (ix) /* compress */
339 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 353 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1, best));
340 354
341 XPUSHs (sv); 355 XPUSHs (sv);
342 } 356 }
343 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 357 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
344 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */ 358 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U, best))); /* need to prefix only */
345 else if (ix == 2) /* compress always */ 359 else if (ix == 2) /* compress always */
346 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1))); 360 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1, best)));
347 else if (SvNIOK (sv)) /* don't compress */ 361 else if (SvNIOK (sv)) /* don't compress */
348 { 362 {
349 STRLEN len; 363 STRLEN len;
350 char *s = SvPV (sv, len); 364 char *s = SvPV (sv, len);
351 XPUSHs (sv_2mortal (newSVpvn (s, len))); 365 XPUSHs (sv_2mortal (newSVpvn (s, len)));
352 } 366 }
353 else /* don't compress */ 367 else /* don't compress */
354 XPUSHs (sv_2mortal (newSVsv (sv))); 368 XPUSHs (sv_2mortal (newSVsv (sv)));
369}
355 370
356void 371void
357sthaw(sv) 372sthaw(sv)
358 SV * sv 373 SV * sv
359 PROTOTYPE: $ 374 PROTOTYPE: $
… …
361{ 376{
362 STRLEN svlen; 377 STRLEN svlen;
363 int deref = 0; 378 int deref = 0;
364 379
365 SvGETMAGIC (sv); 380 SvGETMAGIC (sv);
366 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI)) 381 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
367 { 382 {
368 redo: 383 redo:
369 384
370 switch (SvPVX (sv)[0]) 385 switch (SvPVX (sv)[0])
371 { 386 {
… …
380 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 395 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
381 396
382 sv_chop (sv, SvPVX (sv) + 2); 397 sv_chop (sv, SvPVX (sv) + 2);
383 398
384 if (!storable_mstore) 399 if (!storable_mstore)
400 {
401 PUTBACK;
385 need_storable (); 402 need_storable ();
403 SPAGAIN;
404 }
386 405
387 PUSHMARK (SP); 406 PUSHMARK (SP);
388 XPUSHs (sv); 407 XPUSHs (sv);
389 PUTBACK; 408 PUTBACK;
390 409
391 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 410 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
392 croak ("Storable::mstore didn't return a single scalar"); 411 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
393 412
394 SPAGAIN; 413 SPAGAIN;
395 414
396 if (deref) 415 if (deref)
397 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs)))); 416 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
… …
424 goto redo; 443 goto redo;
425 444
426 case MAGIC_R: 445 case MAGIC_R:
427 handle_MAGIC_R: 446 handle_MAGIC_R:
428 if (!storable_mstore) 447 if (!storable_mstore)
448 {
449 PUTBACK;
429 need_storable (); 450 need_storable ();
451 SPAGAIN;
452 }
430 453
431 PUSHMARK (SP); 454 PUSHMARK (SP);
432 XPUSHs (sv); 455 XPUSHs (sv);
433 PUTBACK; 456 PUTBACK;
434 457
435 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 458 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
436 croak ("Storable::mstore didn't return a single scalar"); 459 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
437 460
438 SPAGAIN; 461 SPAGAIN;
439 462
440 if (deref) 463 if (deref)
441 { 464 {
… …
445 SvPVX (sv)[0] = MAGIC_R_deref; 468 SvPVX (sv)[0] = MAGIC_R_deref;
446 } 469 }
447 else 470 else
448 SETs (sv_2mortal (newSVsv (TOPs))); 471 SETs (sv_2mortal (newSVsv (TOPs)));
449 472
450 break; 473 break;
451 474
452 default: 475 default:
453 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 476 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
454 } 477 }
455 } 478 }

Diff Legend

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