ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CBOR-XS/XS.xs
(Generate patch)

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.9 by root, Sun Oct 27 10:17:12 2013 UTC vs.
Revision 1.11 by root, Sun Oct 27 22:35:15 2013 UTC

… …
60#else 60#else
61# define CBOR_SLOW 0 61# define CBOR_SLOW 0
62# define CBOR_STASH cbor_stash 62# define CBOR_STASH cbor_stash
63#endif 63#endif
64 64
65static HV *cbor_stash, *cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS:: 65static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
66static SV *cbor_true, *cbor_false; 66static SV *types_true, *types_false, *types_error, *sv_cbor;
67 67
68typedef struct { 68typedef struct {
69 U32 flags; 69 U32 flags;
70 U32 max_depth; 70 U32 max_depth;
71 STRLEN max_size; 71 STRLEN max_size;
… …
259 SvGETMAGIC (sv); 259 SvGETMAGIC (sv);
260 svt = SvTYPE (sv); 260 svt = SvTYPE (sv);
261 261
262 if (ecb_expect_false (SvOBJECT (sv))) 262 if (ecb_expect_false (SvOBJECT (sv)))
263 { 263 {
264 HV *boolean_stash = !CBOR_SLOW || cbor_boolean_stash 264 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
265 ? cbor_boolean_stash 265 ? types_boolean_stash
266 : gv_stashpv ("CBOR::XS::Boolean", 1); 266 : gv_stashpv ("Types::Serialiser::Boolean", 1);
267 HV *error_stash = !CBOR_SLOW || types_error_stash
268 ? types_error_stash
269 : gv_stashpv ("Types::Serialiser::Error", 1);
267 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 270 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
268 ? cbor_tagged_stash 271 ? cbor_tagged_stash
269 : gv_stashpv ("CBOR::XS::Tagged" , 1); 272 : gv_stashpv ("CBOR::XS::Tagged" , 1);
270 273
274 HV *stash = SvSTASH (sv);
275 GV *method;
276
271 if (SvSTASH (sv) == boolean_stash) 277 if (stash == boolean_stash)
272 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 278 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
279 else if (stash == error_stash)
280 encode_ch (enc, 0xe0 | 23);
273 else if (SvSTASH (sv) == tagged_stash) 281 else if (stash == tagged_stash)
274 { 282 {
275 if (svt != SVt_PVAV) 283 if (svt != SVt_PVAV)
276 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 284 croak ("encountered CBOR::XS::Tagged object that isn't an array");
277 285
278 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 286 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
279 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 287 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
280 } 288 }
289 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
290 {
291 dSP;
292
293 ENTER; SAVETMPS; PUSHMARK (SP);
294 // we re-bless the reference to get overload and other niceties right
295 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
296
297 PUTBACK;
298 // G_SCALAR ensures that return value is 1
299 call_sv ((SV *)GvCV (method), G_SCALAR);
300 SPAGAIN;
301
302 // catch this surprisingly common error
303 if (SvROK (TOPs) && SvRV (TOPs) == sv)
304 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
305
306 encode_sv (enc, POPs);
307
308 PUTBACK;
309
310 FREETMPS; LEAVE;
311 }
312 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
313 {
314 dSP;
315
316 ENTER; SAVETMPS; PUSHMARK (SP);
317 EXTEND (SP, 2);
318 // we re-bless the reference to get overload and other niceties right
319 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
320 PUSHs (sv_cbor);
321
322 PUTBACK;
323 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
324 SPAGAIN;
325
326 // catch this surprisingly common error
327 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
328 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
329
330 encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);
331 encode_uint (enc, 0x80, count + 1);
332 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
333
334 while (count)
335 encode_sv (enc, SP[1 - count--]);
336
337 PUTBACK;
338
339 FREETMPS; LEAVE;
340 }
281 else 341 else
282 {
283 // we re-bless the reference to get overload and other niceties right
284 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
285
286 if (to_cbor)
287 {
288 dSP;
289
290 ENTER; SAVETMPS; PUSHMARK (SP);
291 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
292
293 // calling with G_SCALAR ensures that we always get a 1 return value
294 PUTBACK;
295 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
296 SPAGAIN;
297
298 // catch this surprisingly common error
299 if (SvROK (TOPs) && SvRV (TOPs) == sv)
300 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
301
302 sv = POPs;
303 PUTBACK;
304
305 encode_sv (enc, sv);
306
307 FREETMPS; LEAVE;
308 }
309 else
310 croak ("encountered object '%s', but no TO_CBOR method available on it", 342 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
311 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 343 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
312 }
313 } 344 }
314 else if (svt == SVt_PVHV) 345 else if (svt == SVt_PVHV)
315 encode_hv (enc, (HV *)sv); 346 encode_hv (enc, (HV *)sv);
316 else if (svt == SVt_PVAV) 347 else if (svt == SVt_PVAV)
317 encode_av (enc, (AV *)sv); 348 encode_av (enc, (AV *)sv);
… …
643 UV tag = decode_uint (dec); 674 UV tag = decode_uint (dec);
644 SV *sv = decode_sv (dec); 675 SV *sv = decode_sv (dec);
645 676
646 if (tag == CBOR_TAG_MAGIC) 677 if (tag == CBOR_TAG_MAGIC)
647 return sv; 678 return sv;
648
649 if (tag == CBOR_TAG_PERL_OBJECT) 679 else if (tag == CBOR_TAG_PERL_OBJECT)
650 { 680 {
651 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 681 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
652 ERR ("corrupted CBOR data (non-array perl object)"); 682 ERR ("corrupted CBOR data (non-array perl object)");
683
684 AV *av = (AV *)SvRV (sv);
685 int len = av_len (av) + 1;
686 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
687
688 if (!stash)
689 ERR ("cannot decode perl-object (package does not exist)");
690
691 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
653 692
654 // TODO 693 if (!method)
694 ERR ("cannot decode perl-object (package does not have a THAW method)");
695
696 dSP;
697
698 ENTER; SAVETMPS; PUSHMARK (SP);
699 EXTEND (SP, len + 1);
700 // we re-bless the reference to get overload and other niceties right
701 PUSHs (*av_fetch (av, 0, 1));
702 PUSHs (sv_cbor);
703
704 int i;
705
706 for (i = 1; i < len; ++i)
707 PUSHs (*av_fetch (av, i, 1));
708
709 PUTBACK;
710 call_sv ((SV *)GvCV (method), G_SCALAR);
711 SPAGAIN;
712
713 sv = SvREFCNT_inc (POPs);
714
715 PUTBACK;
716
717 FREETMPS; LEAVE;
718
719 return sv;
720 }
721 else
655 } 722 {
656
657 AV *av = newAV (); 723 AV *av = newAV ();
658 av_push (av, newSVuv (tag)); 724 av_push (av, newSVuv (tag));
659 av_push (av, sv); 725 av_push (av, sv);
660 726
661 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 727 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
662 ? cbor_tagged_stash 728 ? cbor_tagged_stash
663 : gv_stashpv ("CBOR::XS::Tagged" , 1); 729 : gv_stashpv ("CBOR::XS::Tagged" , 1);
664 730
665 return sv_bless (newRV_noinc ((SV *)av), tagged_stash); 731 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
732 }
666 733
667fail: 734fail:
668 SvREFCNT_dec (sv); 735 SvREFCNT_dec (sv);
669 return &PL_sv_undef; 736 return &PL_sv_undef;
670} 737}
… …
693 case 7: // misc 760 case 7: // misc
694 switch (*dec->cur++ & 31) 761 switch (*dec->cur++ & 31)
695 { 762 {
696 case 20: 763 case 20:
697#if CBOR_SLOW 764#if CBOR_SLOW
698 cbor_false = get_bool ("CBOR::XS::false"); 765 types_false = get_bool ("Types::Serialiser::false");
699#endif 766#endif
700 return newSVsv (cbor_false); 767 return newSVsv (types_false);
701 case 21: 768 case 21:
702#if CBOR_SLOW 769#if CBOR_SLOW
703 cbor_true = get_bool ("CBOR::XS::true"); 770 types_true = get_bool ("Types::Serialiser::true");
704#endif 771#endif
705 return newSVsv (cbor_true); 772 return newSVsv (types_true);
706 case 22: 773 case 22:
707 return newSVsv (&PL_sv_undef); 774 return newSVsv (&PL_sv_undef);
775 case 23:
776#if CBOR_SLOW
777 types_error = get_bool ("Types::Serialiser::error");
778#endif
779 return newSVsv (types_error);
708 780
709 case 25: 781 case 25:
710 { 782 {
711 WANT (2); 783 WANT (2);
712 784
… …
828MODULE = CBOR::XS PACKAGE = CBOR::XS 900MODULE = CBOR::XS PACKAGE = CBOR::XS
829 901
830BOOT: 902BOOT:
831{ 903{
832 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 904 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
833 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
834 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1); 905 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
835 906
836 cbor_true = get_bool ("CBOR::XS::true"); 907 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
837 cbor_false = get_bool ("CBOR::XS::false"); 908 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
909
910 types_true = get_bool ("Types::Serialiser::true" );
911 types_false = get_bool ("Types::Serialiser::false");
912 types_error = get_bool ("Types::Serialiser::error");
913
914 sv_cbor = newSVpv ("CBOR", 0);
915 SvREADONLY_on (sv_cbor);
838} 916}
839 917
840PROTOTYPES: DISABLE 918PROTOTYPES: DISABLE
841 919
842void CLONE (...) 920void CLONE (...)
843 CODE: 921 CODE:
844 cbor_stash = 0; 922 cbor_stash = 0;
845 cbor_boolean_stash = 0;
846 cbor_tagged_stash = 0; 923 cbor_tagged_stash = 0;
924 types_error_stash = 0;
925 types_boolean_stash = 0;
847 926
848void new (char *klass) 927void new (char *klass)
849 PPCODE: 928 PPCODE:
850{ 929{
851 SV *pv = NEWSV (0, sizeof (CBOR)); 930 SV *pv = NEWSV (0, sizeof (CBOR));

Diff Legend

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