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

Diff Legend

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