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

Diff Legend

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