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.1 by root, Thu Sep 27 18:36:34 2001 UTC vs.
Revision 1.18 by pcg, Tue Aug 3 15:04:05 2004 UTC

… …
8#include "patchlevel.h" 8#include "patchlevel.h"
9#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55)) 9#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55))
10static STRLEN nolen_na; 10static STRLEN nolen_na;
11# define SvPV_nolen(sv) SvPV ((sv), nolen_na) 11# define SvPV_nolen(sv) SvPV ((sv), nolen_na)
12#endif 12#endif
13#if PATCHLEVEL < 6
14# define call_sv perl_call_sv
15#endif
16
17#define HLOG 15
18#define ULTRA_FAST 0
13 19
14#include "lzf_c.c" 20#include "lzf_c.c"
15#include "lzf_d.c" 21#include "lzf_d.c"
16 22
17/* we re-use the storable header for our purposes */ 23/* we re-use the storable header for our purposes */
18#define MAGIC_LO 0 24#define MAGIC_LO 0
19#define MAGIC_U 0 /* uncompressed data follows */ 25#define MAGIC_U 0 /* uncompressed data follows */
20#define MAGIC_C 1 /* compressed data follows */ 26#define MAGIC_C 1 /* compressed data follows */
27#define MAGIC_undef 2 /* the special value undef */
28#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
21#define MAGIC_R 4 /* storable (reference, freeze) */ 29#define MAGIC_R 4 /* storable (reference, freeze) */
22#define MAGIC_CR 3 /* storable (reference, freeze), compressed */ 30#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
31#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
23#define MAGIC_HI 7 /* room for one higher storable major */ 32#define MAGIC_HI 7 /* room for one higher storable major */
24 33
25#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))
26 35
36static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
27static CV *storable_mstore, *storable_mretrieve; 37static CV *storable_mstore, *storable_mretrieve;
28 38
29static SV * 39static SV *
30compress_sv (SV *data, char cprepend, char uprepend) 40compress_sv (SV *data, char cprepend, int uprepend)
31{ 41{
32 STRLEN usize, csize; 42 STRLEN usize, csize;
33 char *src = (char *)SvPV (data, usize); 43 char *src = (char *)SvPV (data, usize);
34 44
35 if (usize) 45 if (usize)
… …
85 95
86 if (csize) 96 if (csize)
87 { 97 {
88 SvCUR_set (ret, csize + skip); 98 SvCUR_set (ret, csize + skip);
89 } 99 }
90 else if (!uprepend) 100 else if (uprepend < 0)
91 { 101 {
92 SvREFCNT_dec (ret); 102 SvREFCNT_dec (ret);
93 ret = SvREFCNT_inc (data); 103 ret = SvREFCNT_inc (data);
94 } 104 }
95 else 105 else
96 { 106 {
97 *dst++ = 0; 107 *dst++ = uprepend;
98 108
99 Move ((void *)src, (void *)dst, usize, unsigned char); 109 Move ((void *)src, (void *)dst, usize, unsigned char);
100 110
101 SvCUR_set (ret, usize + 1); 111 SvCUR_set (ret, usize + 1);
102 } 112 }
… …
156 usize = (usize << 6) | (*src++ & 0x3f); 166 usize = (usize << 6) | (*src++ & 0x3f);
157 usize = (usize << 6) | (*src++ & 0x3f); 167 usize = (usize << 6) | (*src++ & 0x3f);
158 usize = (usize << 6) | (*src++ & 0x3f); 168 usize = (usize << 6) | (*src++ & 0x3f);
159 } 169 }
160 else 170 else
161 croak ("compressed data corrupted"); 171 croak ("compressed data corrupted (invalid length)");
162 172
163 ret = NEWSV (0, usize); 173 ret = NEWSV (0, usize);
164 SvPOK_only (ret); 174 SvPOK_only (ret);
165 dst = SvPVX (ret); 175 dst = SvPVX (ret);
166 176
167 if (lzf_decompress (src, csize, dst, usize) != usize) 177 if (lzf_decompress (src, csize, dst, usize) != usize)
168 croak ("compressed data corrupted", csize, skip, usize); 178 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
169 } 179 }
170 else 180 else
171 { 181 {
172 usize = csize - 1; 182 usize = csize - 1;
173 ret = NEWSV (0, usize); 183 ret = NEWSV (0, usize);
… …
185} 195}
186 196
187static void 197static void
188need_storable(void) 198need_storable(void)
189{ 199{
200#if PATCHLEVEL < 6
201 char req[8192];
202 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
203 perl_eval_pv (req, 1);
204#else
190 load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv); 205 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
206#endif
191 207
192 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV)); 208 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV));
193 storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV)); 209 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
194} 210}
195 211
196MODULE = 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;
197 231
198void 232void
199compress(data) 233compress(data)
200 SV * data 234 SV * data
201 PROTOTYPE: $ 235 PROTOTYPE: $
202 PPCODE: 236 PPCODE:
203 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 237 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
204 238
205void 239void
206decompress(data) 240decompress(data)
207 SV * data 241 SV * data
208 PROTOTYPE: $ 242 PROTOTYPE: $
… …
216 sfreeze_cr = 1 250 sfreeze_cr = 1
217 sfreeze_c = 2 251 sfreeze_c = 2
218 PROTOTYPE: $ 252 PROTOTYPE: $
219 PPCODE: 253 PPCODE:
220 254
221 if (SvROK (sv)) /* mstore */ 255 SvGETMAGIC (sv);
256
257 if (!SvOK (sv))
258 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
259 else if (SvROK (sv)
260 || (SvTYPE(sv) != SVt_IV
261 && SvTYPE(sv) != SVt_NV
262 && SvTYPE(sv) != SVt_PV
263 && SvTYPE(sv) != SVt_PVIV
264 && SvTYPE(sv) != SVt_PVNV
265 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
222 { 266 {
267 int deref = !SvROK (sv);
268
223 if (!storable_mstore) 269 if (!storable_mstore)
224 need_storable (); 270 need_storable ();
271
272 if (deref)
273 sv = newRV_noinc (sv);
225 274
226 PUSHMARK (SP); 275 PUSHMARK (SP);
227 XPUSHs (sv); 276 XPUSHs (sv);
228 PUTBACK; 277 PUTBACK;
229 278
… …
235 sv = POPs; 284 sv = POPs;
236 285
237 if (SvPVX (sv)[0] != MAGIC_R) 286 if (SvPVX (sv)[0] != MAGIC_R)
238 croak ("Storable format changed, need newer version of Compress::LZF"); 287 croak ("Storable format changed, need newer version of Compress::LZF");
239 288
289 if (deref)
290 SvPVX (sv)[0] = MAGIC_R_deref;
291
240 if (ix) /* compress */ 292 if (ix) /* compress */
241 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0))); 293 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
242 else 294
243 XPUSHs (sv); 295 XPUSHs (sv);
244 } 296 }
245 else if (IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 297 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
246 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 */
247 else if (ix == 2) /* compress always */ 299 else if (ix == 2) /* compress always */
248 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 }
249 else /* don't compress */ 307 else /* don't compress */
250 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 308 XPUSHs (sv_2mortal (newSVsv (sv)));
251 309
252void 310void
253sthaw(sv) 311sthaw(sv)
254 SV * sv 312 SV * sv
255 PROTOTYPE: $ 313 PROTOTYPE: $
256 PPCODE: 314 PPCODE:
257 char hdr = SvPVX (sv)[0];
258 315
259 if (IN_RANGE (hdr, MAGIC_LO, MAGIC_HI)) 316 int deref = 0;
317
318 SvGETMAGIC (sv);
319 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI))
260 { 320 {
261 switch (SvPVX (sv)[0]) 321 switch (SvPVX (sv)[0])
262 { 322 {
323 case MAGIC_undef:
324 XPUSHs (sv_2mortal (NEWSV (0, 0)));
325 break;
326
263 case MAGIC_U: 327 case MAGIC_U:
264 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 328 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
265 break; 329 break;
266 330
267 case MAGIC_C: 331 case MAGIC_C:
268 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 332 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
269 break; 333 break;
270 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;
271 case MAGIC_CR: 342 case MAGIC_CR:
272 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
273 case MAGIC_R: 350 case MAGIC_R:
351 handle_MAGIC_R:
274 if (!storable_mstore) 352 if (!storable_mstore)
275 need_storable (); 353 need_storable ();
276 354
277 PUSHMARK (SP); 355 PUSHMARK (SP);
278 XPUSHs (sv); 356 XPUSHs (sv);
… …
281 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 359 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
282 croak ("Storable::mstore didn't return a single scalar"); 360 croak ("Storable::mstore didn't return a single scalar");
283 361
284 SPAGAIN; 362 SPAGAIN;
285 363
286 /*XPUSHs (POPs);*/ 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)));
287 373
288 break; 374 break;
289 375
290 default: 376 default:
291 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?");
292 } 378 }
293 } 379 }
294 else 380 else
295 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 381 XPUSHs (sv_2mortal (newSVsv (sv)));
382

Diff Legend

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