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.9 by root, Sun Mar 3 04:45:18 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
… …
23#define MAGIC_C 1 /* compressed data follows */ 26#define MAGIC_C 1 /* compressed data follows */
24#define MAGIC_undef 2 /* the special value undef */ 27#define MAGIC_undef 2 /* the special value undef */
25#define MAGIC_CR 3 /* storable (reference, freeze), compressed */ 28#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
26#define MAGIC_R 4 /* storable (reference, freeze) */ 29#define MAGIC_R 4 /* storable (reference, freeze) */
27#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */ 30#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
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, char uprepend) 40compress_sv (SV *data, char cprepend, int uprepend)
37{ 41{
38 STRLEN usize, csize; 42 STRLEN usize, csize;
39 char *src = (char *)SvPV (data, usize); 43 char *src = (char *)SvPV (data, usize);
40 44
41 if (usize) 45 if (usize)
… …
91 95
92 if (csize) 96 if (csize)
93 { 97 {
94 SvCUR_set (ret, csize + skip); 98 SvCUR_set (ret, csize + skip);
95 } 99 }
96 else if (!uprepend) 100 else if (uprepend < 0)
97 { 101 {
98 SvREFCNT_dec (ret); 102 SvREFCNT_dec (ret);
99 ret = SvREFCNT_inc (data); 103 ret = SvREFCNT_inc (data);
100 } 104 }
101 else 105 else
102 { 106 {
103 *dst++ = 0; 107 *dst++ = uprepend;
104 108
105 Move ((void *)src, (void *)dst, usize, unsigned char); 109 Move ((void *)src, (void *)dst, usize, unsigned char);
106 110
107 SvCUR_set (ret, usize + 1); 111 SvCUR_set (ret, usize + 1);
108 } 112 }
… …
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: $
212 PPCODE: 236 PPCODE:
213 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 237 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
214 238
215void 239void
216decompress(data) 240decompress(data)
217 SV * data 241 SV * data
218 PROTOTYPE: $ 242 PROTOTYPE: $
… …
226 sfreeze_cr = 1 250 sfreeze_cr = 1
227 sfreeze_c = 2 251 sfreeze_c = 2
228 PROTOTYPE: $ 252 PROTOTYPE: $
229 PPCODE: 253 PPCODE:
230 254
255 SvGETMAGIC (sv);
256
231 if (!SvOK (sv)) 257 if (!SvOK (sv))
232 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 258 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
259 else if (SvROK (sv)
233 else if (SvTYPE(sv) != SVt_IV 260 || (SvTYPE(sv) != SVt_IV
234 && SvTYPE(sv) != SVt_NV 261 && SvTYPE(sv) != SVt_NV
262 && SvTYPE(sv) != SVt_PV
263 && SvTYPE(sv) != SVt_PVIV
264 && SvTYPE(sv) != SVt_PVNV
235 && SvTYPE(sv) != SVt_PV) /* mstore */ 265 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
236 { 266 {
237 int deref = !SvROK (sv); 267 int deref = !SvROK (sv);
238 268
239 if (!storable_mstore) 269 if (!storable_mstore)
240 need_storable (); 270 need_storable ();
… …
254 sv = POPs; 284 sv = POPs;
255 285
256 if (SvPVX (sv)[0] != MAGIC_R) 286 if (SvPVX (sv)[0] != MAGIC_R)
257 croak ("Storable format changed, need newer version of Compress::LZF"); 287 croak ("Storable format changed, need newer version of Compress::LZF");
258 288
289 if (deref)
290 SvPVX (sv)[0] = MAGIC_R_deref;
291
259 if (ix) /* compress */ 292 if (ix) /* compress */
260 XPUSHs (sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, 0))); 293 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
261 else
262 {
263 if (deref)
264 SvPVX (sv)[0] = MAGIC_R_deref;
265 294
266 XPUSHs (sv); 295 XPUSHs (sv);
267 }
268 } 296 }
269 else if (sv && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 297 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
270 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */ 298 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
271 else if (ix == 2) /* compress always */ 299 else if (ix == 2) /* compress always */
272 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 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 }
273 else /* don't compress */ 307 else /* don't compress */
274 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 308 XPUSHs (sv_2mortal (newSVsv (sv)));
275 309
276void 310void
277sthaw(sv) 311sthaw(sv)
278 SV * sv 312 SV * sv
279 PROTOTYPE: $ 313 PROTOTYPE: $
… …
296 330
297 case MAGIC_C: 331 case MAGIC_C:
298 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 332 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
299 break; 333 break;
300 334
335 case MAGIC_R_deref:
336 deref = 1;
337 SvPVX (sv)[0] = MAGIC_R;
338 goto handle_MAGIC_R;
339
301 case MAGIC_CR_deref: 340 case MAGIC_CR_deref:
302 deref = 1; 341 deref = 1;
303 case MAGIC_CR: 342 case MAGIC_CR:
304 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 343 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
305 case MAGIC_R_deref: 344 if (deref)
306 if (SvPVX (sv)[0] == MAGIC_R_deref) 345 if (SvPVX (sv)[0] == MAGIC_R_deref)
307 {
308 deref = 1;
309 SvPVX (sv)[0] = MAGIC_R; 346 SvPVX (sv)[0] = MAGIC_R;
310 } 347 else
348 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
349
311 case MAGIC_R: 350 case MAGIC_R:
351 handle_MAGIC_R:
312 if (!storable_mstore) 352 if (!storable_mstore)
313 need_storable (); 353 need_storable ();
314 354
315 PUSHMARK (SP); 355 PUSHMARK (SP);
316 XPUSHs (sv); 356 XPUSHs (sv);
… …
321 361
322 SPAGAIN; 362 SPAGAIN;
323 363
324 if (deref) 364 if (deref)
325 { 365 {
326 SV *ref = SvREFCNT_inc (SvRV (TOPs)); 366 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
327
328 SvREFCNT_dec (TOPs); /* destroy superfluous ref */
329 SETs (ref);
330 367
331 if (SvPVX (sv)[0] == MAGIC_R) 368 if (SvPVX (sv)[0] == MAGIC_R)
332 SvPVX (sv)[0] = MAGIC_R; 369 SvPVX (sv)[0] = MAGIC_R_deref;
333 } 370 }
334 371 else
335 XPUSHs (POPs); /* this is a nop, hopefully */ 372 SETs (sv_2mortal (newSVsv (TOPs)));
336 373
337 break; 374 break;
338 375
339 default: 376 default:
340 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?");
341 } 378 }
342 } 379 }
343 else 380 else
344 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 381 XPUSHs (sv_2mortal (newSVsv (sv)));
382

Diff Legend

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