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.10 by root, Sun Oct 27 20:40:25 2013 UTC vs.
Revision 1.16 by root, Tue Oct 29 20:59:16 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)
… …
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, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS:: 76static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
66static SV *types_true, *types_false, *types_error; 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;
… …
269 : gv_stashpv ("Types::Serialiser::Error", 1); 280 : gv_stashpv ("Types::Serialiser::Error", 1);
270 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 281 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
271 ? cbor_tagged_stash 282 ? cbor_tagged_stash
272 : gv_stashpv ("CBOR::XS::Tagged" , 1); 283 : gv_stashpv ("CBOR::XS::Tagged" , 1);
273 284
285 HV *stash = SvSTASH (sv);
286 GV *method;
287
274 if (SvSTASH (sv) == boolean_stash) 288 if (stash == boolean_stash)
275 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 289 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
276 else if (SvSTASH (sv) == error_stash) 290 else if (stash == error_stash)
277 encode_ch (enc, 0xe0 | 23); 291 encode_ch (enc, 0xe0 | 23);
278 else if (SvSTASH (sv) == tagged_stash) 292 else if (stash == tagged_stash)
279 { 293 {
280 if (svt != SVt_PVAV) 294 if (svt != SVt_PVAV)
281 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 295 croak ("encountered CBOR::XS::Tagged object that isn't an array");
282 296
283 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 297 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
284 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 298 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
285 } 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 }
286 else 352 else
287 {
288 // we re-bless the reference to get overload and other niceties right
289 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
290
291 if (to_cbor)
292 {
293 dSP;
294
295 ENTER; SAVETMPS; PUSHMARK (SP);
296 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
297
298 // calling with G_SCALAR ensures that we always get a 1 return value
299 PUTBACK;
300 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
301 SPAGAIN;
302
303 // catch this surprisingly common error
304 if (SvROK (TOPs) && SvRV (TOPs) == sv)
305 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
306
307 sv = POPs;
308 PUTBACK;
309
310 encode_sv (enc, sv);
311
312 FREETMPS; LEAVE;
313 }
314 else
315 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",
316 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 354 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
317 }
318 } 355 }
319 else if (svt == SVt_PVHV) 356 else if (svt == SVt_PVHV)
320 encode_hv (enc, (HV *)sv); 357 encode_hv (enc, (HV *)sv);
321 else if (svt == SVt_PVAV) 358 else if (svt == SVt_PVAV)
322 encode_av (enc, (AV *)sv); 359 encode_av (enc, (AV *)sv);
… …
547 SvREFCNT_dec (av); 584 SvREFCNT_dec (av);
548 DEC_DEC_DEPTH; 585 DEC_DEC_DEPTH;
549 return &PL_sv_undef; 586 return &PL_sv_undef;
550} 587}
551 588
589static void
590decode_he (dec_t *dec, HV *hv)
591{
592 // for speed reasons, we specialcase single-string
593 // byte or utf-8 strings as keys.
594
595 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27)
596 {
597 I32 len = decode_uint (dec);
598 char *key = (char *)dec->cur;
599
600 dec->cur += len;
601
602 hv_store (hv, key, len, decode_sv (dec), 0);
603 }
604 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27)
605 {
606 I32 len = decode_uint (dec);
607 char *key = (char *)dec->cur;
608
609 dec->cur += len;
610
611 hv_store (hv, key, -len, decode_sv (dec), 0);
612 }
613 else
614 {
615 SV *k = decode_sv (dec);
616 SV *v = decode_sv (dec);
617
618 hv_store_ent (hv, k, v, 0);
619 SvREFCNT_dec (k);
620 }
621}
622
552static SV * 623static SV *
553decode_hv (dec_t *dec) 624decode_hv (dec_t *dec)
554{ 625{
555 HV *hv = newHV (); 626 HV *hv = newHV ();
556 627
… …
568 { 639 {
569 ++dec->cur; 640 ++dec->cur;
570 break; 641 break;
571 } 642 }
572 643
573 SV *k = decode_sv (dec); 644 decode_he (dec, hv);
574 SV *v = decode_sv (dec);
575
576 hv_store_ent (hv, k, v, 0);
577 } 645 }
578 } 646 }
579 else 647 else
580 { 648 {
581 int len = decode_uint (dec); 649 int pairs = decode_uint (dec);
582 650
583 while (len--) 651 while (pairs--)
584 { 652 decode_he (dec, hv);
585 SV *k = decode_sv (dec);
586 SV *v = decode_sv (dec);
587
588 hv_store_ent (hv, k, v, 0);
589 }
590 } 653 }
591 654
592 DEC_DEC_DEPTH; 655 DEC_DEC_DEPTH;
593 return newRV_noinc ((SV *)hv); 656 return newRV_noinc ((SV *)hv);
594 657
… …
648 UV tag = decode_uint (dec); 711 UV tag = decode_uint (dec);
649 SV *sv = decode_sv (dec); 712 SV *sv = decode_sv (dec);
650 713
651 if (tag == CBOR_TAG_MAGIC) 714 if (tag == CBOR_TAG_MAGIC)
652 return sv; 715 return sv;
653
654 if (tag == CBOR_TAG_PERL_OBJECT) 716 else if (tag == CBOR_TAG_PERL_OBJECT)
655 { 717 {
656 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 718 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
657 ERR ("corrupted CBOR data (non-array perl object)"); 719 ERR ("corrupted CBOR data (non-array perl object)");
720
721 AV *av = (AV *)SvRV (sv);
722 int len = av_len (av) + 1;
723 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
724
725 if (!stash)
726 ERR ("cannot decode perl-object (package does not exist)");
727
728 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
658 729
659 // TODO 730 if (!method)
731 ERR ("cannot decode perl-object (package does not have a THAW method)");
732
733 dSP;
734
735 ENTER; SAVETMPS; PUSHMARK (SP);
736 EXTEND (SP, len + 1);
737 // we re-bless the reference to get overload and other niceties right
738 PUSHs (*av_fetch (av, 0, 1));
739 PUSHs (sv_cbor);
740
741 int i;
742
743 for (i = 1; i < len; ++i)
744 PUSHs (*av_fetch (av, i, 1));
745
746 PUTBACK;
747 call_sv ((SV *)GvCV (method), G_SCALAR);
748 SPAGAIN;
749
750 SvREFCNT_dec (sv);
751 sv = SvREFCNT_inc (POPs);
752
753 PUTBACK;
754
755 FREETMPS; LEAVE;
756
757 return sv;
758 }
759 else
660 } 760 {
661
662 AV *av = newAV (); 761 AV *av = newAV ();
663 av_push (av, newSVuv (tag)); 762 av_push (av, newSVuv (tag));
664 av_push (av, sv); 763 av_push (av, sv);
665 764
666 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 765 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
667 ? cbor_tagged_stash 766 ? cbor_tagged_stash
668 : gv_stashpv ("CBOR::XS::Tagged" , 1); 767 : gv_stashpv ("CBOR::XS::Tagged" , 1);
669 768
670 return sv_bless (newRV_noinc ((SV *)av), tagged_stash); 769 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
770 }
671 771
672fail: 772fail:
673 SvREFCNT_dec (sv); 773 SvREFCNT_dec (sv);
674 return &PL_sv_undef; 774 return &PL_sv_undef;
675} 775}
… …
768static SV * 868static SV *
769decode_cbor (SV *string, CBOR *cbor, char **offset_return) 869decode_cbor (SV *string, CBOR *cbor, char **offset_return)
770{ 870{
771 dec_t dec; 871 dec_t dec;
772 SV *sv; 872 SV *sv;
873 STRLEN len;
874 char *data = SvPVbyte (string, len);
773 875
774 /* work around bugs in 5.10 where manipulating magic values
775 * makes perl ignore the magic in subsequent accesses.
776 * also make a copy of non-PV values, to get them into a clean
777 * state (SvPV should do that, but it's buggy, see below).
778 */
779 /*SvGETMAGIC (string);*/
780 if (SvMAGICAL (string) || !SvPOK (string))
781 string = sv_2mortal (newSVsv (string));
782
783 SvUPGRADE (string, SVt_PV);
784
785 /* work around a bug in perl 5.10, which causes SvCUR to fail an
786 * assertion with -DDEBUGGING, although SvCUR is documented to
787 * return the xpv_cur field which certainly exists after upgrading.
788 * according to nicholas clark, calling SvPOK fixes this.
789 * But it doesn't fix it, so try another workaround, call SvPV_nolen
790 * and hope for the best.
791 * Damnit, SvPV_nolen still trips over yet another assertion. This
792 * assertion business is seriously broken, try yet another workaround
793 * for the broken -DDEBUGGING.
794 */
795 {
796#ifdef DEBUGGING
797 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
798#else
799 STRLEN offset = SvCUR (string);
800#endif
801
802 if (offset > cbor->max_size && cbor->max_size) 876 if (len > cbor->max_size && cbor->max_size)
803 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu", 877 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
804 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 878 (unsigned long)len, (unsigned long)cbor->max_size);
805 }
806
807 sv_utf8_downgrade (string, 0);
808 879
809 dec.cbor = *cbor; 880 dec.cbor = *cbor;
810 dec.cur = (U8 *)SvPVX (string); 881 dec.cur = (U8 *)data;
811 dec.end = (U8 *)SvEND (string); 882 dec.end = (U8 *)data + len;
812 dec.err = 0; 883 dec.err = 0;
813 dec.depth = 0; 884 dec.depth = 0;
814 885
815 sv = decode_sv (&dec); 886 sv = decode_sv (&dec);
816 887
… …
822 dec.err = "garbage after CBOR object"; 893 dec.err = "garbage after CBOR object";
823 894
824 if (dec.err) 895 if (dec.err)
825 { 896 {
826 SvREFCNT_dec (sv); 897 SvREFCNT_dec (sv);
827 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 898 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
828 } 899 }
829 900
830 sv = sv_2mortal (sv); 901 sv = sv_2mortal (sv);
831 902
832 return sv; 903 return sv;
… …
846 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1); 917 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
847 918
848 types_true = get_bool ("Types::Serialiser::true" ); 919 types_true = get_bool ("Types::Serialiser::true" );
849 types_false = get_bool ("Types::Serialiser::false"); 920 types_false = get_bool ("Types::Serialiser::false");
850 types_error = get_bool ("Types::Serialiser::error"); 921 types_error = get_bool ("Types::Serialiser::error");
922
923 sv_cbor = newSVpv ("CBOR", 0);
924 SvREADONLY_on (sv_cbor);
851} 925}
852 926
853PROTOTYPES: DISABLE 927PROTOTYPES: DISABLE
854 928
855void CLONE (...) 929void CLONE (...)
… …
912 CODE: 986 CODE:
913 RETVAL = self->max_size; 987 RETVAL = self->max_size;
914 OUTPUT: 988 OUTPUT:
915 RETVAL 989 RETVAL
916 990
917#if 0 //TODO
918
919void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
920 PPCODE:
921{
922 SvREFCNT_dec (self->cb_object);
923 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
924
925 XPUSHs (ST (0));
926}
927
928void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef)
929 PPCODE:
930{
931 if (!self->cb_sk_object)
932 self->cb_sk_object = newHV ();
933
934 if (SvOK (cb))
935 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
936 else
937 {
938 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
939
940 if (!HvKEYS (self->cb_sk_object))
941 {
942 SvREFCNT_dec (self->cb_sk_object);
943 self->cb_sk_object = 0;
944 }
945 }
946
947 XPUSHs (ST (0));
948}
949
950#endif
951
952void encode (CBOR *self, SV *scalar) 991void encode (CBOR *self, SV *scalar)
953 PPCODE: 992 PPCODE:
954 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 993 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
955 XPUSHs (scalar); 994 XPUSHs (scalar);
956 995
… …
968 EXTEND (SP, 2); 1007 EXTEND (SP, 2);
969 PUSHs (sv); 1008 PUSHs (sv);
970 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1009 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
971} 1010}
972 1011
973#if 0
974
975void DESTROY (CBOR *self)
976 CODE:
977 SvREFCNT_dec (self->cb_sk_object);
978 SvREFCNT_dec (self->cb_object);
979
980#endif
981
982PROTOTYPES: ENABLE 1012PROTOTYPES: ENABLE
983 1013
984void encode_cbor (SV *scalar) 1014void encode_cbor (SV *scalar)
985 PPCODE: 1015 PPCODE:
986{ 1016{

Diff Legend

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