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.32 by root, Sat Jun 27 19:52:44 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 LZF_STATE *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);
… …
106 97
107 New (0, state, 1, LZF_STATE); 98 New (0, state, 1, LZF_STATE);
108 if (!state) 99 if (!state)
109 croak ("Compress::LZF unable to allocate memory for compression state"); 100 croak ("Compress::LZF unable to allocate memory for compression state");
110 101
102 if (usize > 1000) perlinterp_release ();
111 /* 11 bytes is the smallest compressible string */ 103 /* 11 bytes is the smallest compressible string */
112 csize = usize < 11 ? 0 : 104 csize = usize < 11 ? 0 :
105 (best ? lzf_compress_best (src, usize, dst + skip, usize - skip)
113 lzf_compress (src, usize, dst + skip, usize - skip, *state); 106 : lzf_compress (src, usize, dst + skip, usize - skip, *state));
107 if (usize > 1000) perlinterp_acquire ();
114 108
115 Safefree (state); 109 Safefree (state);
116 110
117 if (csize) 111 if (csize)
118 { 112 {
… …
140 134
141static SV * 135static SV *
142decompress_sv (SV *data, int skip) 136decompress_sv (SV *data, int skip)
143{ 137{
144 STRLEN usize, csize; 138 STRLEN usize, csize;
145 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 139 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
146 140
147 if (csize) 141 if (csize)
148 { 142 {
149 void *dst; 143 void *dst;
150 SV *ret; 144 SV *ret;
145 int res;
151 146
152 csize -= skip; 147 csize -= skip;
153 148
154 if (src[0]) 149 if (src[0])
155 { 150 {
… …
201 else 196 else
202 croak ("compressed data corrupted (invalid length)"); 197 croak ("compressed data corrupted (invalid length)");
203 198
204 if (!usize) 199 if (!usize)
205 croak ("compressed data corrupted (invalid length)"); 200 croak ("compressed data corrupted (invalid length)");
206 201
207 ret = NEWSV (0, usize); 202 ret = NEWSV (0, usize);
208 SvPOK_only (ret); 203 SvPOK_only (ret);
209 dst = SvPVX (ret); 204 dst = SvPVX (ret);
210 205
206 if (usize > 2000) perlinterp_release ();
211 if (lzf_decompress (src, csize, dst, usize) != usize) 207 res = lzf_decompress (src, csize, dst, usize) != usize;
208 if (usize > 2000) perlinterp_acquire ();
209
210 if (res)
212 { 211 {
213 SvREFCNT_dec (ret); 212 SvREFCNT_dec (ret);
214 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 213 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
215 } 214 }
216 } 215 }
… …
230 else 229 else
231 return newSVpvn ("", 0); 230 return newSVpvn ("", 0);
232} 231}
233 232
234static void 233static void
235need_storable(void) 234need_storable (void)
236{ 235{
237#if PATCHLEVEL < 6 236 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 237
245 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)));
246 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)));
247} 240}
248 241
249MODULE = Compress::LZF PACKAGE = Compress::LZF 242MODULE = Compress::LZF PACKAGE = Compress::LZF
250 243
251BOOT: 244BOOT:
… …
261 PROTOTYPE: $$$ 254 PROTOTYPE: $$$
262 PPCODE: 255 PPCODE:
263 SvSetSV (serializer_package , package ); 256 SvSetSV (serializer_package , package );
264 SvSetSV (serializer_mstore , mstore ); 257 SvSetSV (serializer_mstore , mstore );
265 SvSetSV (serializer_mretrieve, mretrieve); 258 SvSetSV (serializer_mretrieve, mretrieve);
266 storable_mstore = 259 SvREFCNT_dec (storable_mstore ); storable_mstore = 0;
267 storable_mretrieve = 0; 260 SvREFCNT_dec (storable_mretrieve); storable_mretrieve = 0;
268 261
269void 262void
270compress(data) 263compress(data)
271 SV * data 264 SV * data
265 ALIAS:
266 compress_best = 1
272 PROTOTYPE: $ 267 PROTOTYPE: $
273 PPCODE: 268 PPCODE:
274 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U))); 269 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U, ix)));
275 270
276void 271void
277decompress(data) 272decompress(data)
278 SV * data 273 SV * data
279 PROTOTYPE: $ 274 PROTOTYPE: $
… …
282 277
283void 278void
284sfreeze(sv) 279sfreeze(sv)
285 SV * sv 280 SV * sv
286 ALIAS: 281 ALIAS:
282 sfreeze = 0
287 sfreeze_cr = 1 283 sfreeze_cr = 1
288 sfreeze_c = 2 284 sfreeze_c = 2
285 sfreeze_best = 4
286 sfreeze_cr_best = 5
287 sfreeze_c_best = 6
289 PROTOTYPE: $ 288 PROTOTYPE: $
290 PPCODE: 289 PPCODE:
290{
291 int best = ix & 4;
292 ix &= 3;
291 293
292 SvGETMAGIC (sv); 294 SvGETMAGIC (sv);
293 295
294 if (!SvOK (sv)) 296 if (!SvOK (sv))
295 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 297 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
296 else if (SvROK (sv) 298 else if (SvROK (sv)
299 || SvUTF8 (sv)
297 || (SvTYPE(sv) != SVt_IV 300 || (SvTYPE(sv) != SVt_IV
298 && SvTYPE(sv) != SVt_NV 301 && SvTYPE(sv) != SVt_NV
299 && SvTYPE(sv) != SVt_PV 302 && SvTYPE(sv) != SVt_PV
300 && SvTYPE(sv) != SVt_PVIV 303 && SvTYPE(sv) != SVt_PVIV
301 && SvTYPE(sv) != SVt_PVNV 304 && SvTYPE(sv) != SVt_PVNV
302 && SvTYPE(sv) != SVt_PVMG)) /* mstore */ 305 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
303 { 306 {
304 int deref = !SvROK (sv); 307 int deref = !SvROK (sv);
308 char *pv;
305 309
306 if (!storable_mstore) 310 if (!storable_mstore)
311 {
312 PUTBACK;
307 need_storable (); 313 need_storable ();
314 SPAGAIN;
315 }
308 316
309 if (deref) 317 if (deref)
310 sv = newRV_noinc (sv); 318 sv = newRV_noinc (sv);
311 319
312 PUSHMARK (SP); 320 PUSHMARK (SP);
313 XPUSHs (sv); 321 XPUSHs (sv);
314 PUTBACK; 322 PUTBACK;
315 323
316 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR)) 324 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR))
317 croak ("Storable::mstore didn't return a single scalar"); 325 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mstore));
318 326
319 SPAGAIN; 327 SPAGAIN;
320 328
321 sv = POPs; 329 sv = POPs;
330 pv = SvPV_nolen (sv);
322 331
323 if (SvPVX (sv)[0] == MAGIC_R) 332 if (*pv == MAGIC_R)
324 { 333 {
325 if (deref) 334 if (deref)
326 SvPVX (sv)[0] = MAGIC_R_deref; 335 *pv = MAGIC_R_deref;
327 } 336 }
328 else 337 else
329 { 338 {
330 char pfx[2]; 339 char pfx[2];
331 340
… …
334 343
335 sv_insert (sv, 0, 0, pfx, 2); 344 sv_insert (sv, 0, 0, pfx, 2);
336 } 345 }
337 346
338 if (ix) /* compress */ 347 if (ix) /* compress */
339 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));
340 349
341 XPUSHs (sv); 350 XPUSHs (sv);
342 } 351 }
343 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))
344 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 */
345 else if (ix == 2) /* compress always */ 354 else if (ix == 2) /* compress always */
346 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1))); 355 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1, best)));
347 else if (SvNIOK (sv)) /* don't compress */ 356 else if (SvNIOK (sv)) /* don't compress */
348 { 357 {
349 STRLEN len; 358 STRLEN len;
350 char *s = SvPV (sv, len); 359 char *s = SvPV (sv, len);
351 XPUSHs (sv_2mortal (newSVpvn (s, len))); 360 XPUSHs (sv_2mortal (newSVpvn (s, len)));
352 } 361 }
353 else /* don't compress */ 362 else /* don't compress */
354 XPUSHs (sv_2mortal (newSVsv (sv))); 363 XPUSHs (sv_2mortal (newSVsv (sv)));
364}
355 365
356void 366void
357sthaw(sv) 367sthaw(sv)
358 SV * sv 368 SV * sv
359 PROTOTYPE: $ 369 PROTOTYPE: $
… …
361{ 371{
362 STRLEN svlen; 372 STRLEN svlen;
363 int deref = 0; 373 int deref = 0;
364 374
365 SvGETMAGIC (sv); 375 SvGETMAGIC (sv);
366 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))
367 { 377 {
368 redo: 378 redo:
369 379
370 switch (SvPVX (sv)[0]) 380 switch (SvPVX (sv)[0])
371 { 381 {
… …
380 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?");
381 391
382 sv_chop (sv, SvPVX (sv) + 2); 392 sv_chop (sv, SvPVX (sv) + 2);
383 393
384 if (!storable_mstore) 394 if (!storable_mstore)
395 {
396 PUTBACK;
385 need_storable (); 397 need_storable ();
398 SPAGAIN;
399 }
386 400
387 PUSHMARK (SP); 401 PUSHMARK (SP);
388 XPUSHs (sv); 402 XPUSHs (sv);
389 PUTBACK; 403 PUTBACK;
390 404
391 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 405 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
392 croak ("Storable::mstore didn't return a single scalar"); 406 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
393 407
394 SPAGAIN; 408 SPAGAIN;
395 409
396 if (deref) 410 if (deref)
397 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs)))); 411 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
… …
424 goto redo; 438 goto redo;
425 439
426 case MAGIC_R: 440 case MAGIC_R:
427 handle_MAGIC_R: 441 handle_MAGIC_R:
428 if (!storable_mstore) 442 if (!storable_mstore)
443 {
444 PUTBACK;
429 need_storable (); 445 need_storable ();
446 SPAGAIN;
447 }
430 448
431 PUSHMARK (SP); 449 PUSHMARK (SP);
432 XPUSHs (sv); 450 XPUSHs (sv);
433 PUTBACK; 451 PUTBACK;
434 452
435 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 453 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
436 croak ("Storable::mstore didn't return a single scalar"); 454 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
437 455
438 SPAGAIN; 456 SPAGAIN;
439 457
440 if (deref) 458 if (deref)
441 { 459 {
… …
445 SvPVX (sv)[0] = MAGIC_R_deref; 463 SvPVX (sv)[0] = MAGIC_R_deref;
446 } 464 }
447 else 465 else
448 SETs (sv_2mortal (newSVsv (TOPs))); 466 SETs (sv_2mortal (newSVsv (TOPs)));
449 467
450 break; 468 break;
451 469
452 default: 470 default:
453 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?");
454 } 472 }
455 } 473 }

Diff Legend

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