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.8 by root, Sun Oct 27 10:12:01 2013 UTC vs.
Revision 1.15 by root, Tue Oct 29 18:37:31 2013 UTC

… …
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 13
14// known tags, rfc7049 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
24
25// known tags
15enum cbor_tag 26enum cbor_tag
16{ 27{
28 // inofficial extensions (pending iana registration)
29 CBOR_TAG_PERL_OBJECT = 256,
30 CBOR_TAG_GENERIC_OBJECT = 257,
31
32 // rfc7049
17 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 33 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
18 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any 34 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
19 CBOR_TAG_POS_BIGNUM = 2, // byte string 35 CBOR_TAG_POS_BIGNUM = 2, // byte string
20 CBOR_TAG_NEG_BIGNUM = 3, // byte string 36 CBOR_TAG_NEG_BIGNUM = 3, // byte string
21 CBOR_TAG_DECIMAL = 4, // decimal fraction, array 37 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
22 CBOR_TAG_BIGFLOAT = 5, // array 38 CBOR_TAG_BIGFLOAT = 5, // array
23 39
24 CBOR_TAG_CONV_B64U = 21, // base64url, any 40 CBOR_TAG_CONV_B64U = 21, // base64url, any
25 CBOR_TAG_CONV_B64 = 22, // base64, any 41 CBOR_TAG_CONV_B64 = 22, // base64, any
26 CBOR_TAG_CONV_HEX = 23, // base16, any 42 CBOR_TAG_CONV_HEX = 23, // base16, any
27 CBOR_TAG_CBOR = 24, // embedded cbor, byte string 43 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
28 44
29 CBOR_TAG_URI = 32, // URI rfc3986, utf-8 45 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
30 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8 46 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
31 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 47 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
32 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 48 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
33 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 49 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
34 50
35 CBOR_TAG_MAGIC = 55799 51 CBOR_TAG_MAGIC = 55799 // self-describe cbor
36}; 52};
37 53
38#define F_SHRINK 0x00000200UL 54#define F_SHRINK 0x00000200UL
39#define F_ALLOW_UNKNOWN 0x00002000UL 55#define F_ALLOW_UNKNOWN 0x00002000UL
40 56
… …
55#else 71#else
56# define CBOR_SLOW 0 72# define CBOR_SLOW 0
57# define CBOR_STASH cbor_stash 73# define CBOR_STASH cbor_stash
58#endif 74#endif
59 75
60static 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::
61static SV *cbor_true, *cbor_false; 77static SV *types_true, *types_false, *types_error, *sv_cbor;
62 78
63typedef struct { 79typedef struct {
64 U32 flags; 80 U32 flags;
65 U32 max_depth; 81 U32 max_depth;
66 STRLEN max_size; 82 STRLEN max_size;
… …
254 SvGETMAGIC (sv); 270 SvGETMAGIC (sv);
255 svt = SvTYPE (sv); 271 svt = SvTYPE (sv);
256 272
257 if (ecb_expect_false (SvOBJECT (sv))) 273 if (ecb_expect_false (SvOBJECT (sv)))
258 { 274 {
259 HV *boolean_stash = !CBOR_SLOW || cbor_boolean_stash 275 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
260 ? cbor_boolean_stash 276 ? types_boolean_stash
261 : 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);
262 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 281 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
263 ? cbor_tagged_stash 282 ? cbor_tagged_stash
264 : gv_stashpv ("CBOR::XS::Tagged" , 1); 283 : gv_stashpv ("CBOR::XS::Tagged" , 1);
265 284
285 HV *stash = SvSTASH (sv);
286 GV *method;
287
266 if (SvSTASH (sv) == boolean_stash) 288 if (stash == boolean_stash)
267 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);
268 else if (SvSTASH (sv) == tagged_stash) 292 else if (stash == tagged_stash)
269 { 293 {
270 if (svt != SVt_PVAV) 294 if (svt != SVt_PVAV)
271 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 295 croak ("encountered CBOR::XS::Tagged object that isn't an array");
272 296
273 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 297 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
274 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 298 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
275 } 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 }
276 else 352 else
277 {
278 // we re-bless the reference to get overload and other niceties right
279 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
280
281 if (to_cbor)
282 {
283 dSP;
284
285 ENTER; SAVETMPS; PUSHMARK (SP);
286 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
287
288 // calling with G_SCALAR ensures that we always get a 1 return value
289 PUTBACK;
290 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
291 SPAGAIN;
292
293 // catch this surprisingly common error
294 if (SvROK (TOPs) && SvRV (TOPs) == sv)
295 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
296
297 sv = POPs;
298 PUTBACK;
299
300 encode_sv (enc, sv);
301
302 FREETMPS; LEAVE;
303 }
304 else
305 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",
306 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 354 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
307 }
308 } 355 }
309 else if (svt == SVt_PVHV) 356 else if (svt == SVt_PVHV)
310 encode_hv (enc, (HV *)sv); 357 encode_hv (enc, (HV *)sv);
311 else if (svt == SVt_PVAV) 358 else if (svt == SVt_PVAV)
312 encode_av (enc, (AV *)sv); 359 encode_av (enc, (AV *)sv);
… …
562 609
563 SV *k = decode_sv (dec); 610 SV *k = decode_sv (dec);
564 SV *v = decode_sv (dec); 611 SV *v = decode_sv (dec);
565 612
566 hv_store_ent (hv, k, v, 0); 613 hv_store_ent (hv, k, v, 0);
614 SvREFCNT_dec (k);
567 } 615 }
568 } 616 }
569 else 617 else
570 { 618 {
571 int len = decode_uint (dec); 619 int len = decode_uint (dec);
… …
574 { 622 {
575 SV *k = decode_sv (dec); 623 SV *k = decode_sv (dec);
576 SV *v = decode_sv (dec); 624 SV *v = decode_sv (dec);
577 625
578 hv_store_ent (hv, k, v, 0); 626 hv_store_ent (hv, k, v, 0);
627 SvREFCNT_dec (k);
579 } 628 }
580 } 629 }
581 630
582 DEC_DEC_DEPTH; 631 DEC_DEC_DEPTH;
583 return newRV_noinc ((SV *)hv); 632 return newRV_noinc ((SV *)hv);
… …
636decode_tagged (dec_t *dec) 685decode_tagged (dec_t *dec)
637{ 686{
638 UV tag = decode_uint (dec); 687 UV tag = decode_uint (dec);
639 SV *sv = decode_sv (dec); 688 SV *sv = decode_sv (dec);
640 689
641 if (tag == CBOR_TAG_MAGIC) // 2.4.5 Self-Describe CBOR 690 if (tag == CBOR_TAG_MAGIC)
642 return sv; 691 return sv;
692 else if (tag == CBOR_TAG_PERL_OBJECT)
693 {
694 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
695 ERR ("corrupted CBOR data (non-array perl object)");
643 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);
705
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
736 {
644 AV *av = newAV (); 737 AV *av = newAV ();
645 av_push (av, newSVuv (tag)); 738 av_push (av, newSVuv (tag));
646 av_push (av, sv); 739 av_push (av, sv);
647 740
648 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 741 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
649 ? cbor_tagged_stash 742 ? cbor_tagged_stash
650 : gv_stashpv ("CBOR::XS::Tagged" , 1); 743 : gv_stashpv ("CBOR::XS::Tagged" , 1);
651 744
652 return sv_bless (newRV_noinc ((SV *)av), tagged_stash); 745 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
746 }
747
748fail:
749 SvREFCNT_dec (sv);
750 return &PL_sv_undef;
653} 751}
654 752
655static SV * 753static SV *
656decode_sv (dec_t *dec) 754decode_sv (dec_t *dec)
657{ 755{
… …
676 case 7: // misc 774 case 7: // misc
677 switch (*dec->cur++ & 31) 775 switch (*dec->cur++ & 31)
678 { 776 {
679 case 20: 777 case 20:
680#if CBOR_SLOW 778#if CBOR_SLOW
681 cbor_false = get_bool ("CBOR::XS::false"); 779 types_false = get_bool ("Types::Serialiser::false");
682#endif 780#endif
683 return newSVsv (cbor_false); 781 return newSVsv (types_false);
684 case 21: 782 case 21:
685#if CBOR_SLOW 783#if CBOR_SLOW
686 cbor_true = get_bool ("CBOR::XS::true"); 784 types_true = get_bool ("Types::Serialiser::true");
687#endif 785#endif
688 return newSVsv (cbor_true); 786 return newSVsv (types_true);
689 case 22: 787 case 22:
690 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);
691 794
692 case 25: 795 case 25:
693 { 796 {
694 WANT (2); 797 WANT (2);
695 798
… …
811MODULE = CBOR::XS PACKAGE = CBOR::XS 914MODULE = CBOR::XS PACKAGE = CBOR::XS
812 915
813BOOT: 916BOOT:
814{ 917{
815 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 918 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
816 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
817 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1); 919 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
818 920
819 cbor_true = get_bool ("CBOR::XS::true"); 921 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
820 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);
821} 930}
822 931
823PROTOTYPES: DISABLE 932PROTOTYPES: DISABLE
824 933
825void CLONE (...) 934void CLONE (...)
826 CODE: 935 CODE:
827 cbor_stash = 0; 936 cbor_stash = 0;
828 cbor_boolean_stash = 0;
829 cbor_tagged_stash = 0; 937 cbor_tagged_stash = 0;
938 types_error_stash = 0;
939 types_boolean_stash = 0;
830 940
831void new (char *klass) 941void new (char *klass)
832 PPCODE: 942 PPCODE:
833{ 943{
834 SV *pv = NEWSV (0, sizeof (CBOR)); 944 SV *pv = NEWSV (0, sizeof (CBOR));
… …
881 CODE: 991 CODE:
882 RETVAL = self->max_size; 992 RETVAL = self->max_size;
883 OUTPUT: 993 OUTPUT:
884 RETVAL 994 RETVAL
885 995
886#if 0 //TODO
887
888void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
889 PPCODE:
890{
891 SvREFCNT_dec (self->cb_object);
892 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
893
894 XPUSHs (ST (0));
895}
896
897void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef)
898 PPCODE:
899{
900 if (!self->cb_sk_object)
901 self->cb_sk_object = newHV ();
902
903 if (SvOK (cb))
904 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
905 else
906 {
907 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
908
909 if (!HvKEYS (self->cb_sk_object))
910 {
911 SvREFCNT_dec (self->cb_sk_object);
912 self->cb_sk_object = 0;
913 }
914 }
915
916 XPUSHs (ST (0));
917}
918
919#endif
920
921void encode (CBOR *self, SV *scalar) 996void encode (CBOR *self, SV *scalar)
922 PPCODE: 997 PPCODE:
923 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 998 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
924 XPUSHs (scalar); 999 XPUSHs (scalar);
925 1000
… …
937 EXTEND (SP, 2); 1012 EXTEND (SP, 2);
938 PUSHs (sv); 1013 PUSHs (sv);
939 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1014 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
940} 1015}
941 1016
942#if 0
943
944void DESTROY (CBOR *self)
945 CODE:
946 SvREFCNT_dec (self->cb_sk_object);
947 SvREFCNT_dec (self->cb_object);
948
949#endif
950
951PROTOTYPES: ENABLE 1017PROTOTYPES: ENABLE
952 1018
953void encode_cbor (SV *scalar) 1019void encode_cbor (SV *scalar)
954 PPCODE: 1020 PPCODE:
955{ 1021{

Diff Legend

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