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.10 by root, Tue Mar 26 17:49:24 2002 UTC vs.
Revision 1.18 by pcg, Tue Aug 3 15:04:05 2004 UTC

… …
12#endif 12#endif
13#if PATCHLEVEL < 6 13#if PATCHLEVEL < 6
14# define call_sv perl_call_sv 14# define call_sv perl_call_sv
15#endif 15#endif
16 16
17#define HLOG 15
18#define ULTRA_FAST 0
19
17#include "lzf_c.c" 20#include "lzf_c.c"
18#include "lzf_d.c" 21#include "lzf_d.c"
19 22
20/* we re-use the storable header for our purposes */ 23/* we re-use the storable header for our purposes */
21#define MAGIC_LO 0 24#define MAGIC_LO 0
… …
28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */ 31#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
29#define MAGIC_HI 7 /* room for one higher storable major */ 32#define MAGIC_HI 7 /* room for one higher storable major */
30 33
31#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l)) 34#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
32 35
36static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
33static CV *storable_mstore, *storable_mretrieve; 37static CV *storable_mstore, *storable_mretrieve;
34 38
35static SV * 39static SV *
36compress_sv (SV *data, char cprepend, int uprepend) 40compress_sv (SV *data, char cprepend, int uprepend)
37{ 41{
… …
162 usize = (usize << 6) | (*src++ & 0x3f); 166 usize = (usize << 6) | (*src++ & 0x3f);
163 usize = (usize << 6) | (*src++ & 0x3f); 167 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 168 usize = (usize << 6) | (*src++ & 0x3f);
165 } 169 }
166 else 170 else
167 croak ("compressed data corrupted"); 171 croak ("compressed data corrupted (invalid length)");
168 172
169 ret = NEWSV (0, usize); 173 ret = NEWSV (0, usize);
170 SvPOK_only (ret); 174 SvPOK_only (ret);
171 dst = SvPVX (ret); 175 dst = SvPVX (ret);
172 176
173 if (lzf_decompress (src, csize, dst, usize) != usize) 177 if (lzf_decompress (src, csize, dst, usize) != usize)
174 croak ("compressed data corrupted", csize, skip, usize); 178 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
175 } 179 }
176 else 180 else
177 { 181 {
178 usize = csize - 1; 182 usize = csize - 1;
179 ret = NEWSV (0, usize); 183 ret = NEWSV (0, usize);
… …
192 196
193static void 197static void
194need_storable(void) 198need_storable(void)
195{ 199{
196#if PATCHLEVEL < 6 200#if PATCHLEVEL < 6
201 char req[8192];
202 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
197 perl_eval_pv ("require Storable;", 1); 203 perl_eval_pv (req, 1);
198#else 204#else
199 load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv); 205 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
200#endif 206#endif
201 207
202 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV)); 208 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV));
203 storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV)); 209 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
204} 210}
205 211
206MODULE = Compress::LZF PACKAGE = Compress::LZF 212MODULE = Compress::LZF PACKAGE = Compress::LZF
213
214BOOT:
215 serializer_package = newSVpv ("Storable", 0);
216 serializer_mstore = newSVpv ("Storable::mstore", 0);
217 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
218
219void
220set_serializer(package, mstore, mretrieve)
221 SV * package
222 SV * mstore
223 SV * mretrieve
224 PROTOTYPE: $$$
225 PPCODE:
226 SvSetSV (serializer_package , package );
227 SvSetSV (serializer_mstore , mstore );
228 SvSetSV (serializer_mretrieve, mretrieve);
229 storable_mstore =
230 storable_mretrieve = 0;
207 231
208void 232void
209compress(data) 233compress(data)
210 SV * data 234 SV * data
211 PROTOTYPE: $ 235 PROTOTYPE: $
… …
230 254
231 SvGETMAGIC (sv); 255 SvGETMAGIC (sv);
232 256
233 if (!SvOK (sv)) 257 if (!SvOK (sv))
234 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 258 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
259 else if (SvROK (sv)
235 else if (SvTYPE(sv) != SVt_IV 260 || (SvTYPE(sv) != SVt_IV
236 && SvTYPE(sv) != SVt_NV 261 && SvTYPE(sv) != SVt_NV
237 && SvTYPE(sv) != SVt_PV 262 && SvTYPE(sv) != SVt_PV
263 && SvTYPE(sv) != SVt_PVIV
264 && SvTYPE(sv) != SVt_PVNV
238 && SvTYPE(sv) != SVt_PVMG+99999) /* mstore */ 265 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
239 { 266 {
240 int deref = !SvROK (sv); 267 int deref = !SvROK (sv);
241 268
242 if (!storable_mstore) 269 if (!storable_mstore)
243 need_storable (); 270 need_storable ();
… …
265 if (ix) /* compress */ 292 if (ix) /* compress */
266 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 293 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
267 294
268 XPUSHs (sv); 295 XPUSHs (sv);
269 } 296 }
270 else if (SvTYPE (sv) == SVt_PV && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 297 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
271 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */ 298 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
272 else if (ix == 2) /* compress always */ 299 else if (ix == 2) /* compress always */
273 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1))); 300 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
301 else if (SvNIOK (sv)) /* don't compress */
302 {
303 STRLEN len;
304 char *s = SvPV (sv, len);
305 XPUSHs (sv_2mortal (newSVpvn (s, len)));
306 }
274 else /* don't compress */ 307 else /* don't compress */
275 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 308 XPUSHs (sv_2mortal (newSVsv (sv)));
276 309
277void 310void
278sthaw(sv) 311sthaw(sv)
279 SV * sv 312 SV * sv
280 PROTOTYPE: $ 313 PROTOTYPE: $
… …
334 367
335 if (SvPVX (sv)[0] == MAGIC_R) 368 if (SvPVX (sv)[0] == MAGIC_R)
336 SvPVX (sv)[0] = MAGIC_R_deref; 369 SvPVX (sv)[0] = MAGIC_R_deref;
337 } 370 }
338 else 371 else
339 XPUSHs (POPs); /* this is a nop, hopefully */ 372 SETs (sv_2mortal (newSVsv (TOPs)));
340 373
341 break; 374 break;
342 375
343 default: 376 default:
344 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 377 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
345 } 378 }
346 } 379 }
347 else 380 else
348 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 381 XPUSHs (sv_2mortal (newSVsv (sv)));
382

Diff Legend

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