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.2 by root, Thu Sep 27 19:24:55 2001 UTC vs.
Revision 1.12 by root, Fri May 17 18:59:24 2002 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
30static CV *storable_mstore, *storable_mretrieve; 33static CV *storable_mstore, *storable_mretrieve;
31 34
32static SV * 35static SV *
33compress_sv (SV *data, char cprepend, char uprepend) 36compress_sv (SV *data, char cprepend, int uprepend)
34{ 37{
35 STRLEN usize, csize; 38 STRLEN usize, csize;
36 char *src = (char *)SvPV (data, usize); 39 char *src = (char *)SvPV (data, usize);
37 40
38 if (usize) 41 if (usize)
… …
88 91
89 if (csize) 92 if (csize)
90 { 93 {
91 SvCUR_set (ret, csize + skip); 94 SvCUR_set (ret, csize + skip);
92 } 95 }
93 else if (!uprepend) 96 else if (uprepend < 0)
94 { 97 {
95 SvREFCNT_dec (ret); 98 SvREFCNT_dec (ret);
96 ret = SvREFCNT_inc (data); 99 ret = SvREFCNT_inc (data);
97 } 100 }
98 else 101 else
99 { 102 {
100 *dst++ = 0; 103 *dst++ = uprepend;
101 104
102 Move ((void *)src, (void *)dst, usize, unsigned char); 105 Move ((void *)src, (void *)dst, usize, unsigned char);
103 106
104 SvCUR_set (ret, usize + 1); 107 SvCUR_set (ret, usize + 1);
105 } 108 }
… …
205void 208void
206compress(data) 209compress(data)
207 SV * data 210 SV * data
208 PROTOTYPE: $ 211 PROTOTYPE: $
209 PPCODE: 212 PPCODE:
210 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 213 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
211 214
212void 215void
213decompress(data) 216decompress(data)
214 SV * data 217 SV * data
215 PROTOTYPE: $ 218 PROTOTYPE: $
… …
223 sfreeze_cr = 1 226 sfreeze_cr = 1
224 sfreeze_c = 2 227 sfreeze_c = 2
225 PROTOTYPE: $ 228 PROTOTYPE: $
226 PPCODE: 229 PPCODE:
227 230
228 if (SvROK (sv)) /* mstore */ 231 SvGETMAGIC (sv);
232
233 if (!SvOK (sv))
234 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
235 else if (SvROK (sv)
236 || (SvTYPE(sv) != SVt_IV
237 && SvTYPE(sv) != SVt_NV
238 && SvTYPE(sv) != SVt_PV
239 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
229 { 240 {
241 int deref = !SvROK (sv);
242
230 if (!storable_mstore) 243 if (!storable_mstore)
231 need_storable (); 244 need_storable ();
245
246 if (deref)
247 sv = newRV_noinc (sv);
232 248
233 PUSHMARK (SP); 249 PUSHMARK (SP);
234 XPUSHs (sv); 250 XPUSHs (sv);
235 PUTBACK; 251 PUTBACK;
236 252
… …
242 sv = POPs; 258 sv = POPs;
243 259
244 if (SvPVX (sv)[0] != MAGIC_R) 260 if (SvPVX (sv)[0] != MAGIC_R)
245 croak ("Storable format changed, need newer version of Compress::LZF"); 261 croak ("Storable format changed, need newer version of Compress::LZF");
246 262
263 if (deref)
264 SvPVX (sv)[0] = MAGIC_R_deref;
265
247 if (ix) /* compress */ 266 if (ix) /* compress */
248 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0))); 267 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
249 else 268
250 XPUSHs (sv); 269 XPUSHs (sv);
251 } 270 }
252 else if (IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 271 else if (SvTYPE (sv) == SVt_PV && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
253 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */ 272 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
254 else if (ix == 2) /* compress always */ 273 else if (ix == 2) /* compress always */
255 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 274 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
256 else /* don't compress */ 275 else /* don't compress */
257 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 276 XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));
258 277
259void 278void
260sthaw(sv) 279sthaw(sv)
261 SV * sv 280 SV * sv
262 PROTOTYPE: $ 281 PROTOTYPE: $
263 PPCODE: 282 PPCODE:
264 char hdr = SvPVX (sv)[0];
265 283
266 if (IN_RANGE (hdr, MAGIC_LO, MAGIC_HI)) 284 int deref = 0;
285
286 SvGETMAGIC (sv);
287 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI))
267 { 288 {
268 switch (SvPVX (sv)[0]) 289 switch (SvPVX (sv)[0])
269 { 290 {
291 case MAGIC_undef:
292 XPUSHs (sv_2mortal (NEWSV (0, 0)));
293 break;
294
270 case MAGIC_U: 295 case MAGIC_U:
271 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 296 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
272 break; 297 break;
273 298
274 case MAGIC_C: 299 case MAGIC_C:
275 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 300 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
276 break; 301 break;
277 302
303 case MAGIC_R_deref:
304 deref = 1;
305 SvPVX (sv)[0] = MAGIC_R;
306 goto handle_MAGIC_R;
307
308 case MAGIC_CR_deref:
309 deref = 1;
278 case MAGIC_CR: 310 case MAGIC_CR:
279 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 311 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
312 if (deref)
313 if (SvPVX (sv)[0] == MAGIC_R_deref)
314 SvPVX (sv)[0] = MAGIC_R;
315 else
316 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
317
280 case MAGIC_R: 318 case MAGIC_R:
319 handle_MAGIC_R:
281 if (!storable_mstore) 320 if (!storable_mstore)
282 need_storable (); 321 need_storable ();
283 322
284 PUSHMARK (SP); 323 PUSHMARK (SP);
285 XPUSHs (sv); 324 XPUSHs (sv);
… …
288 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 327 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
289 croak ("Storable::mstore didn't return a single scalar"); 328 croak ("Storable::mstore didn't return a single scalar");
290 329
291 SPAGAIN; 330 SPAGAIN;
292 331
293 /*XPUSHs (POPs);*/ 332 if (deref)
333 {
334 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
335
336 if (SvPVX (sv)[0] == MAGIC_R)
337 SvPVX (sv)[0] = MAGIC_R_deref;
338 }
339 else
340 XPUSHs (POPs); /* this is a nop, hopefully */
294 341
295 break; 342 break;
296 343
297 default: 344 default:
298 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 345 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
299 } 346 }
300 } 347 }
301 else 348 else
302 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 349 XPUSHs (sv_2mortal (newSVsv (sv)));

Diff Legend

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