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

Diff Legend

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