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.14 by root, Tue Oct 29 15:56:32 2013 UTC

… …
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11 11
12#include "ecb.h" 12#include "ecb.h"
13
14// compatibility with perl <5.18
15#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
17#endif
18#ifndef HvNAMELEN
19# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20#endif
21#ifndef HvNAMEUTF8
22# define HvNAMEUTF8(hv) 0
23#endif
13 24
14// known tags 25// known tags
15enum cbor_tag 26enum cbor_tag
16{ 27{
17 // inofficial extensions (pending iana registration) 28 // inofficial extensions (pending iana registration)
… …
60#else 71#else
61# define CBOR_SLOW 0 72# define CBOR_SLOW 0
62# define CBOR_STASH cbor_stash 73# define CBOR_STASH cbor_stash
63#endif 74#endif
64 75
65static HV *cbor_stash, *cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS:: 76static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
66static SV *cbor_true, *cbor_false; 77static SV *types_true, *types_false, *types_error, *sv_cbor;
67 78
68typedef struct { 79typedef struct {
69 U32 flags; 80 U32 flags;
70 U32 max_depth; 81 U32 max_depth;
71 STRLEN max_size; 82 STRLEN max_size;
… …
259 SvGETMAGIC (sv); 270 SvGETMAGIC (sv);
260 svt = SvTYPE (sv); 271 svt = SvTYPE (sv);
261 272
262 if (ecb_expect_false (SvOBJECT (sv))) 273 if (ecb_expect_false (SvOBJECT (sv)))
263 { 274 {
264 HV *boolean_stash = !CBOR_SLOW || cbor_boolean_stash 275 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
265 ? cbor_boolean_stash 276 ? types_boolean_stash
266 : gv_stashpv ("CBOR::XS::Boolean", 1); 277 : gv_stashpv ("Types::Serialiser::Boolean", 1);
278 HV *error_stash = !CBOR_SLOW || types_error_stash
279 ? types_error_stash
280 : gv_stashpv ("Types::Serialiser::Error", 1);
267 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 281 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
268 ? cbor_tagged_stash 282 ? cbor_tagged_stash
269 : gv_stashpv ("CBOR::XS::Tagged" , 1); 283 : gv_stashpv ("CBOR::XS::Tagged" , 1);
270 284
285 HV *stash = SvSTASH (sv);
286 GV *method;
287
271 if (SvSTASH (sv) == boolean_stash) 288 if (stash == boolean_stash)
272 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 289 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
290 else if (stash == error_stash)
291 encode_ch (enc, 0xe0 | 23);
273 else if (SvSTASH (sv) == tagged_stash) 292 else if (stash == tagged_stash)
274 { 293 {
275 if (svt != SVt_PVAV) 294 if (svt != SVt_PVAV)
276 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 295 croak ("encountered CBOR::XS::Tagged object that isn't an array");
277 296
278 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 297 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
279 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 298 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
280 } 299 }
300 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
301 {
302 dSP;
303
304 ENTER; SAVETMPS; PUSHMARK (SP);
305 // we re-bless the reference to get overload and other niceties right
306 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
307
308 PUTBACK;
309 // G_SCALAR ensures that return value is 1
310 call_sv ((SV *)GvCV (method), G_SCALAR);
311 SPAGAIN;
312
313 // catch this surprisingly common error
314 if (SvROK (TOPs) && SvRV (TOPs) == sv)
315 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
316
317 encode_sv (enc, POPs);
318
319 PUTBACK;
320
321 FREETMPS; LEAVE;
322 }
323 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
324 {
325 dSP;
326
327 ENTER; SAVETMPS; PUSHMARK (SP);
328 EXTEND (SP, 2);
329 // we re-bless the reference to get overload and other niceties right
330 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
331 PUSHs (sv_cbor);
332
333 PUTBACK;
334 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
335 SPAGAIN;
336
337 // catch this surprisingly common error
338 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
339 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
340
341 encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);
342 encode_uint (enc, 0x80, count + 1);
343 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
344
345 while (count)
346 encode_sv (enc, SP[1 - count--]);
347
348 PUTBACK;
349
350 FREETMPS; LEAVE;
351 }
281 else 352 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", 353 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
311 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 354 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
312 }
313 } 355 }
314 else if (svt == SVt_PVHV) 356 else if (svt == SVt_PVHV)
315 encode_hv (enc, (HV *)sv); 357 encode_hv (enc, (HV *)sv);
316 else if (svt == SVt_PVAV) 358 else if (svt == SVt_PVAV)
317 encode_av (enc, (AV *)sv); 359 encode_av (enc, (AV *)sv);
… …
567 609
568 SV *k = decode_sv (dec); 610 SV *k = decode_sv (dec);
569 SV *v = decode_sv (dec); 611 SV *v = decode_sv (dec);
570 612
571 hv_store_ent (hv, k, v, 0); 613 hv_store_ent (hv, k, v, 0);
614 SvREFCNT_dec (k);
572 } 615 }
573 } 616 }
574 else 617 else
575 { 618 {
576 int len = decode_uint (dec); 619 int len = decode_uint (dec);
… …
579 { 622 {
580 SV *k = decode_sv (dec); 623 SV *k = decode_sv (dec);
581 SV *v = decode_sv (dec); 624 SV *v = decode_sv (dec);
582 625
583 hv_store_ent (hv, k, v, 0); 626 hv_store_ent (hv, k, v, 0);
627 SvREFCNT_dec (k);
584 } 628 }
585 } 629 }
586 630
587 DEC_DEC_DEPTH; 631 DEC_DEC_DEPTH;
588 return newRV_noinc ((SV *)hv); 632 return newRV_noinc ((SV *)hv);
… …
643 UV tag = decode_uint (dec); 687 UV tag = decode_uint (dec);
644 SV *sv = decode_sv (dec); 688 SV *sv = decode_sv (dec);
645 689
646 if (tag == CBOR_TAG_MAGIC) 690 if (tag == CBOR_TAG_MAGIC)
647 return sv; 691 return sv;
648
649 if (tag == CBOR_TAG_PERL_OBJECT) 692 else if (tag == CBOR_TAG_PERL_OBJECT)
650 { 693 {
651 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 694 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
652 ERR ("corrupted CBOR data (non-array perl object)"); 695 ERR ("corrupted CBOR data (non-array perl object)");
696
697 AV *av = (AV *)SvRV (sv);
698 int len = av_len (av) + 1;
699 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
700
701 if (!stash)
702 ERR ("cannot decode perl-object (package does not exist)");
703
704 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
653 705
654 // TODO 706 if (!method)
707 ERR ("cannot decode perl-object (package does not have a THAW method)");
708
709 dSP;
710
711 ENTER; SAVETMPS; PUSHMARK (SP);
712 EXTEND (SP, len + 1);
713 // we re-bless the reference to get overload and other niceties right
714 PUSHs (*av_fetch (av, 0, 1));
715 PUSHs (sv_cbor);
716
717 int i;
718
719 for (i = 1; i < len; ++i)
720 PUSHs (*av_fetch (av, i, 1));
721
722 PUTBACK;
723 call_sv ((SV *)GvCV (method), G_SCALAR);
724 SPAGAIN;
725
726 SvREFCNT_dec (sv);
727 sv = SvREFCNT_inc (POPs);
728
729 PUTBACK;
730
731 FREETMPS; LEAVE;
732
733 return sv;
734 }
735 else
655 } 736 {
656
657 AV *av = newAV (); 737 AV *av = newAV ();
658 av_push (av, newSVuv (tag)); 738 av_push (av, newSVuv (tag));
659 av_push (av, sv); 739 av_push (av, sv);
660 740
661 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 741 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
662 ? cbor_tagged_stash 742 ? cbor_tagged_stash
663 : gv_stashpv ("CBOR::XS::Tagged" , 1); 743 : gv_stashpv ("CBOR::XS::Tagged" , 1);
664 744
665 return sv_bless (newRV_noinc ((SV *)av), tagged_stash); 745 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
746 }
666 747
667fail: 748fail:
668 SvREFCNT_dec (sv); 749 SvREFCNT_dec (sv);
669 return &PL_sv_undef; 750 return &PL_sv_undef;
670} 751}
… …
693 case 7: // misc 774 case 7: // misc
694 switch (*dec->cur++ & 31) 775 switch (*dec->cur++ & 31)
695 { 776 {
696 case 20: 777 case 20:
697#if CBOR_SLOW 778#if CBOR_SLOW
698 cbor_false = get_bool ("CBOR::XS::false"); 779 types_false = get_bool ("Types::Serialiser::false");
699#endif 780#endif
700 return newSVsv (cbor_false); 781 return newSVsv (types_false);
701 case 21: 782 case 21:
702#if CBOR_SLOW 783#if CBOR_SLOW
703 cbor_true = get_bool ("CBOR::XS::true"); 784 types_true = get_bool ("Types::Serialiser::true");
704#endif 785#endif
705 return newSVsv (cbor_true); 786 return newSVsv (types_true);
706 case 22: 787 case 22:
707 return newSVsv (&PL_sv_undef); 788 return newSVsv (&PL_sv_undef);
789 case 23:
790#if CBOR_SLOW
791 types_error = get_bool ("Types::Serialiser::error");
792#endif
793 return newSVsv (types_error);
708 794
709 case 25: 795 case 25:
710 { 796 {
711 WANT (2); 797 WANT (2);
712 798
… …
828MODULE = CBOR::XS PACKAGE = CBOR::XS 914MODULE = CBOR::XS PACKAGE = CBOR::XS
829 915
830BOOT: 916BOOT:
831{ 917{
832 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 918 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); 919 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
835 920
836 cbor_true = get_bool ("CBOR::XS::true"); 921 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
837 cbor_false = get_bool ("CBOR::XS::false"); 922 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
923
924 types_true = get_bool ("Types::Serialiser::true" );
925 types_false = get_bool ("Types::Serialiser::false");
926 types_error = get_bool ("Types::Serialiser::error");
927
928 sv_cbor = newSVpv ("CBOR", 0);
929 SvREADONLY_on (sv_cbor);
838} 930}
839 931
840PROTOTYPES: DISABLE 932PROTOTYPES: DISABLE
841 933
842void CLONE (...) 934void CLONE (...)
843 CODE: 935 CODE:
844 cbor_stash = 0; 936 cbor_stash = 0;
845 cbor_boolean_stash = 0;
846 cbor_tagged_stash = 0; 937 cbor_tagged_stash = 0;
938 types_error_stash = 0;
939 types_boolean_stash = 0;
847 940
848void new (char *klass) 941void new (char *klass)
849 PPCODE: 942 PPCODE:
850{ 943{
851 SV *pv = NEWSV (0, sizeof (CBOR)); 944 SV *pv = NEWSV (0, sizeof (CBOR));

Diff Legend

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