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.3 by root, Thu Sep 27 19:51:26 2001 UTC vs.
Revision 1.25 by root, Wed Jan 9 20:41:18 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 */
21#define MAGIC_LO 0 12#define MAGIC_LO 0
22#define MAGIC_U 0 /* uncompressed data follows */ 13#define MAGIC_U 0 /* uncompressed data follows */
23#define MAGIC_C 1 /* compressed data follows */ 14#define MAGIC_C 1 /* compressed data follows */
15#define MAGIC_undef 2 /* the special value undef */
16#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
24#define MAGIC_R 4 /* storable (reference, freeze) */ 17#define MAGIC_R 4 /* storable (reference, freeze) */
25#define MAGIC_CR 3 /* storable (reference, freeze), compressed */ 18#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
19#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
26#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 */
27 22
28#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))
29 24
25static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
30static CV *storable_mstore, *storable_mretrieve; 26static CV *storable_mstore, *storable_mretrieve;
31 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
33
32static SV * 34static SV *
33compress_sv (SV *data, char cprepend, char uprepend) 35compress_sv (SV *data, char cprepend, int uprepend)
34{ 36{
37 LZF_STATE *state;
35 STRLEN usize, csize; 38 STRLEN usize, csize;
36 char *src = (char *)SvPV (data, usize); 39 char *src = (char *)SvPVbyte (data, usize);
37 40
38 if (usize) 41 if (usize)
39 { 42 {
40 SV *ret = NEWSV (0, usize + 1); 43 SV *ret = NEWSV (0, usize + 1);
41 unsigned char *dst; 44 unsigned char *dst;
… …
45 dst = (unsigned char *)SvPVX (ret); 48 dst = (unsigned char *)SvPVX (ret);
46 49
47 if (cprepend) 50 if (cprepend)
48 dst[skip++] = cprepend; 51 dst[skip++] = cprepend;
49 52
50 if (usize < 0x80) 53 if (usize <= 0x7f)
51 { 54 {
52 dst[skip++] = usize; 55 dst[skip++] = usize;
53 } 56 }
54 else if (usize < 0x800) 57 else if (usize <= 0x7ff)
55 { 58 {
56 dst[skip++] = (( usize >> 6) | 0xc0); 59 dst[skip++] = (( usize >> 6) | 0xc0);
57 dst[skip++] = (( usize & 0x3f) | 0x80); 60 dst[skip++] = (( usize & 0x3f) | 0x80);
58 } 61 }
59 else if (usize < 0x10000) 62 else if (usize <= 0xffff)
60 { 63 {
61 dst[skip++] = (( usize >> 12) | 0xe0); 64 dst[skip++] = (( usize >> 12) | 0xe0);
62 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 65 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
63 dst[skip++] = (( usize & 0x3f) | 0x80); 66 dst[skip++] = (( usize & 0x3f) | 0x80);
64 } 67 }
65 else if (usize < 0x200000) 68 else if (usize <= 0x1fffff)
66 { 69 {
67 dst[skip++] = (( usize >> 18) | 0xf0); 70 dst[skip++] = (( usize >> 18) | 0xf0);
68 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 71 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
69 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 72 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
70 dst[skip++] = (( usize & 0x3f) | 0x80); 73 dst[skip++] = (( usize & 0x3f) | 0x80);
71 } 74 }
72 else if (usize < 0x4000000) 75 else if (usize <= 0x3ffffff)
73 { 76 {
74 dst[skip++] = (( usize >> 24) | 0xf8); 77 dst[skip++] = (( usize >> 24) | 0xf8);
75 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 78 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
76 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 79 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
77 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 80 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
78 dst[skip++] = (( usize & 0x3f) | 0x80); 81 dst[skip++] = (( usize & 0x3f) | 0x80);
79 } 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 }
80 else 92 else
81 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");
82 98
83 /* 11 bytes is the smallest compressible string */ 99 /* 11 bytes is the smallest compressible string */
84 csize = usize < 11 ? 0 : 100 csize = usize < 11 ? 0 :
85 lzf_compress (src, usize, 101 lzf_compress (src, usize, dst + skip, usize - skip, *state);
86 dst + skip, 102
87 usize - skip); 103 Safefree (state);
88 104
89 if (csize) 105 if (csize)
90 { 106 {
91 SvCUR_set (ret, csize + skip); 107 SvCUR_set (ret, csize + skip);
92 } 108 }
93 else if (!uprepend) 109 else if (uprepend < 0)
94 { 110 {
95 SvREFCNT_dec (ret); 111 SvREFCNT_dec (ret);
96 ret = SvREFCNT_inc (data); 112 ret = SvREFCNT_inc (data);
97 } 113 }
98 else 114 else
99 { 115 {
100 *dst++ = 0; 116 *dst++ = uprepend;
101 117
102 Move ((void *)src, (void *)dst, usize, unsigned char); 118 Move ((void *)src, (void *)dst, usize, unsigned char);
103 119
104 SvCUR_set (ret, usize + 1); 120 SvCUR_set (ret, usize + 1);
105 } 121 }
… …
112 128
113static SV * 129static SV *
114decompress_sv (SV *data, int skip) 130decompress_sv (SV *data, int skip)
115{ 131{
116 STRLEN usize, csize; 132 STRLEN usize, csize;
117 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 133 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
118 134
119 if (csize) 135 if (csize)
120 { 136 {
121 void *dst; 137 void *dst;
122 SV *ret; 138 SV *ret;
123 139
124 csize -= skip; 140 csize -= skip;
125 141
126 if (src[0]) 142 if (src[0])
127 { 143 {
128 if (!(src[0] & 0x80)) 144 if (!(src[0] & 0x80) && csize >= 1)
129 { 145 {
130 csize -= 1; 146 csize -= 1;
131 usize = *src++ & 0xff; 147 usize = *src++ & 0xff;
132 } 148 }
133 else if (!(src[0] & 0x20)) 149 else if (!(src[0] & 0x20) && csize >= 2)
134 { 150 {
135 csize -= 2; 151 csize -= 2;
136 usize = *src++ & 0x1f; 152 usize = *src++ & 0x1f;
137 usize = (usize << 6) | (*src++ & 0x3f); 153 usize = (usize << 6) | (*src++ & 0x3f);
138 } 154 }
139 else if (!(src[0] & 0x10)) 155 else if (!(src[0] & 0x10) && csize >= 3)
140 { 156 {
141 csize -= 3; 157 csize -= 3;
142 usize = *src++ & 0x0f; 158 usize = *src++ & 0x0f;
143 usize = (usize << 6) | (*src++ & 0x3f); 159 usize = (usize << 6) | (*src++ & 0x3f);
144 usize = (usize << 6) | (*src++ & 0x3f); 160 usize = (usize << 6) | (*src++ & 0x3f);
145 } 161 }
146 else if (!(src[0] & 0x08)) 162 else if (!(src[0] & 0x08) && csize >= 4)
147 { 163 {
148 csize -= 4; 164 csize -= 4;
149 usize = *src++ & 0x07; 165 usize = *src++ & 0x07;
150 usize = (usize << 6) | (*src++ & 0x3f); 166 usize = (usize << 6) | (*src++ & 0x3f);
151 usize = (usize << 6) | (*src++ & 0x3f); 167 usize = (usize << 6) | (*src++ & 0x3f);
152 usize = (usize << 6) | (*src++ & 0x3f); 168 usize = (usize << 6) | (*src++ & 0x3f);
153 } 169 }
154 else if (!(src[0] & 0x04)) 170 else if (!(src[0] & 0x04) && csize >= 5)
155 { 171 {
156 csize -= 5; 172 csize -= 5;
157 usize = *src++ & 0x03; 173 usize = *src++ & 0x03;
158 usize = (usize << 6) | (*src++ & 0x3f); 174 usize = (usize << 6) | (*src++ & 0x3f);
159 usize = (usize << 6) | (*src++ & 0x3f); 175 usize = (usize << 6) | (*src++ & 0x3f);
160 usize = (usize << 6) | (*src++ & 0x3f); 176 usize = (usize << 6) | (*src++ & 0x3f);
161 usize = (usize << 6) | (*src++ & 0x3f); 177 usize = (usize << 6) | (*src++ & 0x3f);
162 } 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 }
163 else 189 else
164 croak ("compressed data corrupted"); 190 croak ("compressed data corrupted (invalid length)");
191
192 if (!usize)
193 croak ("compressed data corrupted (invalid length)");
165 194
166 ret = NEWSV (0, usize); 195 ret = NEWSV (0, usize);
167 SvPOK_only (ret); 196 SvPOK_only (ret);
168 dst = SvPVX (ret); 197 dst = SvPVX (ret);
169 198
170 if (lzf_decompress (src, csize, dst, usize) != usize) 199 if (lzf_decompress (src, csize, dst, usize) != usize)
200 {
201 SvREFCNT_dec (ret);
171 croak ("compressed data corrupted", csize, skip, usize); 202 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
203 }
172 } 204 }
173 else 205 else
174 { 206 {
175 usize = csize - 1; 207 usize = csize - 1;
176 ret = NEWSV (0, usize); 208 ret = NEWSV (0, usize | 1);
177 SvPOK_only (ret); 209 SvPOK_only (ret);
178 210
179 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 211 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
180 } 212 }
181 213
… …
188} 220}
189 221
190static void 222static void
191need_storable(void) 223need_storable(void)
192{ 224{
193#if PATCHLEVEL < 6
194 perl_eval_pv ("require Storable;", 1);
195#else
196 load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv); 225 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
197#endif
198 226
199 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV)); 227 storable_mstore = GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mstore ), TRUE, SVt_PVCV));
200 storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV)); 228 storable_mretrieve = GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
201} 229}
202 230
203MODULE = Compress::LZF PACKAGE = Compress::LZF 231MODULE = Compress::LZF PACKAGE = Compress::LZF
232
233BOOT:
234 serializer_package = newSVpv ("Storable", 0);
235 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
236 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
237
238void
239set_serializer(package, mstore, mretrieve)
240 SV * package
241 SV * mstore
242 SV * mretrieve
243 PROTOTYPE: $$$
244 PPCODE:
245 SvSetSV (serializer_package , package );
246 SvSetSV (serializer_mstore , mstore );
247 SvSetSV (serializer_mretrieve, mretrieve);
248 storable_mstore =
249 storable_mretrieve = 0;
204 250
205void 251void
206compress(data) 252compress(data)
207 SV * data 253 SV * data
208 PROTOTYPE: $ 254 PROTOTYPE: $
209 PPCODE: 255 PPCODE:
210 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 256 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
211 257
212void 258void
213decompress(data) 259decompress(data)
214 SV * data 260 SV * data
215 PROTOTYPE: $ 261 PROTOTYPE: $
… …
223 sfreeze_cr = 1 269 sfreeze_cr = 1
224 sfreeze_c = 2 270 sfreeze_c = 2
225 PROTOTYPE: $ 271 PROTOTYPE: $
226 PPCODE: 272 PPCODE:
227 273
274 SvGETMAGIC (sv);
275
276 if (!SvOK (sv))
277 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
278 else if (SvROK (sv)
279 || SvUTF8 (sv)
228 if (SvTYPE(sv) != SVt_IV 280 || (SvTYPE(sv) != SVt_IV
229 && SvTYPE(sv) != SVt_NV 281 && SvTYPE(sv) != SVt_NV
282 && SvTYPE(sv) != SVt_PV
283 && SvTYPE(sv) != SVt_PVIV
284 && SvTYPE(sv) != SVt_PVNV
230 && SvTYPE(sv) != SVt_PV) /* mstore */ 285 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
231 { 286 {
287 int deref = !SvROK (sv);
288
232 if (!storable_mstore) 289 if (!storable_mstore)
290 {
291 PUTBACK;
233 need_storable (); 292 need_storable ();
293 SPAGAIN;
294 }
295
296 if (deref)
297 sv = newRV_noinc (sv);
234 298
235 PUSHMARK (SP); 299 PUSHMARK (SP);
236 XPUSHs (sv); 300 XPUSHs (sv);
237 PUTBACK; 301 PUTBACK;
238 302
… …
241 305
242 SPAGAIN; 306 SPAGAIN;
243 307
244 sv = POPs; 308 sv = POPs;
245 309
246 if (SvPVX (sv)[0] != MAGIC_R) 310 if (SvPVX (sv)[0] == MAGIC_R)
247 croak ("Storable format changed, need newer version of Compress::LZF"); 311 {
312 if (deref)
313 SvPVX (sv)[0] = MAGIC_R_deref;
314 }
315 else
316 {
317 char pfx[2];
318
319 pfx[0] = MAGIC_undef;
320 pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
321
322 sv_insert (sv, 0, 0, pfx, 2);
323 }
248 324
249 if (ix) /* compress */ 325 if (ix) /* compress */
250 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0))); 326 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
251 else 327
252 XPUSHs (sv); 328 XPUSHs (sv);
253 } 329 }
254 else if (IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 330 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
255 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */ 331 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
256 else if (ix == 2) /* compress always */ 332 else if (ix == 2) /* compress always */
257 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 333 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
334 else if (SvNIOK (sv)) /* don't compress */
335 {
336 STRLEN len;
337 char *s = SvPV (sv, len);
338 XPUSHs (sv_2mortal (newSVpvn (s, len)));
339 }
258 else /* don't compress */ 340 else /* don't compress */
259 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 341 XPUSHs (sv_2mortal (newSVsv (sv)));
260 342
261void 343void
262sthaw(sv) 344sthaw(sv)
263 SV * sv 345 SV * sv
264 PROTOTYPE: $ 346 PROTOTYPE: $
265 PPCODE: 347 PPCODE:
266 char hdr = SvPVX (sv)[0]; 348{
349 STRLEN svlen;
350 int deref = 0;
267 351
268 if (IN_RANGE (hdr, MAGIC_LO, MAGIC_HI)) 352 SvGETMAGIC (sv);
353 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
269 { 354 {
355 redo:
356
270 switch (SvPVX (sv)[0]) 357 switch (SvPVX (sv)[0])
271 { 358 {
359 case MAGIC_undef:
360 if (svlen <= 1)
361 XPUSHs (sv_2mortal (NEWSV (0, 0)));
362 else
363 {
364 if (SvPVX (sv)[1] == MAGIC_R_deref)
365 deref = 1;
366 else if (SvPVX (sv)[1] != MAGIC_R)
367 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
368
369 sv_chop (sv, SvPVX (sv) + 2);
370
371 if (!storable_mstore)
372 {
373 PUTBACK;
374 need_storable ();
375 SPAGAIN;
376 }
377
378 PUSHMARK (SP);
379 XPUSHs (sv);
380 PUTBACK;
381
382 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
383 croak ("Storable::mstore didn't return a single scalar");
384
385 SPAGAIN;
386
387 if (deref)
388 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
389 else
390 SETs (sv_2mortal (newSVsv (TOPs)));
391 }
392 break;
393
272 case MAGIC_U: 394 case MAGIC_U:
273 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 395 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
274 break; 396 break;
275 397
276 case MAGIC_C: 398 case MAGIC_C:
277 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 399 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
278 break; 400 break;
279 401
402 case MAGIC_R_deref:
403 deref = 1;
404 SvPVX (sv)[0] = MAGIC_R;
405 goto handle_MAGIC_R;
406
407 case MAGIC_CR_deref:
408 deref = 1;
280 case MAGIC_CR: 409 case MAGIC_CR:
281 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 410 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
411 if (deref)
412 if (SvPVX (sv)[0] == MAGIC_R_deref)
413 SvPVX (sv)[0] = MAGIC_R;
414
415 goto redo;
416
282 case MAGIC_R: 417 case MAGIC_R:
418 handle_MAGIC_R:
283 if (!storable_mstore) 419 if (!storable_mstore)
420 {
421 PUTBACK;
284 need_storable (); 422 need_storable ();
423 SPAGAIN;
424 }
285 425
286 PUSHMARK (SP); 426 PUSHMARK (SP);
287 XPUSHs (sv); 427 XPUSHs (sv);
288 PUTBACK; 428 PUTBACK;
289 429
290 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 430 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
291 croak ("Storable::mstore didn't return a single scalar"); 431 croak ("Storable::mstore didn't return a single scalar");
292 432
293 SPAGAIN; 433 SPAGAIN;
294 434
295 /*XPUSHs (POPs);*/ 435 if (deref)
436 {
437 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
438
439 if (SvPVX (sv)[0] == MAGIC_R)
440 SvPVX (sv)[0] = MAGIC_R_deref;
441 }
442 else
443 SETs (sv_2mortal (newSVsv (TOPs)));
296 444
297 break; 445 break;
298 446
299 default: 447 default:
300 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 448 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
301 } 449 }
302 } 450 }
303 else 451 else
304 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 452 XPUSHs (sv_2mortal (newSVsv (sv)));
453}
454

Diff Legend

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