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.18 by pcg, Tue Aug 3 15:04:05 2004 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
17#define HLOG 15
18#define ULTRA_FAST 0
19 7
20#include "lzf_c.c" 8#include "lzf_c.c"
21#include "lzf_d.c" 9#include "lzf_d.c"
22 10
23/* we re-use the storable header for our purposes */ 11/* we re-use the storable header for our purposes */
… …
28#define MAGIC_CR 3 /* storable (reference, freeze), compressed */ 16#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
29#define MAGIC_R 4 /* storable (reference, freeze) */ 17#define MAGIC_R 4 /* storable (reference, freeze) */
30#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */ 18#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
31#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */ 19#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
32#define MAGIC_HI 7 /* room for one higher storable major */ 20#define MAGIC_HI 7 /* room for one higher storable major */
21/* for historical reasons, MAGIC_undef + MAGIC_R and MAGIC_undef + MAGIC_R_deref are used, too */
33 22
34#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l)) 23#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
35 24
36static SV *serializer_package, *serializer_mstore, *serializer_mretrieve; 25static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
37static CV *storable_mstore, *storable_mretrieve; 26static CV *storable_mstore, *storable_mretrieve;
27
28#if Size_t_size > 4
29# define MAX_LENGTH ((Size_t)0x80000000L)
30#else
31# define MAX_LENGTH ((Size_t) 0x8000000L)
32#endif
38 33
39static SV * 34static SV *
40compress_sv (SV *data, char cprepend, int uprepend) 35compress_sv (SV *data, char cprepend, int uprepend)
41{ 36{
37 LZF_STATE *state;
42 STRLEN usize, csize; 38 STRLEN usize, csize;
43 char *src = (char *)SvPV (data, usize); 39 char *src = (char *)SvPVbyte (data, usize);
44 40
45 if (usize) 41 if (usize)
46 { 42 {
47 SV *ret = NEWSV (0, usize + 1); 43 SV *ret = NEWSV (0, usize + 1);
48 unsigned char *dst; 44 unsigned char *dst;
… …
52 dst = (unsigned char *)SvPVX (ret); 48 dst = (unsigned char *)SvPVX (ret);
53 49
54 if (cprepend) 50 if (cprepend)
55 dst[skip++] = cprepend; 51 dst[skip++] = cprepend;
56 52
57 if (usize < 0x80) 53 if (usize <= 0x7f)
58 { 54 {
59 dst[skip++] = usize; 55 dst[skip++] = usize;
60 } 56 }
61 else if (usize < 0x800) 57 else if (usize <= 0x7ff)
62 { 58 {
63 dst[skip++] = (( usize >> 6) | 0xc0); 59 dst[skip++] = (( usize >> 6) | 0xc0);
64 dst[skip++] = (( usize & 0x3f) | 0x80); 60 dst[skip++] = (( usize & 0x3f) | 0x80);
65 } 61 }
66 else if (usize < 0x10000) 62 else if (usize <= 0xffff)
67 { 63 {
68 dst[skip++] = (( usize >> 12) | 0xe0); 64 dst[skip++] = (( usize >> 12) | 0xe0);
69 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 65 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
70 dst[skip++] = (( usize & 0x3f) | 0x80); 66 dst[skip++] = (( usize & 0x3f) | 0x80);
71 } 67 }
72 else if (usize < 0x200000) 68 else if (usize <= 0x1fffff)
73 { 69 {
74 dst[skip++] = (( usize >> 18) | 0xf0); 70 dst[skip++] = (( usize >> 18) | 0xf0);
75 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 71 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
76 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 72 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
77 dst[skip++] = (( usize & 0x3f) | 0x80); 73 dst[skip++] = (( usize & 0x3f) | 0x80);
78 } 74 }
79 else if (usize < 0x4000000) 75 else if (usize <= 0x3ffffff)
80 { 76 {
81 dst[skip++] = (( usize >> 24) | 0xf8); 77 dst[skip++] = (( usize >> 24) | 0xf8);
82 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 78 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
83 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 79 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
84 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 80 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
85 dst[skip++] = (( usize & 0x3f) | 0x80); 81 dst[skip++] = (( usize & 0x3f) | 0x80);
86 } 82 }
83 else if (usize <= 0x7fffffff)
84 {
85 dst[skip++] = (( usize >> 30) | 0xfc);
86 dst[skip++] = (((usize >> 24) & 0x3f) | 0x80);
87 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
88 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
89 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
90 dst[skip++] = (( usize & 0x3f) | 0x80);
91 }
87 else 92 else
88 croak ("compress can only compress up to %ld bytes", 0x4000000-1); 93 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
94
95 New (0, state, 1, LZF_STATE);
96 if (!state)
97 croak ("Compress::LZF unable to allocate memory for compression state");
89 98
90 /* 11 bytes is the smallest compressible string */ 99 /* 11 bytes is the smallest compressible string */
91 csize = usize < 11 ? 0 : 100 csize = usize < 11 ? 0 :
92 lzf_compress (src, usize, 101 lzf_compress (src, usize, dst + skip, usize - skip, *state);
93 dst + skip, 102
94 usize - skip); 103 Safefree (state);
95 104
96 if (csize) 105 if (csize)
97 { 106 {
98 SvCUR_set (ret, csize + skip); 107 SvCUR_set (ret, csize + skip);
99 } 108 }
… …
119 128
120static SV * 129static SV *
121decompress_sv (SV *data, int skip) 130decompress_sv (SV *data, int skip)
122{ 131{
123 STRLEN usize, csize; 132 STRLEN usize, csize;
124 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 133 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
125 134
126 if (csize) 135 if (csize)
127 { 136 {
128 void *dst; 137 void *dst;
129 SV *ret; 138 SV *ret;
130 139
131 csize -= skip; 140 csize -= skip;
132 141
133 if (src[0]) 142 if (src[0])
134 { 143 {
135 if (!(src[0] & 0x80)) 144 if (!(src[0] & 0x80) && csize >= 1)
136 { 145 {
137 csize -= 1; 146 csize -= 1;
138 usize = *src++ & 0xff; 147 usize = *src++ & 0xff;
139 } 148 }
140 else if (!(src[0] & 0x20)) 149 else if (!(src[0] & 0x20) && csize >= 2)
141 { 150 {
142 csize -= 2; 151 csize -= 2;
143 usize = *src++ & 0x1f; 152 usize = *src++ & 0x1f;
144 usize = (usize << 6) | (*src++ & 0x3f); 153 usize = (usize << 6) | (*src++ & 0x3f);
145 } 154 }
146 else if (!(src[0] & 0x10)) 155 else if (!(src[0] & 0x10) && csize >= 3)
147 { 156 {
148 csize -= 3; 157 csize -= 3;
149 usize = *src++ & 0x0f; 158 usize = *src++ & 0x0f;
150 usize = (usize << 6) | (*src++ & 0x3f); 159 usize = (usize << 6) | (*src++ & 0x3f);
151 usize = (usize << 6) | (*src++ & 0x3f); 160 usize = (usize << 6) | (*src++ & 0x3f);
152 } 161 }
153 else if (!(src[0] & 0x08)) 162 else if (!(src[0] & 0x08) && csize >= 4)
154 { 163 {
155 csize -= 4; 164 csize -= 4;
156 usize = *src++ & 0x07; 165 usize = *src++ & 0x07;
157 usize = (usize << 6) | (*src++ & 0x3f); 166 usize = (usize << 6) | (*src++ & 0x3f);
158 usize = (usize << 6) | (*src++ & 0x3f); 167 usize = (usize << 6) | (*src++ & 0x3f);
159 usize = (usize << 6) | (*src++ & 0x3f); 168 usize = (usize << 6) | (*src++ & 0x3f);
160 } 169 }
161 else if (!(src[0] & 0x04)) 170 else if (!(src[0] & 0x04) && csize >= 5)
162 { 171 {
163 csize -= 5; 172 csize -= 5;
164 usize = *src++ & 0x03; 173 usize = *src++ & 0x03;
165 usize = (usize << 6) | (*src++ & 0x3f); 174 usize = (usize << 6) | (*src++ & 0x3f);
166 usize = (usize << 6) | (*src++ & 0x3f); 175 usize = (usize << 6) | (*src++ & 0x3f);
167 usize = (usize << 6) | (*src++ & 0x3f); 176 usize = (usize << 6) | (*src++ & 0x3f);
168 usize = (usize << 6) | (*src++ & 0x3f); 177 usize = (usize << 6) | (*src++ & 0x3f);
169 } 178 }
179 else if (!(src[0] & 0x02) && csize >= 6)
180 {
181 csize -= 6;
182 usize = *src++ & 0x01;
183 usize = (usize << 6) | (*src++ & 0x3f);
184 usize = (usize << 6) | (*src++ & 0x3f);
185 usize = (usize << 6) | (*src++ & 0x3f);
186 usize = (usize << 6) | (*src++ & 0x3f);
187 usize = (usize << 6) | (*src++ & 0x3f);
188 }
170 else 189 else
190 croak ("compressed data corrupted (invalid length)");
191
192 if (!usize)
171 croak ("compressed data corrupted (invalid length)"); 193 croak ("compressed data corrupted (invalid length)");
172 194
173 ret = NEWSV (0, usize); 195 ret = NEWSV (0, usize);
174 SvPOK_only (ret); 196 SvPOK_only (ret);
175 dst = SvPVX (ret); 197 dst = SvPVX (ret);
176 198
177 if (lzf_decompress (src, csize, dst, usize) != usize) 199 if (lzf_decompress (src, csize, dst, usize) != usize)
200 {
201 SvREFCNT_dec (ret);
178 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 202 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
203 }
179 } 204 }
180 else 205 else
181 { 206 {
182 usize = csize - 1; 207 usize = csize - 1;
183 ret = NEWSV (0, usize); 208 ret = NEWSV (0, usize | 1);
184 SvPOK_only (ret); 209 SvPOK_only (ret);
185 210
186 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 211 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
187 } 212 }
188 213
… …
193 else 218 else
194 return newSVpvn ("", 0); 219 return newSVpvn ("", 0);
195} 220}
196 221
197static void 222static void
198need_storable(void) 223need_storable (void)
199{ 224{
200#if PATCHLEVEL < 6 225 eval_sv (sv_2mortal (Perl_newSVpvf ("require %s", SvPVbyte_nolen (serializer_package))), G_VOID | G_DISCARD);
201 char req[8192];
202 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
203 perl_eval_pv (req, 1);
204#else
205 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
206#endif
207 226
208 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)));
209 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)));
210} 229}
211 230
212MODULE = Compress::LZF PACKAGE = Compress::LZF 231MODULE = Compress::LZF PACKAGE = Compress::LZF
213 232
214BOOT: 233BOOT:
215 serializer_package = newSVpv ("Storable", 0); 234 serializer_package = newSVpv ("Storable", 0);
216 serializer_mstore = newSVpv ("Storable::mstore", 0); 235 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
217 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0); 236 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
218 237
219void 238void
220set_serializer(package, mstore, mretrieve) 239set_serializer(package, mstore, mretrieve)
221 SV * package 240 SV * package
… …
224 PROTOTYPE: $$$ 243 PROTOTYPE: $$$
225 PPCODE: 244 PPCODE:
226 SvSetSV (serializer_package , package ); 245 SvSetSV (serializer_package , package );
227 SvSetSV (serializer_mstore , mstore ); 246 SvSetSV (serializer_mstore , mstore );
228 SvSetSV (serializer_mretrieve, mretrieve); 247 SvSetSV (serializer_mretrieve, mretrieve);
229 storable_mstore = 248 SvREFCNT_dec (storable_mstore ); storable_mstore = 0;
230 storable_mretrieve = 0; 249 SvREFCNT_dec (storable_mretrieve); storable_mretrieve = 0;
231 250
232void 251void
233compress(data) 252compress(data)
234 SV * data 253 SV * data
235 PROTOTYPE: $ 254 PROTOTYPE: $
… …
255 SvGETMAGIC (sv); 274 SvGETMAGIC (sv);
256 275
257 if (!SvOK (sv)) 276 if (!SvOK (sv))
258 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 277 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
259 else if (SvROK (sv) 278 else if (SvROK (sv)
279 || SvUTF8 (sv)
260 || (SvTYPE(sv) != SVt_IV 280 || (SvTYPE(sv) != SVt_IV
261 && SvTYPE(sv) != SVt_NV 281 && SvTYPE(sv) != SVt_NV
262 && SvTYPE(sv) != SVt_PV 282 && SvTYPE(sv) != SVt_PV
263 && SvTYPE(sv) != SVt_PVIV 283 && SvTYPE(sv) != SVt_PVIV
264 && SvTYPE(sv) != SVt_PVNV 284 && SvTYPE(sv) != SVt_PVNV
265 && SvTYPE(sv) != SVt_PVMG)) /* mstore */ 285 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
266 { 286 {
267 int deref = !SvROK (sv); 287 int deref = !SvROK (sv);
288 char *pv;
268 289
269 if (!storable_mstore) 290 if (!storable_mstore)
291 {
292 PUTBACK;
270 need_storable (); 293 need_storable ();
294 SPAGAIN;
295 }
271 296
272 if (deref) 297 if (deref)
273 sv = newRV_noinc (sv); 298 sv = newRV_noinc (sv);
274 299
275 PUSHMARK (SP); 300 PUSHMARK (SP);
276 XPUSHs (sv); 301 XPUSHs (sv);
277 PUTBACK; 302 PUTBACK;
278 303
279 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR)) 304 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR))
280 croak ("Storable::mstore didn't return a single scalar"); 305 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mstore));
281 306
282 SPAGAIN; 307 SPAGAIN;
283 308
284 sv = POPs; 309 sv = POPs;
310 pv = SvPV_nolen (sv);
285 311
286 if (SvPVX (sv)[0] != MAGIC_R) 312 if (*pv == MAGIC_R)
287 croak ("Storable format changed, need newer version of Compress::LZF"); 313 {
288
289 if (deref) 314 if (deref)
290 SvPVX (sv)[0] = MAGIC_R_deref; 315 *pv = MAGIC_R_deref;
316 }
317 else
318 {
319 char pfx[2];
320
321 pfx[0] = MAGIC_undef;
322 pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
323
324 sv_insert (sv, 0, 0, pfx, 2);
325 }
291 326
292 if (ix) /* compress */ 327 if (ix) /* compress */
293 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 328 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
294 329
295 XPUSHs (sv); 330 XPUSHs (sv);
… …
310void 345void
311sthaw(sv) 346sthaw(sv)
312 SV * sv 347 SV * sv
313 PROTOTYPE: $ 348 PROTOTYPE: $
314 PPCODE: 349 PPCODE:
315 350{
351 STRLEN svlen;
316 int deref = 0; 352 int deref = 0;
317 353
318 SvGETMAGIC (sv); 354 SvGETMAGIC (sv);
319 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI)) 355 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
320 { 356 {
357 redo:
358
321 switch (SvPVX (sv)[0]) 359 switch (SvPVX (sv)[0])
322 { 360 {
323 case MAGIC_undef: 361 case MAGIC_undef:
362 if (svlen <= 1)
324 XPUSHs (sv_2mortal (NEWSV (0, 0))); 363 XPUSHs (sv_2mortal (NEWSV (0, 0)));
364 else
365 {
366 if (SvPVX (sv)[1] == MAGIC_R_deref)
367 deref = 1;
368 else if (SvPVX (sv)[1] != MAGIC_R)
369 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
370
371 sv_chop (sv, SvPVX (sv) + 2);
372
373 if (!storable_mstore)
374 {
375 PUTBACK;
376 need_storable ();
377 SPAGAIN;
378 }
379
380 PUSHMARK (SP);
381 XPUSHs (sv);
382 PUTBACK;
383
384 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
385 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
386
387 SPAGAIN;
388
389 if (deref)
390 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
391 else
392 SETs (sv_2mortal (newSVsv (TOPs)));
393 }
325 break; 394 break;
326 395
327 case MAGIC_U: 396 case MAGIC_U:
328 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 397 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
329 break; 398 break;
… …
342 case MAGIC_CR: 411 case MAGIC_CR:
343 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 412 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
344 if (deref) 413 if (deref)
345 if (SvPVX (sv)[0] == MAGIC_R_deref) 414 if (SvPVX (sv)[0] == MAGIC_R_deref)
346 SvPVX (sv)[0] = MAGIC_R; 415 SvPVX (sv)[0] = MAGIC_R;
347 else 416
348 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 417 goto redo;
349 418
350 case MAGIC_R: 419 case MAGIC_R:
351 handle_MAGIC_R: 420 handle_MAGIC_R:
352 if (!storable_mstore) 421 if (!storable_mstore)
422 {
423 PUTBACK;
353 need_storable (); 424 need_storable ();
425 SPAGAIN;
426 }
354 427
355 PUSHMARK (SP); 428 PUSHMARK (SP);
356 XPUSHs (sv); 429 XPUSHs (sv);
357 PUTBACK; 430 PUTBACK;
358 431
359 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 432 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
360 croak ("Storable::mstore didn't return a single scalar"); 433 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
361 434
362 SPAGAIN; 435 SPAGAIN;
363 436
364 if (deref) 437 if (deref)
365 { 438 {
… …
377 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 450 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
378 } 451 }
379 } 452 }
380 else 453 else
381 XPUSHs (sv_2mortal (newSVsv (sv))); 454 XPUSHs (sv_2mortal (newSVsv (sv)));
455}
382 456

Diff Legend

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