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.5 by root, Thu Sep 27 20:08:05 2001 UTC vs.
Revision 1.21 by root, Wed Sep 27 15:52:47 2006 UTC

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

Diff Legend

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