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.9 by root, Sun Mar 3 04:45:18 2002 UTC vs.
Revision 1.15 by root, Thu Sep 5 22:00:54 2002 UTC

… …
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 */ 27#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
28#define MAGIC_R_deref 6 /* storable NO (reference, freeze) */ 28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
29#define MAGIC_HI 7 /* room for one higher storable major */ 29#define MAGIC_HI 7 /* room for one higher storable major */
30 30
31#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l)) 31#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
32 32
33static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
33static CV *storable_mstore, *storable_mretrieve; 34static CV *storable_mstore, *storable_mretrieve;
34 35
35static SV * 36static SV *
36compress_sv (SV *data, char cprepend, char uprepend) 37compress_sv (SV *data, char cprepend, int uprepend)
37{ 38{
38 STRLEN usize, csize; 39 STRLEN usize, csize;
39 char *src = (char *)SvPV (data, usize); 40 char *src = (char *)SvPV (data, usize);
40 41
41 if (usize) 42 if (usize)
… …
91 92
92 if (csize) 93 if (csize)
93 { 94 {
94 SvCUR_set (ret, csize + skip); 95 SvCUR_set (ret, csize + skip);
95 } 96 }
96 else if (!uprepend) 97 else if (uprepend < 0)
97 { 98 {
98 SvREFCNT_dec (ret); 99 SvREFCNT_dec (ret);
99 ret = SvREFCNT_inc (data); 100 ret = SvREFCNT_inc (data);
100 } 101 }
101 else 102 else
102 { 103 {
103 *dst++ = 0; 104 *dst++ = uprepend;
104 105
105 Move ((void *)src, (void *)dst, usize, unsigned char); 106 Move ((void *)src, (void *)dst, usize, unsigned char);
106 107
107 SvCUR_set (ret, usize + 1); 108 SvCUR_set (ret, usize + 1);
108 } 109 }
… …
162 usize = (usize << 6) | (*src++ & 0x3f); 163 usize = (usize << 6) | (*src++ & 0x3f);
163 usize = (usize << 6) | (*src++ & 0x3f); 164 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 165 usize = (usize << 6) | (*src++ & 0x3f);
165 } 166 }
166 else 167 else
167 croak ("compressed data corrupted"); 168 croak ("compressed data corrupted (invalid length)");
168 169
169 ret = NEWSV (0, usize); 170 ret = NEWSV (0, usize);
170 SvPOK_only (ret); 171 SvPOK_only (ret);
171 dst = SvPVX (ret); 172 dst = SvPVX (ret);
172 173
173 if (lzf_decompress (src, csize, dst, usize) != usize) 174 if (lzf_decompress (src, csize, dst, usize) != usize)
174 croak ("compressed data corrupted", csize, skip, usize); 175 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
175 } 176 }
176 else 177 else
177 { 178 {
178 usize = csize - 1; 179 usize = csize - 1;
179 ret = NEWSV (0, usize); 180 ret = NEWSV (0, usize);
… …
192 193
193static void 194static void
194need_storable(void) 195need_storable(void)
195{ 196{
196#if PATCHLEVEL < 6 197#if PATCHLEVEL < 6
198 char req[8192];
199 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
197 perl_eval_pv ("require Storable;", 1); 200 perl_eval_pv (req, 1);
198#else 201#else
199 load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv); 202 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
200#endif 203#endif
201 204
202 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV)); 205 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV));
203 storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV)); 206 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
204} 207}
205 208
206MODULE = Compress::LZF PACKAGE = Compress::LZF 209MODULE = Compress::LZF PACKAGE = Compress::LZF
210
211BOOT:
212 serializer_package = newSVpv ("Storable", 0);
213 serializer_mstore = newSVpv ("Storable::mstore", 0);
214 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
215
216void
217set_serializer(package, mstore, mretrieve)
218 SV * package
219 SV * mstore
220 SV * mretrieve
221 PROTOTYPE: $$$
222 PPCODE:
223 SvSetSV (serializer_package , package );
224 SvSetSV (serializer_mstore , mstore );
225 SvSetSV (serializer_mretrieve, mretrieve);
226 storable_mstore =
227 storable_mretrieve = 0;
207 228
208void 229void
209compress(data) 230compress(data)
210 SV * data 231 SV * data
211 PROTOTYPE: $ 232 PROTOTYPE: $
212 PPCODE: 233 PPCODE:
213 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 234 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
214 235
215void 236void
216decompress(data) 237decompress(data)
217 SV * data 238 SV * data
218 PROTOTYPE: $ 239 PROTOTYPE: $
… …
226 sfreeze_cr = 1 247 sfreeze_cr = 1
227 sfreeze_c = 2 248 sfreeze_c = 2
228 PROTOTYPE: $ 249 PROTOTYPE: $
229 PPCODE: 250 PPCODE:
230 251
252 SvGETMAGIC (sv);
253
231 if (!SvOK (sv)) 254 if (!SvOK (sv))
232 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 255 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
256 else if (SvROK (sv)
233 else if (SvTYPE(sv) != SVt_IV 257 || (SvTYPE(sv) != SVt_IV
234 && SvTYPE(sv) != SVt_NV 258 && SvTYPE(sv) != SVt_NV
259 && SvTYPE(sv) != SVt_PV
260 && SvTYPE(sv) != SVt_PVIV
261 && SvTYPE(sv) != SVt_PVNV
235 && SvTYPE(sv) != SVt_PV) /* mstore */ 262 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
236 { 263 {
237 int deref = !SvROK (sv); 264 int deref = !SvROK (sv);
238 265
239 if (!storable_mstore) 266 if (!storable_mstore)
240 need_storable (); 267 need_storable ();
… …
254 sv = POPs; 281 sv = POPs;
255 282
256 if (SvPVX (sv)[0] != MAGIC_R) 283 if (SvPVX (sv)[0] != MAGIC_R)
257 croak ("Storable format changed, need newer version of Compress::LZF"); 284 croak ("Storable format changed, need newer version of Compress::LZF");
258 285
286 if (deref)
287 SvPVX (sv)[0] = MAGIC_R_deref;
288
259 if (ix) /* compress */ 289 if (ix) /* compress */
260 XPUSHs (sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, 0))); 290 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
261 else
262 {
263 if (deref)
264 SvPVX (sv)[0] = MAGIC_R_deref;
265 291
266 XPUSHs (sv); 292 XPUSHs (sv);
267 }
268 } 293 }
269 else if (sv && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 294 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
270 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */ 295 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
271 else if (ix == 2) /* compress always */ 296 else if (ix == 2) /* compress always */
272 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 297 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
298 else if (SvNIOK (sv)) /* don't compress */
299 {
300 STRLEN len;
301 char *s = SvPV (sv, len);
302 XPUSHs (sv_2mortal (newSVpvn (s, len)));
303 }
273 else /* don't compress */ 304 else /* don't compress */
274 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 305 XPUSHs (sv_2mortal (newSVsv (sv)));
275 306
276void 307void
277sthaw(sv) 308sthaw(sv)
278 SV * sv 309 SV * sv
279 PROTOTYPE: $ 310 PROTOTYPE: $
… …
296 327
297 case MAGIC_C: 328 case MAGIC_C:
298 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 329 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
299 break; 330 break;
300 331
332 case MAGIC_R_deref:
333 deref = 1;
334 SvPVX (sv)[0] = MAGIC_R;
335 goto handle_MAGIC_R;
336
301 case MAGIC_CR_deref: 337 case MAGIC_CR_deref:
302 deref = 1; 338 deref = 1;
303 case MAGIC_CR: 339 case MAGIC_CR:
304 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 340 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
305 case MAGIC_R_deref: 341 if (deref)
306 if (SvPVX (sv)[0] == MAGIC_R_deref) 342 if (SvPVX (sv)[0] == MAGIC_R_deref)
307 {
308 deref = 1;
309 SvPVX (sv)[0] = MAGIC_R; 343 SvPVX (sv)[0] = MAGIC_R;
310 } 344 else
345 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
346
311 case MAGIC_R: 347 case MAGIC_R:
348 handle_MAGIC_R:
312 if (!storable_mstore) 349 if (!storable_mstore)
313 need_storable (); 350 need_storable ();
314 351
315 PUSHMARK (SP); 352 PUSHMARK (SP);
316 XPUSHs (sv); 353 XPUSHs (sv);
… …
321 358
322 SPAGAIN; 359 SPAGAIN;
323 360
324 if (deref) 361 if (deref)
325 { 362 {
326 SV *ref = SvREFCNT_inc (SvRV (TOPs)); 363 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
327
328 SvREFCNT_dec (TOPs); /* destroy superfluous ref */
329 SETs (ref);
330 364
331 if (SvPVX (sv)[0] == MAGIC_R) 365 if (SvPVX (sv)[0] == MAGIC_R)
332 SvPVX (sv)[0] = MAGIC_R; 366 SvPVX (sv)[0] = MAGIC_R_deref;
333 } 367 }
334 368 else
335 XPUSHs (POPs); /* this is a nop, hopefully */ 369 XPUSHs (POPs); /* this is a nop, hopefully */
336 370
337 break; 371 break;
338 372
339 default: 373 default:
340 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 374 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
341 } 375 }
342 } 376 }
343 else 377 else
344 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 378 XPUSHs (sv_2mortal (newSVsv (sv)));

Diff Legend

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