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.5 by root, Sat Oct 26 21:14:20 2013 UTC vs.
Revision 1.6 by root, Sat Oct 26 22:25:47 2013 UTC

… …
31#else 31#else
32# define CBOR_SLOW 0 32# define CBOR_SLOW 0
33# define CBOR_STASH cbor_stash 33# define CBOR_STASH cbor_stash
34#endif 34#endif
35 35
36static HV *cbor_stash, *cbor_boolean_stash; // CBOR::XS:: 36static HV *cbor_stash, *cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS::
37static SV *cbor_true, *cbor_false; 37static SV *cbor_true, *cbor_false;
38 38
39typedef struct { 39typedef struct {
40 U32 flags; 40 U32 flags;
41 U32 max_depth; 41 U32 max_depth;
42 STRLEN max_size; 42 STRLEN max_size;
43
44 SV *cb_object;
45 HV *cb_sk_object;
46} CBOR; 43} CBOR;
47 44
48ecb_inline void 45ecb_inline void
49cbor_init (CBOR *cbor) 46cbor_init (CBOR *cbor)
50{ 47{
… …
233 SvGETMAGIC (sv); 230 SvGETMAGIC (sv);
234 svt = SvTYPE (sv); 231 svt = SvTYPE (sv);
235 232
236 if (ecb_expect_false (SvOBJECT (sv))) 233 if (ecb_expect_false (SvOBJECT (sv)))
237 { 234 {
238 HV *stash = !CBOR_SLOW || cbor_boolean_stash 235 HV *boolean_stash = !CBOR_SLOW || cbor_boolean_stash
239 ? cbor_boolean_stash 236 ? cbor_boolean_stash
240 : gv_stashpv ("CBOR::XS::Boolean", 1); 237 : gv_stashpv ("CBOR::XS::Boolean", 1);
238 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
239 ? cbor_tagged_stash
240 : gv_stashpv ("CBOR::XS::Tagged" , 1);
241 241
242 if (SvSTASH (sv) == stash) 242 if (SvSTASH (sv) == boolean_stash)
243 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 243 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
244 else if (SvSTASH (sv) == tagged_stash)
245 {
246 if (svt != SVt_PVAV)
247 croak ("encountered CBOR::XS::Tagged object that isn't an array");
248
249 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
250 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
251 }
244 else 252 else
245 { 253 {
246#if 0 //TODO 254 // we re-bless the reference to get overload and other niceties right
247 if (enc->cbor.flags & F_CONV_BLESSED) 255 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
256
257 if (to_cbor)
248 { 258 {
249 // we re-bless the reference to get overload and other niceties right
250 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
251
252 if (to_cbor)
253 {
254 dSP; 259 dSP;
255 260
256 ENTER; SAVETMPS; PUSHMARK (SP); 261 ENTER; SAVETMPS; PUSHMARK (SP);
257 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 262 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
258 263
259 // calling with G_SCALAR ensures that we always get a 1 return value 264 // calling with G_SCALAR ensures that we always get a 1 return value
260 PUTBACK; 265 PUTBACK;
261 call_sv ((SV *)GvCV (to_cbor), G_SCALAR); 266 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
262 SPAGAIN; 267 SPAGAIN;
263 268
264 // catch this surprisingly common error 269 // catch this surprisingly common error
265 if (SvROK (TOPs) && SvRV (TOPs) == sv) 270 if (SvROK (TOPs) && SvRV (TOPs) == sv)
266 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); 271 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
267 272
268 sv = POPs; 273 sv = POPs;
269 PUTBACK; 274 PUTBACK;
270 275
271 encode_sv (enc, sv); 276 encode_sv (enc, sv);
272 277
273 FREETMPS; LEAVE; 278 FREETMPS; LEAVE;
274 }
275 else if (enc->cbor.flags & F_ALLOW_BLESSED)
276 encode_str (enc, "null", 4, 0);
277 else
278 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it",
279 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
280 } 279 }
281 else if (enc->cbor.flags & F_ALLOW_BLESSED)
282 encode_str (enc, "null", 4, 0);
283 else 280 else
284 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 281 croak ("encountered object '%s', but no TO_CBOR method available on it",
285 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 282 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
286#endif
287 } 283 }
288 } 284 }
289 else if (svt == SVt_PVHV) 285 else if (svt == SVt_PVHV)
290 encode_hv (enc, (HV *)sv); 286 encode_hv (enc, (HV *)sv);
291 else if (svt == SVt_PVAV) 287 else if (svt == SVt_PVAV)
… …
560 } 556 }
561 557
562 DEC_DEC_DEPTH; 558 DEC_DEC_DEPTH;
563 return newRV_noinc ((SV *)hv); 559 return newRV_noinc ((SV *)hv);
564 560
565#if 0
566 SV *sv;
567 HV *hv = newHV ();
568
569 DEC_INC_DEPTH;
570 decode_ws (dec);
571
572 for (;;)
573 {
574 // heuristic: assume that
575 // a) decode_str + hv_store_ent are abysmally slow.
576 // b) most hash keys are short, simple ascii text.
577 // => try to "fast-match" such strings to avoid
578 // the overhead of decode_str + hv_store_ent.
579 {
580 SV *value;
581 char *p = dec->cur;
582 char *e = p + 24; // only try up to 24 bytes
583
584 for (;;)
585 {
586 // the >= 0x80 is false on most architectures
587 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
588 {
589 // slow path, back up and use decode_str
590 SV *key = decode_str (dec);
591 if (!key)
592 goto fail;
593
594 decode_ws (dec); EXPECT_CH (':');
595
596 decode_ws (dec);
597 value = decode_sv (dec);
598 if (!value)
599 {
600 SvREFCNT_dec (key);
601 goto fail;
602 }
603
604 hv_store_ent (hv, key, value, 0);
605 SvREFCNT_dec (key);
606
607 break;
608 }
609 else if (*p == '"')
610 {
611 // fast path, got a simple key
612 char *key = dec->cur;
613 int len = p - key;
614 dec->cur = p + 1;
615
616 decode_ws (dec); EXPECT_CH (':');
617
618 decode_ws (dec);
619 value = decode_sv (dec);
620 if (!value)
621 goto fail;
622
623 hv_store (hv, key, len, value, 0);
624
625 break;
626 }
627
628 ++p;
629 }
630 }
631
632 decode_ws (dec);
633
634 if (*dec->cur == '}')
635 {
636 ++dec->cur;
637 break;
638 }
639
640 if (*dec->cur != ',')
641 ERR (", or } expected while parsing object/hash");
642
643 ++dec->cur;
644
645 decode_ws (dec);
646
647 if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
648 {
649 ++dec->cur;
650 break;
651 }
652 }
653
654 DEC_DEC_DEPTH;
655 sv = newRV_noinc ((SV *)hv);
656
657 // check filter callbacks
658 if (dec->cbor.flags & F_HOOK)
659 {
660 if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
661 {
662 HE *cb, *he;
663
664 hv_iterinit (hv);
665 he = hv_iternext (hv);
666 hv_iterinit (hv);
667
668 // the next line creates a mortal sv each time its called.
669 // might want to optimise this for common cases.
670 cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
671
672 if (cb)
673 {
674 dSP;
675 int count;
676
677 ENTER; SAVETMPS; PUSHMARK (SP);
678 XPUSHs (HeVAL (he));
679 sv_2mortal (sv);
680
681 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
682
683 if (count == 1)
684 {
685 sv = newSVsv (POPs);
686 FREETMPS; LEAVE;
687 return sv;
688 }
689
690 SvREFCNT_inc (sv);
691 FREETMPS; LEAVE;
692 }
693 }
694
695 if (dec->cbor.cb_object)
696 {
697 dSP;
698 int count;
699
700 ENTER; SAVETMPS; PUSHMARK (SP);
701 XPUSHs (sv_2mortal (sv));
702
703 PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
704
705 if (count == 1)
706 {
707 sv = newSVsv (POPs);
708 FREETMPS; LEAVE;
709 return sv;
710 }
711
712 SvREFCNT_inc (sv);
713 FREETMPS; LEAVE;
714 }
715 }
716
717 return sv;
718#endif
719
720fail: 561fail:
721 SvREFCNT_dec (hv); 562 SvREFCNT_dec (hv);
722 DEC_DEC_DEPTH; 563 DEC_DEC_DEPTH;
723 return &PL_sv_undef; 564 return &PL_sv_undef;
724} 565}
725 566
726static SV * 567static SV *
727decode_str (dec_t *dec, int utf8) 568decode_str (dec_t *dec, int utf8)
728{ 569{
729 SV *sv; 570 SV *sv = 0;
730 571
731 if ((*dec->cur & 31) == 31) 572 if ((*dec->cur & 31) == 31)
732 { 573 {
733 ++dec->cur; 574 ++dec->cur;
734 575
… …
743 { 584 {
744 ++dec->cur; 585 ++dec->cur;
745 break; 586 break;
746 } 587 }
747 588
748 SV *sv2 = decode_sv (dec);
749 sv_catsv (sv, sv2); 589 sv_catsv (sv, decode_sv (dec));
750 } 590 }
751 } 591 }
752 else 592 else
753 { 593 {
754 STRLEN len = decode_uint (dec); 594 STRLEN len = decode_uint (dec);
… …
762 SvUTF8_on (sv); 602 SvUTF8_on (sv);
763 603
764 return sv; 604 return sv;
765 605
766fail: 606fail:
607 SvREFCNT_dec (sv);
767 return &PL_sv_undef; 608 return &PL_sv_undef;
768} 609}
769 610
770static SV * 611static SV *
771decode_tagged (dec_t *dec) 612decode_tagged (dec_t *dec)
… …
788 WANT (1); 629 WANT (1);
789 630
790 switch (*dec->cur >> 5) 631 switch (*dec->cur >> 5)
791 { 632 {
792 case 0: // unsigned int 633 case 0: // unsigned int
793 //TODO: 64 bit values on 3 2bit perls
794 return newSVuv (decode_uint (dec)); 634 return newSVuv (decode_uint (dec));
795 case 1: // negative int 635 case 1: // negative int
796 return newSViv (-1 - (IV)decode_uint (dec)); 636 return newSViv (-1 - (IV)decode_uint (dec));
797 case 2: // octet string 637 case 2: // octet string
798 return decode_str (dec, 0); 638 return decode_str (dec, 0);
… …
862 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 702 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
863 } 703 }
864 704
865 break; 705 break;
866 } 706 }
867#if 0
868 switch (*dec->cur)
869 {
870 //case '"': ++dec->cur; return decode_str (dec);
871 case '[': ++dec->cur; return decode_av (dec);
872 case '{': ++dec->cur; return decode_hv (dec);
873
874 case '-':
875 case '0': case '1': case '2': case '3': case '4':
876 case '5': case '6': case '7': case '8': case '9':
877 //TODO return decode_num (dec);
878
879 case 't':
880 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
881 {
882 dec->cur += 4;
883#if CBOR_SLOW
884 cbor_true = get_bool ("CBOR::XS::true");
885#endif
886 return newSVsv (cbor_true);
887 }
888 else
889 ERR ("'true' expected");
890
891 break;
892
893 case 'f':
894 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
895 {
896 dec->cur += 5;
897#if CBOR_SLOW
898 cbor_false = get_bool ("CBOR::XS::false");
899#endif
900 return newSVsv (cbor_false);
901 }
902 else
903 ERR ("'false' expected");
904
905 break;
906
907 case 'n':
908 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
909 {
910 dec->cur += 4;
911 return newSVsv (&PL_sv_undef);
912 }
913 else
914 ERR ("'null' expected");
915
916 break;
917
918 default:
919 ERR ("malformed CBOR string, neither array, object, number, string or atom");
920 break;
921 }
922#endif
923 707
924fail: 708fail:
925 return &PL_sv_undef; 709 return &PL_sv_undef;
926} 710}
927 711
… …
970 dec.cur = (U8 *)SvPVX (string); 754 dec.cur = (U8 *)SvPVX (string);
971 dec.end = (U8 *)SvEND (string); 755 dec.end = (U8 *)SvEND (string);
972 dec.err = 0; 756 dec.err = 0;
973 dec.depth = 0; 757 dec.depth = 0;
974 758
975 if (dec.cbor.cb_object || dec.cbor.cb_sk_object)
976 ;//TODO dec.cbor.flags |= F_HOOK;
977
978 sv = decode_sv (&dec); 759 sv = decode_sv (&dec);
979 760
980 if (offset_return) 761 if (offset_return)
981 *offset_return = dec.cur; 762 *offset_return = dec.cur;
982 763
… …
1002 783
1003BOOT: 784BOOT:
1004{ 785{
1005 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 786 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1006 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1); 787 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
788 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1007 789
1008 cbor_true = get_bool ("CBOR::XS::true"); 790 cbor_true = get_bool ("CBOR::XS::true");
1009 cbor_false = get_bool ("CBOR::XS::false"); 791 cbor_false = get_bool ("CBOR::XS::false");
1010} 792}
1011 793
… …
1013 795
1014void CLONE (...) 796void CLONE (...)
1015 CODE: 797 CODE:
1016 cbor_stash = 0; 798 cbor_stash = 0;
1017 cbor_boolean_stash = 0; 799 cbor_boolean_stash = 0;
800 cbor_tagged_stash = 0;
1018 801
1019void new (char *klass) 802void new (char *klass)
1020 PPCODE: 803 PPCODE:
1021{ 804{
1022 SV *pv = NEWSV (0, sizeof (CBOR)); 805 SV *pv = NEWSV (0, sizeof (CBOR));
… …
1125 EXTEND (SP, 2); 908 EXTEND (SP, 2);
1126 PUSHs (sv); 909 PUSHs (sv);
1127 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 910 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1128} 911}
1129 912
913#if 0
914
1130void DESTROY (CBOR *self) 915void DESTROY (CBOR *self)
1131 CODE: 916 CODE:
1132 SvREFCNT_dec (self->cb_sk_object); 917 SvREFCNT_dec (self->cb_sk_object);
1133 SvREFCNT_dec (self->cb_object); 918 SvREFCNT_dec (self->cb_object);
1134 919
920#endif
921
1135PROTOTYPES: ENABLE 922PROTOTYPES: ENABLE
1136 923
1137void encode_cbor (SV *scalar) 924void encode_cbor (SV *scalar)
1138 PPCODE: 925 PPCODE:
1139{ 926{

Diff Legend

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