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.10 by root, Tue Mar 26 17:49:24 2002 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
27static CV *storable_mstore, *storable_mretrieve; 33static CV *storable_mstore, *storable_mretrieve;
28 34
29static SV * 35static SV *
30compress_sv (SV *data, char cprepend, char uprepend) 36compress_sv (SV *data, char cprepend, int uprepend)
31{ 37{
32 STRLEN usize, csize; 38 STRLEN usize, csize;
33 char *src = (char *)SvPV (data, usize); 39 char *src = (char *)SvPV (data, usize);
34 40
35 if (usize) 41 if (usize)
… …
85 91
86 if (csize) 92 if (csize)
87 { 93 {
88 SvCUR_set (ret, csize + skip); 94 SvCUR_set (ret, csize + skip);
89 } 95 }
90 else if (!uprepend) 96 else if (uprepend < 0)
91 { 97 {
92 SvREFCNT_dec (ret); 98 SvREFCNT_dec (ret);
93 ret = SvREFCNT_inc (data); 99 ret = SvREFCNT_inc (data);
94 } 100 }
95 else 101 else
96 { 102 {
97 *dst++ = 0; 103 *dst++ = uprepend;
98 104
99 Move ((void *)src, (void *)dst, usize, unsigned char); 105 Move ((void *)src, (void *)dst, usize, unsigned char);
100 106
101 SvCUR_set (ret, usize + 1); 107 SvCUR_set (ret, usize + 1);
102 } 108 }
… …
185} 191}
186 192
187static void 193static void
188need_storable(void) 194need_storable(void)
189{ 195{
196#if PATCHLEVEL < 6
197 perl_eval_pv ("require Storable;", 1);
198#else
190 load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv); 199 load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv);
200#endif
191 201
192 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV)); 202 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV));
193 storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV)); 203 storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV));
194} 204}
195 205
… …
198void 208void
199compress(data) 209compress(data)
200 SV * data 210 SV * data
201 PROTOTYPE: $ 211 PROTOTYPE: $
202 PPCODE: 212 PPCODE:
203 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 213 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
204 214
205void 215void
206decompress(data) 216decompress(data)
207 SV * data 217 SV * data
208 PROTOTYPE: $ 218 PROTOTYPE: $
… …
216 sfreeze_cr = 1 226 sfreeze_cr = 1
217 sfreeze_c = 2 227 sfreeze_c = 2
218 PROTOTYPE: $ 228 PROTOTYPE: $
219 PPCODE: 229 PPCODE:
220 230
221 if (SvROK (sv)) /* mstore */ 231 SvGETMAGIC (sv);
232
233 if (!SvOK (sv))
234 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
235 else if (SvTYPE(sv) != SVt_IV
236 && SvTYPE(sv) != SVt_NV
237 && SvTYPE(sv) != SVt_PV
238 && SvTYPE(sv) != SVt_PVMG+99999) /* mstore */
222 { 239 {
240 int deref = !SvROK (sv);
241
223 if (!storable_mstore) 242 if (!storable_mstore)
224 need_storable (); 243 need_storable ();
244
245 if (deref)
246 sv = newRV_noinc (sv);
225 247
226 PUSHMARK (SP); 248 PUSHMARK (SP);
227 XPUSHs (sv); 249 XPUSHs (sv);
228 PUTBACK; 250 PUTBACK;
229 251
… …
235 sv = POPs; 257 sv = POPs;
236 258
237 if (SvPVX (sv)[0] != MAGIC_R) 259 if (SvPVX (sv)[0] != MAGIC_R)
238 croak ("Storable format changed, need newer version of Compress::LZF"); 260 croak ("Storable format changed, need newer version of Compress::LZF");
239 261
262 if (deref)
263 SvPVX (sv)[0] = MAGIC_R_deref;
264
240 if (ix) /* compress */ 265 if (ix) /* compress */
241 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0))); 266 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
242 else 267
243 XPUSHs (sv); 268 XPUSHs (sv);
244 } 269 }
245 else if (IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 270 else if (SvTYPE (sv) == SVt_PV && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
246 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */ 271 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
247 else if (ix == 2) /* compress always */ 272 else if (ix == 2) /* compress always */
248 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 273 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
249 else /* don't compress */ 274 else /* don't compress */
250 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 275 XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));
251 276
252void 277void
253sthaw(sv) 278sthaw(sv)
254 SV * sv 279 SV * sv
255 PROTOTYPE: $ 280 PROTOTYPE: $
256 PPCODE: 281 PPCODE:
257 char hdr = SvPVX (sv)[0];
258 282
259 if (IN_RANGE (hdr, MAGIC_LO, MAGIC_HI)) 283 int deref = 0;
284
285 SvGETMAGIC (sv);
286 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI))
260 { 287 {
261 switch (SvPVX (sv)[0]) 288 switch (SvPVX (sv)[0])
262 { 289 {
290 case MAGIC_undef:
291 XPUSHs (sv_2mortal (NEWSV (0, 0)));
292 break;
293
263 case MAGIC_U: 294 case MAGIC_U:
264 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 295 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
265 break; 296 break;
266 297
267 case MAGIC_C: 298 case MAGIC_C:
268 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 299 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
269 break; 300 break;
270 301
302 case MAGIC_R_deref:
303 deref = 1;
304 SvPVX (sv)[0] = MAGIC_R;
305 goto handle_MAGIC_R;
306
307 case MAGIC_CR_deref:
308 deref = 1;
271 case MAGIC_CR: 309 case MAGIC_CR:
272 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 310 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
311 if (deref)
312 if (SvPVX (sv)[0] == MAGIC_R_deref)
313 SvPVX (sv)[0] = MAGIC_R;
314 else
315 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
316
273 case MAGIC_R: 317 case MAGIC_R:
318 handle_MAGIC_R:
274 if (!storable_mstore) 319 if (!storable_mstore)
275 need_storable (); 320 need_storable ();
276 321
277 PUSHMARK (SP); 322 PUSHMARK (SP);
278 XPUSHs (sv); 323 XPUSHs (sv);
… …
281 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 326 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
282 croak ("Storable::mstore didn't return a single scalar"); 327 croak ("Storable::mstore didn't return a single scalar");
283 328
284 SPAGAIN; 329 SPAGAIN;
285 330
286 /*XPUSHs (POPs);*/ 331 if (deref)
332 {
333 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
334
335 if (SvPVX (sv)[0] == MAGIC_R)
336 SvPVX (sv)[0] = MAGIC_R_deref;
337 }
338 else
339 XPUSHs (POPs); /* this is a nop, hopefully */
287 340
288 break; 341 break;
289 342
290 default: 343 default:
291 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 344 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");

Diff Legend

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