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.5 by root, Thu Sep 27 20:08:05 2001 UTC vs.
Revision 1.19 by pcg, Tue Aug 3 15:07:51 2004 UTC

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

Diff Legend

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