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

Diff Legend

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