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.20 by root, Fri Jul 7 15:47:10 2006 UTC vs.
Revision 1.31 by root, Sun Aug 25 18:13:26 2013 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"
10#include "lzf_c_best.c"
19 11
20/* we re-use the storable header for our purposes */ 12/* we re-use the storable header for our purposes */
21#define MAGIC_LO 0 13#define MAGIC_LO 0
22#define MAGIC_U 0 /* uncompressed data follows */ 14#define MAGIC_U 0 /* uncompressed data follows */
23#define MAGIC_C 1 /* compressed data follows */ 15#define MAGIC_C 1 /* compressed data follows */
… …
39#else 31#else
40# define MAX_LENGTH ((Size_t) 0x8000000L) 32# define MAX_LENGTH ((Size_t) 0x8000000L)
41#endif 33#endif
42 34
43static SV * 35static SV *
44compress_sv (SV *data, char cprepend, int uprepend) 36compress_sv (SV *data, char cprepend, int uprepend, int best)
45{ 37{
38 LZF_STATE *state;
46 STRLEN usize, csize; 39 STRLEN usize, csize;
47 char *src = (char *)SvPV (data, usize); 40 char *src = (char *)SvPVbyte (data, usize);
48 41
49 if (usize) 42 if (usize)
50 { 43 {
51 SV *ret = NEWSV (0, usize + 1); 44 SV *ret = NEWSV (0, usize + 1);
52 unsigned char *dst; 45 unsigned char *dst;
… …
60 53
61 if (usize <= 0x7f) 54 if (usize <= 0x7f)
62 { 55 {
63 dst[skip++] = usize; 56 dst[skip++] = usize;
64 } 57 }
65 else if (usize <= 0x7ff) 58 else if (usize <= 0x7ff)
66 { 59 {
67 dst[skip++] = (( usize >> 6) | 0xc0); 60 dst[skip++] = (( usize >> 6) | 0xc0);
68 dst[skip++] = (( usize & 0x3f) | 0x80); 61 dst[skip++] = (( usize & 0x3f) | 0x80);
69 } 62 }
70 else if (usize <= 0xffff) 63 else if (usize <= 0xffff)
… …
98 dst[skip++] = (( usize & 0x3f) | 0x80); 91 dst[skip++] = (( usize & 0x3f) | 0x80);
99 } 92 }
100 else 93 else
101 croak ("compress can only compress up to %ld bytes", 0x7fffffffL); 94 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
102 95
96 New (0, state, 1, LZF_STATE);
97 if (!state)
98 croak ("Compress::LZF unable to allocate memory for compression state");
99
103 /* 11 bytes is the smallest compressible string */ 100 /* 11 bytes is the smallest compressible string */
104 csize = usize < 11 ? 0 : 101 csize = usize < 11 ? 0 :
105 lzf_compress (src, usize, 102 (best ? lzf_compress_best (src, usize, dst + skip, usize - skip)
106 dst + skip, 103 : lzf_compress (src, usize, dst + skip, usize - skip, *state));
107 usize - skip); 104
105 Safefree (state);
108 106
109 if (csize) 107 if (csize)
110 { 108 {
111 SvCUR_set (ret, csize + skip); 109 SvCUR_set (ret, csize + skip);
112 } 110 }
… …
132 130
133static SV * 131static SV *
134decompress_sv (SV *data, int skip) 132decompress_sv (SV *data, int skip)
135{ 133{
136 STRLEN usize, csize; 134 STRLEN usize, csize;
137 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 135 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
138 136
139 if (csize) 137 if (csize)
140 { 138 {
141 void *dst; 139 void *dst;
142 SV *ret; 140 SV *ret;
143 141
144 csize -= skip; 142 csize -= skip;
145 143
146 if (src[0]) 144 if (src[0])
147 { 145 {
148 if (!(src[0] & 0x80)) 146 if (!(src[0] & 0x80) && csize >= 1)
149 { 147 {
150 csize -= 1; 148 csize -= 1;
151 usize = *src++ & 0xff; 149 usize = *src++ & 0xff;
152 } 150 }
153 else if (!(src[0] & 0x20)) 151 else if (!(src[0] & 0x20) && csize >= 2)
154 { 152 {
155 csize -= 2; 153 csize -= 2;
156 usize = *src++ & 0x1f; 154 usize = *src++ & 0x1f;
157 usize = (usize << 6) | (*src++ & 0x3f); 155 usize = (usize << 6) | (*src++ & 0x3f);
158 } 156 }
159 else if (!(src[0] & 0x10)) 157 else if (!(src[0] & 0x10) && csize >= 3)
160 { 158 {
161 csize -= 3; 159 csize -= 3;
162 usize = *src++ & 0x0f; 160 usize = *src++ & 0x0f;
163 usize = (usize << 6) | (*src++ & 0x3f); 161 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 162 usize = (usize << 6) | (*src++ & 0x3f);
165 } 163 }
166 else if (!(src[0] & 0x08)) 164 else if (!(src[0] & 0x08) && csize >= 4)
167 { 165 {
168 csize -= 4; 166 csize -= 4;
169 usize = *src++ & 0x07; 167 usize = *src++ & 0x07;
170 usize = (usize << 6) | (*src++ & 0x3f); 168 usize = (usize << 6) | (*src++ & 0x3f);
171 usize = (usize << 6) | (*src++ & 0x3f); 169 usize = (usize << 6) | (*src++ & 0x3f);
172 usize = (usize << 6) | (*src++ & 0x3f); 170 usize = (usize << 6) | (*src++ & 0x3f);
173 } 171 }
174 else if (!(src[0] & 0x04)) 172 else if (!(src[0] & 0x04) && csize >= 5)
175 { 173 {
176 csize -= 5; 174 csize -= 5;
177 usize = *src++ & 0x03; 175 usize = *src++ & 0x03;
178 usize = (usize << 6) | (*src++ & 0x3f); 176 usize = (usize << 6) | (*src++ & 0x3f);
179 usize = (usize << 6) | (*src++ & 0x3f); 177 usize = (usize << 6) | (*src++ & 0x3f);
180 usize = (usize << 6) | (*src++ & 0x3f); 178 usize = (usize << 6) | (*src++ & 0x3f);
181 usize = (usize << 6) | (*src++ & 0x3f); 179 usize = (usize << 6) | (*src++ & 0x3f);
182 } 180 }
183 else if (!(src[0] & 0x02)) 181 else if (!(src[0] & 0x02) && csize >= 6)
184 { 182 {
185 csize -= 6; 183 csize -= 6;
186 usize = *src++ & 0x01; 184 usize = *src++ & 0x01;
187 usize = (usize << 6) | (*src++ & 0x3f); 185 usize = (usize << 6) | (*src++ & 0x3f);
188 usize = (usize << 6) | (*src++ & 0x3f); 186 usize = (usize << 6) | (*src++ & 0x3f);
189 usize = (usize << 6) | (*src++ & 0x3f); 187 usize = (usize << 6) | (*src++ & 0x3f);
190 usize = (usize << 6) | (*src++ & 0x3f); 188 usize = (usize << 6) | (*src++ & 0x3f);
191 usize = (usize << 6) | (*src++ & 0x3f); 189 usize = (usize << 6) | (*src++ & 0x3f);
192 } 190 }
193 else 191 else
192 croak ("compressed data corrupted (invalid length)");
193
194 if (!usize)
194 croak ("compressed data corrupted (invalid length)"); 195 croak ("compressed data corrupted (invalid length)");
195 196
196 ret = NEWSV (0, usize); 197 ret = NEWSV (0, usize);
197 SvPOK_only (ret); 198 SvPOK_only (ret);
198 dst = SvPVX (ret); 199 dst = SvPVX (ret);
199 200
200 if (lzf_decompress (src, csize, dst, usize) != usize) 201 if (lzf_decompress (src, csize, dst, usize) != usize)
202 {
203 SvREFCNT_dec (ret);
201 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 204 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
205 }
202 } 206 }
203 else 207 else
204 { 208 {
205 usize = csize - 1; 209 usize = csize - 1;
206 ret = NEWSV (0, usize); 210 ret = NEWSV (0, usize | 1);
207 SvPOK_only (ret); 211 SvPOK_only (ret);
208 212
209 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 213 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
210 } 214 }
211 215
… …
216 else 220 else
217 return newSVpvn ("", 0); 221 return newSVpvn ("", 0);
218} 222}
219 223
220static void 224static void
221need_storable(void) 225need_storable (void)
222{ 226{
223#if PATCHLEVEL < 6 227 eval_sv (sv_2mortal (newSVpvf ("require %s", SvPVbyte_nolen (serializer_package))), G_VOID | G_DISCARD);
224 char req[8192];
225 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
226 perl_eval_pv (req, 1);
227#else
228 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
229#endif
230 228
231 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV)); 229 storable_mstore = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mstore ), TRUE, SVt_PVCV)));
232 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV)); 230 storable_mretrieve = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV)));
233} 231}
234 232
235MODULE = Compress::LZF PACKAGE = Compress::LZF 233MODULE = Compress::LZF PACKAGE = Compress::LZF
236 234
237BOOT: 235BOOT:
… …
247 PROTOTYPE: $$$ 245 PROTOTYPE: $$$
248 PPCODE: 246 PPCODE:
249 SvSetSV (serializer_package , package ); 247 SvSetSV (serializer_package , package );
250 SvSetSV (serializer_mstore , mstore ); 248 SvSetSV (serializer_mstore , mstore );
251 SvSetSV (serializer_mretrieve, mretrieve); 249 SvSetSV (serializer_mretrieve, mretrieve);
252 storable_mstore = 250 SvREFCNT_dec (storable_mstore ); storable_mstore = 0;
253 storable_mretrieve = 0; 251 SvREFCNT_dec (storable_mretrieve); storable_mretrieve = 0;
254 252
255void 253void
256compress(data) 254compress(data)
257 SV * data 255 SV * data
256 ALIAS:
257 compress_best = 1
258 PROTOTYPE: $ 258 PROTOTYPE: $
259 PPCODE: 259 PPCODE:
260 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U))); 260 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U, ix)));
261 261
262void 262void
263decompress(data) 263decompress(data)
264 SV * data 264 SV * data
265 PROTOTYPE: $ 265 PROTOTYPE: $
… …
268 268
269void 269void
270sfreeze(sv) 270sfreeze(sv)
271 SV * sv 271 SV * sv
272 ALIAS: 272 ALIAS:
273 sfreeze = 0
273 sfreeze_cr = 1 274 sfreeze_cr = 1
274 sfreeze_c = 2 275 sfreeze_c = 2
276 sfreeze_best = 4
277 sfreeze_cr_best = 5
278 sfreeze_c_best = 6
275 PROTOTYPE: $ 279 PROTOTYPE: $
276 PPCODE: 280 PPCODE:
281{
282 int best = ix & 4;
283 ix &= 3;
277 284
278 SvGETMAGIC (sv); 285 SvGETMAGIC (sv);
279 286
280 if (!SvOK (sv)) 287 if (!SvOK (sv))
281 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 288 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
282 else if (SvROK (sv) 289 else if (SvROK (sv)
290 || SvUTF8 (sv)
283 || (SvTYPE(sv) != SVt_IV 291 || (SvTYPE(sv) != SVt_IV
284 && SvTYPE(sv) != SVt_NV 292 && SvTYPE(sv) != SVt_NV
285 && SvTYPE(sv) != SVt_PV 293 && SvTYPE(sv) != SVt_PV
286 && SvTYPE(sv) != SVt_PVIV 294 && SvTYPE(sv) != SVt_PVIV
287 && SvTYPE(sv) != SVt_PVNV 295 && SvTYPE(sv) != SVt_PVNV
288 && SvTYPE(sv) != SVt_PVMG)) /* mstore */ 296 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
289 { 297 {
290 int deref = !SvROK (sv); 298 int deref = !SvROK (sv);
299 char *pv;
291 300
292 if (!storable_mstore) 301 if (!storable_mstore)
302 {
303 PUTBACK;
293 need_storable (); 304 need_storable ();
305 SPAGAIN;
306 }
294 307
295 if (deref) 308 if (deref)
296 sv = newRV_noinc (sv); 309 sv = newRV_noinc (sv);
297 310
298 PUSHMARK (SP); 311 PUSHMARK (SP);
299 XPUSHs (sv); 312 XPUSHs (sv);
300 PUTBACK; 313 PUTBACK;
301 314
302 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR)) 315 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR))
303 croak ("Storable::mstore didn't return a single scalar"); 316 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mstore));
304 317
305 SPAGAIN; 318 SPAGAIN;
306 319
307 sv = POPs; 320 sv = POPs;
321 pv = SvPV_nolen (sv);
308 322
309 if (SvPVX (sv)[0] == MAGIC_R) 323 if (*pv == MAGIC_R)
310 { 324 {
311 if (deref) 325 if (deref)
312 SvPVX (sv)[0] = MAGIC_R_deref; 326 *pv = MAGIC_R_deref;
313 } 327 }
314 else 328 else
315 { 329 {
316 char pfx[2]; 330 char pfx[2];
317 331
… …
320 334
321 sv_insert (sv, 0, 0, pfx, 2); 335 sv_insert (sv, 0, 0, pfx, 2);
322 } 336 }
323 337
324 if (ix) /* compress */ 338 if (ix) /* compress */
325 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 339 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1, best));
326 340
327 XPUSHs (sv); 341 XPUSHs (sv);
328 } 342 }
329 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 343 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
330 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */ 344 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U, best))); /* need to prefix only */
331 else if (ix == 2) /* compress always */ 345 else if (ix == 2) /* compress always */
332 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1))); 346 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1, best)));
333 else if (SvNIOK (sv)) /* don't compress */ 347 else if (SvNIOK (sv)) /* don't compress */
334 { 348 {
335 STRLEN len; 349 STRLEN len;
336 char *s = SvPV (sv, len); 350 char *s = SvPV (sv, len);
337 XPUSHs (sv_2mortal (newSVpvn (s, len))); 351 XPUSHs (sv_2mortal (newSVpvn (s, len)));
338 } 352 }
339 else /* don't compress */ 353 else /* don't compress */
340 XPUSHs (sv_2mortal (newSVsv (sv))); 354 XPUSHs (sv_2mortal (newSVsv (sv)));
355}
341 356
342void 357void
343sthaw(sv) 358sthaw(sv)
344 SV * sv 359 SV * sv
345 PROTOTYPE: $ 360 PROTOTYPE: $
… …
347{ 362{
348 STRLEN svlen; 363 STRLEN svlen;
349 int deref = 0; 364 int deref = 0;
350 365
351 SvGETMAGIC (sv); 366 SvGETMAGIC (sv);
352 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI)) 367 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
353 { 368 {
354 redo: 369 redo:
355 370
356 switch (SvPVX (sv)[0]) 371 switch (SvPVX (sv)[0])
357 { 372 {
… …
366 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 381 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
367 382
368 sv_chop (sv, SvPVX (sv) + 2); 383 sv_chop (sv, SvPVX (sv) + 2);
369 384
370 if (!storable_mstore) 385 if (!storable_mstore)
386 {
387 PUTBACK;
371 need_storable (); 388 need_storable ();
389 SPAGAIN;
390 }
372 391
373 PUSHMARK (SP); 392 PUSHMARK (SP);
374 XPUSHs (sv); 393 XPUSHs (sv);
375 PUTBACK; 394 PUTBACK;
376 395
377 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 396 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
378 croak ("Storable::mstore didn't return a single scalar"); 397 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
379 398
380 SPAGAIN; 399 SPAGAIN;
381 400
382 if (deref) 401 if (deref)
383 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs)))); 402 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
… …
410 goto redo; 429 goto redo;
411 430
412 case MAGIC_R: 431 case MAGIC_R:
413 handle_MAGIC_R: 432 handle_MAGIC_R:
414 if (!storable_mstore) 433 if (!storable_mstore)
434 {
435 PUTBACK;
415 need_storable (); 436 need_storable ();
437 SPAGAIN;
438 }
416 439
417 PUSHMARK (SP); 440 PUSHMARK (SP);
418 XPUSHs (sv); 441 XPUSHs (sv);
419 PUTBACK; 442 PUTBACK;
420 443
421 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 444 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
422 croak ("Storable::mstore didn't return a single scalar"); 445 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
423 446
424 SPAGAIN; 447 SPAGAIN;
425 448
426 if (deref) 449 if (deref)
427 { 450 {

Diff Legend

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