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.19 by pcg, Tue Aug 3 15:07:51 2004 UTC

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

Diff Legend

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