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.26 by root, Fri Nov 22 09:40:13 2013 UTC vs.
Revision 1.30 by root, Thu Nov 28 11:36:53 2013 UTC

… …
19# define HvNAMELEN(hv) HvNAMELEN_get (hv) 19# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20#endif 20#endif
21#ifndef HvNAMEUTF8 21#ifndef HvNAMEUTF8
22# define HvNAMEUTF8(hv) 0 22# define HvNAMEUTF8(hv) 0
23#endif 23#endif
24#ifndef SvREFCNT_dec_NN
25# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
26#endif
24 27
25// known tags 28// known tags
26enum cbor_tag 29enum cbor_tag
27{ 30{
28 // inofficial extensions (pending iana registration) 31 // extensions
32 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
29 CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object 33 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
30 CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object 34 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
31 CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing 35 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
32 CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing 36 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
33 CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref 37 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
34 CBOR_TAG_STRINGREF = 28, // http://cbor.schmorp.de/stringref
35 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection 38 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
36 39
37 // rfc7049 40 // rfc7049
38 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 41 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
39 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any 42 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
… …
79# define CBOR_SLOW 0 82# define CBOR_SLOW 0
80# define CBOR_STASH cbor_stash 83# define CBOR_STASH cbor_stash
81#endif 84#endif
82 85
83static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS:: 86static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
84static SV *types_true, *types_false, *types_error, *sv_cbor; 87static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
85 88
86typedef struct { 89typedef struct {
87 U32 flags; 90 U32 flags;
88 U32 max_depth; 91 U32 max_depth;
89 STRLEN max_size; 92 STRLEN max_size;
93 SV *filter;
90} CBOR; 94} CBOR;
91 95
92ecb_inline void 96ecb_inline void
93cbor_init (CBOR *cbor) 97cbor_init (CBOR *cbor)
94{ 98{
95 Zero (cbor, 1, CBOR); 99 Zero (cbor, 1, CBOR);
96 cbor->max_depth = 512; 100 cbor->max_depth = 512;
101}
102
103ecb_inline void
104cbor_free (CBOR *cbor)
105{
106 SvREFCNT_dec (cbor->filter);
97} 107}
98 108
99///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
100// utility functions 110// utility functions
101 111
… …
131{ 141{
132 return idx > 23 142 return idx > 23
133 ? idx > 0xffU 143 ? idx > 0xffU
134 ? idx > 0xffffU 144 ? idx > 0xffffU
135 ? idx > 0xffffffffU 145 ? idx > 0xffffffffU
146 ? 11
136 ? 7 147 : 7
137 : 6
138 : 5 148 : 5
139 : 4 149 : 4
140 : 3; 150 : 3;
141} 151}
142 152
… …
220encode_tag (enc_t *enc, UV tag) 230encode_tag (enc_t *enc, UV tag)
221{ 231{
222 encode_uint (enc, 0xc0, tag); 232 encode_uint (enc, 0xc0, tag);
223} 233}
224 234
235ecb_inline void
236encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
237{
238 encode_uint (enc, utf8 ? 0x60 : 0x40, len);
239 need (enc, len);
240 memcpy (enc->cur, str, len);
241 enc->cur += len;
242}
243
225static void 244static void
226encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 245encode_strref (enc_t *enc, int utf8, char *str, STRLEN len)
227{ 246{
228 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF)) 247 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))
229 { 248 {
230 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 249 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
231 250
… …
242 sv_setuv (*svp, enc->stringref_idx); 261 sv_setuv (*svp, enc->stringref_idx);
243 ++enc->stringref_idx; 262 ++enc->stringref_idx;
244 } 263 }
245 } 264 }
246 265
247 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 266 encode_str (enc, utf8, str, len);
248 need (enc, len);
249 memcpy (enc->cur, str, len);
250 enc->cur += len;
251} 267}
252 268
253static void encode_sv (enc_t *enc, SV *sv); 269static void encode_sv (enc_t *enc, SV *sv);
254 270
255static void 271static void
… …
294 while ((he = hv_iternext (hv))) 310 while ((he = hv_iternext (hv)))
295 { 311 {
296 if (HeKLEN (he) == HEf_SVKEY) 312 if (HeKLEN (he) == HEf_SVKEY)
297 encode_sv (enc, HeSVKEY (he)); 313 encode_sv (enc, HeSVKEY (he));
298 else 314 else
299 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 315 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
300 316
301 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 317 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
302 } 318 }
303 319
304 if (mg) 320 if (mg)
… …
405 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 421 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
406 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 422 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
407 423
408 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 424 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
409 encode_uint (enc, 0x80, count + 1); 425 encode_uint (enc, 0x80, count + 1);
410 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 426 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
411 427
412 while (count) 428 while (count)
413 encode_sv (enc, SP[1 - count--]); 429 encode_sv (enc, SP[1 - count--]);
414 430
415 PUTBACK; 431 PUTBACK;
… …
474 490
475 if (SvPOKp (sv)) 491 if (SvPOKp (sv))
476 { 492 {
477 STRLEN len; 493 STRLEN len;
478 char *str = SvPV (sv, len); 494 char *str = SvPV (sv, len);
479 encode_str (enc, SvUTF8 (sv), str, len); 495 encode_strref (enc, SvUTF8 (sv), str, len);
480 } 496 }
481 else if (SvNOKp (sv)) 497 else if (SvNOKp (sv))
482 encode_nv (enc, sv); 498 encode_nv (enc, sv);
483 else if (SvIOKp (sv)) 499 else if (SvIOKp (sv))
484 { 500 {
… …
542 CBOR cbor; 558 CBOR cbor;
543 U32 depth; // recursion depth 559 U32 depth; // recursion depth
544 U32 maxdepth; // recursion depth limit 560 U32 maxdepth; // recursion depth limit
545 AV *shareable; 561 AV *shareable;
546 AV *stringref; 562 AV *stringref;
563 SV *decode_tagged;
547} dec_t; 564} dec_t;
548 565
549#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 566#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
550 567
551#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 568#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
… …
905 922
906 default: 923 default:
907 { 924 {
908 sv = decode_sv (dec); 925 sv = decode_sv (dec);
909 926
927 dSP;
928 ENTER; SAVETMPS; PUSHMARK (SP);
929 EXTEND (SP, 2);
930 PUSHs (newSVuv (tag));
931 PUSHs (sv);
932
933 PUTBACK;
934 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
935 SPAGAIN;
936
937 if (SvTRUE (ERRSV))
938 {
939 FREETMPS; LEAVE;
940 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
941 }
942
943 if (count)
944 {
945 SvREFCNT_dec (sv);
946 sv = SvREFCNT_inc (POPs);
947 }
948 else
949 {
910 AV *av = newAV (); 950 AV *av = newAV ();
911 av_push (av, newSVuv (tag)); 951 av_push (av, newSVuv (tag));
912 av_push (av, sv); 952 av_push (av, sv);
913 953
914 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 954 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
915 ? cbor_tagged_stash 955 ? cbor_tagged_stash
916 : gv_stashpv ("CBOR::XS::Tagged" , 1); 956 : gv_stashpv ("CBOR::XS::Tagged" , 1);
917
918 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash); 957 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
958 }
959
960 PUTBACK;
961
962 FREETMPS; LEAVE;
919 } 963 }
920 break; 964 break;
921 } 965 }
922 966
923 return sv; 967 return sv;
… …
1069 1113
1070 types_true = get_bool ("Types::Serialiser::true" ); 1114 types_true = get_bool ("Types::Serialiser::true" );
1071 types_false = get_bool ("Types::Serialiser::false"); 1115 types_false = get_bool ("Types::Serialiser::false");
1072 types_error = get_bool ("Types::Serialiser::error"); 1116 types_error = get_bool ("Types::Serialiser::error");
1073 1117
1118 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1119
1074 sv_cbor = newSVpv ("CBOR", 0); 1120 sv_cbor = newSVpv ("CBOR", 0);
1075 SvREADONLY_on (sv_cbor); 1121 SvREADONLY_on (sv_cbor);
1076} 1122}
1077 1123
1078PROTOTYPES: DISABLE 1124PROTOTYPES: DISABLE
… …
1141 CODE: 1187 CODE:
1142 RETVAL = self->max_size; 1188 RETVAL = self->max_size;
1143 OUTPUT: 1189 OUTPUT:
1144 RETVAL 1190 RETVAL
1145 1191
1192void filter (CBOR *self, SV *filter = 0)
1193 PPCODE:
1194 SvREFCNT_dec (self->filter);
1195 self->filter = filter ? newSVsv (filter) : filter;
1196 XPUSHs (ST (0));
1197
1198SV *get_filter (CBOR *self)
1199 CODE:
1200 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1201 OUTPUT:
1202 RETVAL
1203
1146void encode (CBOR *self, SV *scalar) 1204void encode (CBOR *self, SV *scalar)
1147 PPCODE: 1205 PPCODE:
1148 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1206 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1149 XPUSHs (scalar); 1207 XPUSHs (scalar);
1150 1208
… …
1162 EXTEND (SP, 2); 1220 EXTEND (SP, 2);
1163 PUSHs (sv); 1221 PUSHs (sv);
1164 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1222 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1165} 1223}
1166 1224
1225void DESTROY (CBOR *self)
1226 PPCODE:
1227 cbor_free (self);
1228
1167PROTOTYPES: ENABLE 1229PROTOTYPES: ENABLE
1168 1230
1169void encode_cbor (SV *scalar) 1231void encode_cbor (SV *scalar)
1170 PPCODE: 1232 PPCODE:
1171{ 1233{

Diff Legend

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