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

Diff Legend

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