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.11 by root, Wed Apr 10 14:11:48 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
231 SvGETMAGIC (sv);
232
233 if (!SvOK (sv))
234 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
228 if (SvTYPE(sv) != SVt_IV 235 else if (SvTYPE(sv) != SVt_IV
229 && SvTYPE(sv) != SVt_NV 236 && SvTYPE(sv) != SVt_NV
237 && SvTYPE(sv) != SVt_PV
230 && SvTYPE(sv) != SVt_PV) /* mstore */ 238 && SvTYPE(sv) != SVt_PVMG+99999) /* mstore */
231 { 239 {
240 int deref = !SvROK (sv);
241
232 if (!storable_mstore) 242 if (!storable_mstore)
233 need_storable (); 243 need_storable ();
244
245 if (deref)
246 sv = newRV_noinc (sv);
234 247
235 PUSHMARK (SP); 248 PUSHMARK (SP);
236 XPUSHs (sv); 249 XPUSHs (sv);
237 PUTBACK; 250 PUTBACK;
238 251
… …
244 sv = POPs; 257 sv = POPs;
245 258
246 if (SvPVX (sv)[0] != MAGIC_R) 259 if (SvPVX (sv)[0] != MAGIC_R)
247 croak ("Storable format changed, need newer version of Compress::LZF"); 260 croak ("Storable format changed, need newer version of Compress::LZF");
248 261
262 if (deref)
263 SvPVX (sv)[0] = MAGIC_R_deref;
264
249 if (ix) /* compress */ 265 if (ix) /* compress */
250 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0))); 266 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
251 else 267
252 XPUSHs (sv); 268 XPUSHs (sv);
253 } 269 }
254 else if (IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 270 else if (SvTYPE (sv) == SVt_PV && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
255 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */ 271 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
256 else if (ix == 2) /* compress always */ 272 else if (ix == 2) /* compress always */
257 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 273 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
258 else /* don't compress */ 274 else /* don't compress */
259 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 275 XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));
260 276
261void 277void
262sthaw(sv) 278sthaw(sv)
263 SV * sv 279 SV * sv
264 PROTOTYPE: $ 280 PROTOTYPE: $
265 PPCODE: 281 PPCODE:
266 char hdr = SvPVX (sv)[0];
267 282
268 if (IN_RANGE (hdr, MAGIC_LO, MAGIC_HI)) 283 int deref = 0;
284
285 SvGETMAGIC (sv);
286 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI))
269 { 287 {
270 switch (SvPVX (sv)[0]) 288 switch (SvPVX (sv)[0])
271 { 289 {
290 case MAGIC_undef:
291 XPUSHs (sv_2mortal (NEWSV (0, 0)));
292 break;
293
272 case MAGIC_U: 294 case MAGIC_U:
273 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 295 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
274 break; 296 break;
275 297
276 case MAGIC_C: 298 case MAGIC_C:
277 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 299 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
278 break; 300 break;
279 301
302 case MAGIC_R_deref:
303 deref = 1;
304 SvPVX (sv)[0] = MAGIC_R;
305 goto handle_MAGIC_R;
306
307 case MAGIC_CR_deref:
308 deref = 1;
280 case MAGIC_CR: 309 case MAGIC_CR:
281 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 310 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
311 if (deref)
312 if (SvPVX (sv)[0] == MAGIC_R_deref)
313 SvPVX (sv)[0] = MAGIC_R;
314 else
315 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
316
282 case MAGIC_R: 317 case MAGIC_R:
318 handle_MAGIC_R:
283 if (!storable_mstore) 319 if (!storable_mstore)
284 need_storable (); 320 need_storable ();
285 321
286 PUSHMARK (SP); 322 PUSHMARK (SP);
287 XPUSHs (sv); 323 XPUSHs (sv);
… …
290 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 326 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
291 croak ("Storable::mstore didn't return a single scalar"); 327 croak ("Storable::mstore didn't return a single scalar");
292 328
293 SPAGAIN; 329 SPAGAIN;
294 330
295 /*XPUSHs (POPs);*/ 331 if (deref)
332 {
333 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
334
335 if (SvPVX (sv)[0] == MAGIC_R)
336 SvPVX (sv)[0] = MAGIC_R_deref;
337 }
338 else
339 XPUSHs (POPs); /* this is a nop, hopefully */
296 340
297 break; 341 break;
298 342
299 default: 343 default:
300 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 344 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
301 } 345 }
302 } 346 }
303 else 347 else
304 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 348 XPUSHs (sv_2mortal (newSVsv (sv)));

Diff Legend

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