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.21 by root, Wed Sep 27 15:52:47 2006 UTC vs.
Revision 1.29 by root, Wed Dec 17 00:36:09 2008 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#define LZF_STANDALONE 1
6/* SvPV_nolen() macro first defined in 5.005_55 */ 6#define LZF_STATE_ARG 1
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 7
17#include "lzf_c.c" 8#include "lzf_c.c"
18#include "lzf_d.c" 9#include "lzf_d.c"
19 10
20/* we re-use the storable header for our purposes */ 11/* we re-use the storable header for our purposes */
… …
41#endif 32#endif
42 33
43static SV * 34static SV *
44compress_sv (SV *data, char cprepend, int uprepend) 35compress_sv (SV *data, char cprepend, int uprepend)
45{ 36{
37 LZF_STATE *state;
46 STRLEN usize, csize; 38 STRLEN usize, csize;
47 char *src = (char *)SvPV (data, usize); 39 char *src = (char *)SvPVbyte (data, usize);
48 40
49 if (usize) 41 if (usize)
50 { 42 {
51 SV *ret = NEWSV (0, usize + 1); 43 SV *ret = NEWSV (0, usize + 1);
52 unsigned char *dst; 44 unsigned char *dst;
… …
98 dst[skip++] = (( usize & 0x3f) | 0x80); 90 dst[skip++] = (( usize & 0x3f) | 0x80);
99 } 91 }
100 else 92 else
101 croak ("compress can only compress up to %ld bytes", 0x7fffffffL); 93 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
102 94
95 New (0, state, 1, LZF_STATE);
96 if (!state)
97 croak ("Compress::LZF unable to allocate memory for compression state");
98
103 /* 11 bytes is the smallest compressible string */ 99 /* 11 bytes is the smallest compressible string */
104 csize = usize < 11 ? 0 : 100 csize = usize < 11 ? 0 :
105 lzf_compress (src, usize, 101 lzf_compress (src, usize, dst + skip, usize - skip, *state);
106 dst + skip, 102
107 usize - skip); 103 Safefree (state);
108 104
109 if (csize) 105 if (csize)
110 { 106 {
111 SvCUR_set (ret, csize + skip); 107 SvCUR_set (ret, csize + skip);
112 } 108 }
… …
132 128
133static SV * 129static SV *
134decompress_sv (SV *data, int skip) 130decompress_sv (SV *data, int skip)
135{ 131{
136 STRLEN usize, csize; 132 STRLEN usize, csize;
137 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 133 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
138 134
139 if (csize) 135 if (csize)
140 { 136 {
141 void *dst; 137 void *dst;
142 SV *ret; 138 SV *ret;
… …
199 ret = NEWSV (0, usize); 195 ret = NEWSV (0, usize);
200 SvPOK_only (ret); 196 SvPOK_only (ret);
201 dst = SvPVX (ret); 197 dst = SvPVX (ret);
202 198
203 if (lzf_decompress (src, csize, dst, usize) != usize) 199 if (lzf_decompress (src, csize, dst, usize) != usize)
200 {
201 SvREFCNT_dec (ret);
204 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 202 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
203 }
205 } 204 }
206 else 205 else
207 { 206 {
208 usize = csize - 1; 207 usize = csize - 1;
209 ret = NEWSV (0, usize | 1); 208 ret = NEWSV (0, usize | 1);
… …
219 else 218 else
220 return newSVpvn ("", 0); 219 return newSVpvn ("", 0);
221} 220}
222 221
223static void 222static void
224need_storable(void) 223need_storable (void)
225{ 224{
226#if PATCHLEVEL < 6 225 eval_sv (sv_2mortal (Perl_newSVpvf ("require %s", SvPVbyte_nolen (serializer_package))), G_VOID | G_DISCARD);
227 char req[8192];
228 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
229 perl_eval_pv (req, 1);
230#else
231 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
232#endif
233 226
234 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV)); 227 storable_mstore = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mstore ), TRUE, SVt_PVCV)));
235 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV)); 228 storable_mretrieve = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV)));
236} 229}
237 230
238MODULE = Compress::LZF PACKAGE = Compress::LZF 231MODULE = Compress::LZF PACKAGE = Compress::LZF
239 232
240BOOT: 233BOOT:
… …
250 PROTOTYPE: $$$ 243 PROTOTYPE: $$$
251 PPCODE: 244 PPCODE:
252 SvSetSV (serializer_package , package ); 245 SvSetSV (serializer_package , package );
253 SvSetSV (serializer_mstore , mstore ); 246 SvSetSV (serializer_mstore , mstore );
254 SvSetSV (serializer_mretrieve, mretrieve); 247 SvSetSV (serializer_mretrieve, mretrieve);
255 storable_mstore = 248 SvREFCNT_dec (storable_mstore ); storable_mstore = 0;
256 storable_mretrieve = 0; 249 SvREFCNT_dec (storable_mretrieve); storable_mretrieve = 0;
257 250
258void 251void
259compress(data) 252compress(data)
260 SV * data 253 SV * data
261 PROTOTYPE: $ 254 PROTOTYPE: $
… …
281 SvGETMAGIC (sv); 274 SvGETMAGIC (sv);
282 275
283 if (!SvOK (sv)) 276 if (!SvOK (sv))
284 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 277 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
285 else if (SvROK (sv) 278 else if (SvROK (sv)
279 || SvUTF8 (sv)
286 || (SvTYPE(sv) != SVt_IV 280 || (SvTYPE(sv) != SVt_IV
287 && SvTYPE(sv) != SVt_NV 281 && SvTYPE(sv) != SVt_NV
288 && SvTYPE(sv) != SVt_PV 282 && SvTYPE(sv) != SVt_PV
289 && SvTYPE(sv) != SVt_PVIV 283 && SvTYPE(sv) != SVt_PVIV
290 && SvTYPE(sv) != SVt_PVNV 284 && SvTYPE(sv) != SVt_PVNV
291 && SvTYPE(sv) != SVt_PVMG)) /* mstore */ 285 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
292 { 286 {
293 int deref = !SvROK (sv); 287 int deref = !SvROK (sv);
288 char *pv;
294 289
295 if (!storable_mstore) 290 if (!storable_mstore)
291 {
292 PUTBACK;
296 need_storable (); 293 need_storable ();
294 SPAGAIN;
295 }
297 296
298 if (deref) 297 if (deref)
299 sv = newRV_noinc (sv); 298 sv = newRV_noinc (sv);
300 299
301 PUSHMARK (SP); 300 PUSHMARK (SP);
302 XPUSHs (sv); 301 XPUSHs (sv);
303 PUTBACK; 302 PUTBACK;
304 303
305 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR)) 304 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR))
306 croak ("Storable::mstore didn't return a single scalar"); 305 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mstore));
307 306
308 SPAGAIN; 307 SPAGAIN;
309 308
310 sv = POPs; 309 sv = POPs;
310 pv = SvPV_nolen (sv);
311 311
312 if (SvPVX (sv)[0] == MAGIC_R) 312 if (*pv == MAGIC_R)
313 { 313 {
314 if (deref) 314 if (deref)
315 SvPVX (sv)[0] = MAGIC_R_deref; 315 *pv = MAGIC_R_deref;
316 } 316 }
317 else 317 else
318 { 318 {
319 char pfx[2]; 319 char pfx[2];
320 320
… …
350{ 350{
351 STRLEN svlen; 351 STRLEN svlen;
352 int deref = 0; 352 int deref = 0;
353 353
354 SvGETMAGIC (sv); 354 SvGETMAGIC (sv);
355 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI)) 355 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
356 { 356 {
357 redo: 357 redo:
358 358
359 switch (SvPVX (sv)[0]) 359 switch (SvPVX (sv)[0])
360 { 360 {
… …
369 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 369 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
370 370
371 sv_chop (sv, SvPVX (sv) + 2); 371 sv_chop (sv, SvPVX (sv) + 2);
372 372
373 if (!storable_mstore) 373 if (!storable_mstore)
374 {
375 PUTBACK;
374 need_storable (); 376 need_storable ();
377 SPAGAIN;
378 }
375 379
376 PUSHMARK (SP); 380 PUSHMARK (SP);
377 XPUSHs (sv); 381 XPUSHs (sv);
378 PUTBACK; 382 PUTBACK;
379 383
380 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 384 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
381 croak ("Storable::mstore didn't return a single scalar"); 385 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
382 386
383 SPAGAIN; 387 SPAGAIN;
384 388
385 if (deref) 389 if (deref)
386 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs)))); 390 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
… …
413 goto redo; 417 goto redo;
414 418
415 case MAGIC_R: 419 case MAGIC_R:
416 handle_MAGIC_R: 420 handle_MAGIC_R:
417 if (!storable_mstore) 421 if (!storable_mstore)
422 {
423 PUTBACK;
418 need_storable (); 424 need_storable ();
425 SPAGAIN;
426 }
419 427
420 PUSHMARK (SP); 428 PUSHMARK (SP);
421 XPUSHs (sv); 429 XPUSHs (sv);
422 PUTBACK; 430 PUTBACK;
423 431
424 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 432 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
425 croak ("Storable::mstore didn't return a single scalar"); 433 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
426 434
427 SPAGAIN; 435 SPAGAIN;
428 436
429 if (deref) 437 if (deref)
430 { 438 {

Diff Legend

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