ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/JSON-XS/XS.xs
(Generate patch)

Comparing JSON-XS/XS.xs (file contents):
Revision 1.56 by root, Thu Jul 26 11:33:35 2007 UTC vs.
Revision 1.64 by root, Mon Aug 27 02:03:23 2007 UTC

… …
27#define F_SPACE_AFTER 0x00000040UL 27#define F_SPACE_AFTER 0x00000040UL
28#define F_ALLOW_NONREF 0x00000100UL 28#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 29#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 30#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 31#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL
33
32#define F_MAXDEPTH 0xf8000000UL 34#define F_MAXDEPTH 0xf8000000UL
33#define S_MAXDEPTH 27 35#define S_MAXDEPTH 27
34#define F_MAXSIZE 0x01f00000UL 36#define F_MAXSIZE 0x01f00000UL
35#define S_MAXSIZE 20 37#define S_MAXSIZE 20
36#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
… …
57# define inline static 59# define inline static
58#endif 60#endif
59 61
60#define expect_false(expr) expect ((expr) != 0, 0) 62#define expect_false(expr) expect ((expr) != 0, 0)
61#define expect_true(expr) expect ((expr) != 0, 1) 63#define expect_true(expr) expect ((expr) != 0, 1)
64
65#ifdef USE_ITHREADS
66# define JSON_SLOW 1
67# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
68#else
69# define JSON_SLOW 0
70# define JSON_STASH json_stash
71#endif
62 72
63static HV *json_stash, *json_boolean_stash; // JSON::XS:: 73static HV *json_stash, *json_boolean_stash; // JSON::XS::
64static SV *json_true, *json_false; 74static SV *json_true, *json_false;
65 75
66typedef struct { 76typedef struct {
… …
327 --enc->indent; 337 --enc->indent;
328 encode_indent (enc); encode_ch (enc, ']'); 338 encode_indent (enc); encode_ch (enc, ']');
329} 339}
330 340
331static void 341static void
332encode_he (enc_t *enc, HE *he) 342encode_hk (enc_t *enc, HE *he)
333{ 343{
334 encode_ch (enc, '"'); 344 encode_ch (enc, '"');
335 345
336 if (HeKLEN (he) == HEf_SVKEY) 346 if (HeKLEN (he) == HEf_SVKEY)
337 { 347 {
… …
350 encode_ch (enc, '"'); 360 encode_ch (enc, '"');
351 361
352 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 362 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
353 encode_ch (enc, ':'); 363 encode_ch (enc, ':');
354 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 364 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
355 encode_sv (enc, HeVAL (he));
356} 365}
357 366
358// compare hash entries, used when all keys are bytestrings 367// compare hash entries, used when all keys are bytestrings
359static int 368static int
360he_cmp_fast (const void *a_, const void *b_) 369he_cmp_fast (const void *a_, const void *b_)
… …
365 HE *b = *(HE **)b_; 374 HE *b = *(HE **)b_;
366 375
367 STRLEN la = HeKLEN (a); 376 STRLEN la = HeKLEN (a);
368 STRLEN lb = HeKLEN (b); 377 STRLEN lb = HeKLEN (b);
369 378
370 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 379 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
371 cmp = la - lb; 380 cmp = lb - la;
372 381
373 return cmp; 382 return cmp;
374} 383}
375 384
376// compare hash entries, used when some keys are sv's or utf-x 385// compare hash entries, used when some keys are sv's or utf-x
377static int 386static int
378he_cmp_slow (const void *a, const void *b) 387he_cmp_slow (const void *a, const void *b)
379{ 388{
380 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 389 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
381} 390}
382 391
383static void 392static void
384encode_hv (enc_t *enc, HV *hv) 393encode_hv (enc_t *enc, HV *hv)
385{ 394{
395 HE *he;
386 int count, i; 396 int count;
387 397
388 if (enc->indent >= enc->maxdepth) 398 if (enc->indent >= enc->maxdepth)
389 croak ("data structure too deep (hit recursion limit)"); 399 croak ("data structure too deep (hit recursion limit)");
390 400
391 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 401 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
392 402
393 if ((count = hv_iterinit (hv)))
394 {
395 // for canonical output we have to sort by keys first 403 // for canonical output we have to sort by keys first
396 // actually, this is mostly due to the stupid so-called 404 // actually, this is mostly due to the stupid so-called
397 // security workaround added somewhere in 5.8.x. 405 // security workaround added somewhere in 5.8.x.
398 // that randomises hash orderings 406 // that randomises hash orderings
399 if (enc->json.flags & F_CANONICAL) 407 if (enc->json.flags & F_CANONICAL)
408 {
409 int count = hv_iterinit (hv);
410
411 if (SvMAGICAL (hv))
400 { 412 {
413 // need to count by iterating. could improve by dynamically building the vector below
414 // but I don't care for the speed of this special case.
415 // note also that we will run into undefined behaviour when the two iterations
416 // do not result in the same count, something I might care for in some later release.
417
418 count = 0;
419 while (hv_iternext (hv))
420 ++count;
421
422 hv_iterinit (hv);
423 }
424
425 if (count)
426 {
401 int fast = 1; 427 int i, fast = 1;
402 HE *he;
403#if defined(__BORLANDC__) || defined(_MSC_VER) 428#if defined(__BORLANDC__) || defined(_MSC_VER)
404 HE **hes = _alloca (count * sizeof (HE)); 429 HE **hes = _alloca (count * sizeof (HE));
405#else 430#else
406 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 431 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
407#endif 432#endif
… …
434 459
435 FREETMPS; 460 FREETMPS;
436 LEAVE; 461 LEAVE;
437 } 462 }
438 463
439 for (i = 0; i < count; ++i) 464 while (count--)
440 { 465 {
441 encode_indent (enc); 466 encode_indent (enc);
467 he = hes [count];
442 encode_he (enc, hes [i]); 468 encode_hk (enc, he);
469 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
443 470
444 if (i < count - 1) 471 if (count)
445 encode_comma (enc); 472 encode_comma (enc);
446 } 473 }
447
448 encode_nl (enc);
449 } 474 }
475 }
450 else 476 else
451 { 477 {
478 if (hv_iterinit (hv) || SvMAGICAL (hv))
452 HE *he = hv_iternext (hv); 479 if ((he = hv_iternext (hv)))
453
454 for (;;) 480 for (;;)
455 { 481 {
456 encode_indent (enc); 482 encode_indent (enc);
457 encode_he (enc, he); 483 encode_hk (enc, he);
484 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
458 485
459 if (!(he = hv_iternext (hv))) 486 if (!(he = hv_iternext (hv)))
460 break; 487 break;
461 488
462 encode_comma (enc); 489 encode_comma (enc);
463 } 490 }
491 }
464 492
465 encode_nl (enc); 493 encode_nl (enc);
466 }
467 }
468 494
469 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 495 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
470} 496}
471 497
472// encode objects, arrays and special \0=false and \1=true values. 498// encode objects, arrays and special \0=false and \1=true values.
… …
478 SvGETMAGIC (sv); 504 SvGETMAGIC (sv);
479 svt = SvTYPE (sv); 505 svt = SvTYPE (sv);
480 506
481 if (expect_false (SvOBJECT (sv))) 507 if (expect_false (SvOBJECT (sv)))
482 { 508 {
509 HV *stash = !JSON_SLOW || json_boolean_stash
510 ? json_boolean_stash
511 : gv_stashpv ("JSON::XS::Boolean", 1);
512
483 if (SvSTASH (sv) == json_boolean_stash) 513 if (SvSTASH (sv) == stash)
484 { 514 {
485 if (SvIV (sv)) 515 if (SvIV (sv))
486 encode_str (enc, "true", 4, 0); 516 encode_str (enc, "true", 4, 0);
487 else 517 else
488 encode_str (enc, "false", 5, 0); 518 encode_str (enc, "false", 5, 0);
… …
500 // we re-bless the reference to get overload and other niceties right 530 // we re-bless the reference to get overload and other niceties right
501 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0); 531 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
502 532
503 if (to_json) 533 if (to_json)
504 { 534 {
505 int count;
506 dSP; 535 dSP;
507 536
508 ENTER; SAVETMPS; PUSHMARK (SP); 537 ENTER; SAVETMPS; PUSHMARK (SP);
509 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 538 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
510 539
… …
671 U32 depth; // recursion depth 700 U32 depth; // recursion depth
672 U32 maxdepth; // recursion depth limit 701 U32 maxdepth; // recursion depth limit
673} dec_t; 702} dec_t;
674 703
675inline void 704inline void
705decode_comment (dec_t *dec)
706{
707 // only '#'-style comments allowed a.t.m.
708
709 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
710 ++dec->cur;
711}
712
713inline void
676decode_ws (dec_t *dec) 714decode_ws (dec_t *dec)
677{ 715{
678 for (;;) 716 for (;;)
679 { 717 {
680 char ch = *dec->cur; 718 char ch = *dec->cur;
681 719
682 if (ch > 0x20 720 if (ch > 0x20)
721 {
722 if (expect_false (ch == '#'))
723 {
724 if (dec->json.flags & F_RELAXED)
725 decode_comment (dec);
726 else
727 break;
728 }
729 else
730 break;
731 }
683 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 732 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
684 break; 733 break; // parse error, but let higher level handle it, gives better error messages
685 734
686 ++dec->cur; 735 ++dec->cur;
687 } 736 }
688} 737}
689 738
… …
1026 1075
1027 if (*dec->cur != ',') 1076 if (*dec->cur != ',')
1028 ERR (", or ] expected while parsing array"); 1077 ERR (", or ] expected while parsing array");
1029 1078
1030 ++dec->cur; 1079 ++dec->cur;
1080
1081 decode_ws (dec);
1082
1083 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1084 {
1085 ++dec->cur;
1086 break;
1087 }
1031 } 1088 }
1032 1089
1033 DEC_DEC_DEPTH; 1090 DEC_DEC_DEPTH;
1034 return newRV_noinc ((SV *)av); 1091 return newRV_noinc ((SV *)av);
1035 1092
… …
1051 if (*dec->cur == '}') 1108 if (*dec->cur == '}')
1052 ++dec->cur; 1109 ++dec->cur;
1053 else 1110 else
1054 for (;;) 1111 for (;;)
1055 { 1112 {
1056 decode_ws (dec); EXPECT_CH ('"'); 1113 EXPECT_CH ('"');
1057 1114
1058 // heuristic: assume that 1115 // heuristic: assume that
1059 // a) decode_str + hv_store_ent are abysmally slow. 1116 // a) decode_str + hv_store_ent are abysmally slow.
1060 // b) most hash keys are short, simple ascii text. 1117 // b) most hash keys are short, simple ascii text.
1061 // => try to "fast-match" such strings to avoid 1118 // => try to "fast-match" such strings to avoid
… …
1075 if (!key) 1132 if (!key)
1076 goto fail; 1133 goto fail;
1077 1134
1078 decode_ws (dec); EXPECT_CH (':'); 1135 decode_ws (dec); EXPECT_CH (':');
1079 1136
1137 decode_ws (dec);
1080 value = decode_sv (dec); 1138 value = decode_sv (dec);
1081 if (!value) 1139 if (!value)
1082 { 1140 {
1083 SvREFCNT_dec (key); 1141 SvREFCNT_dec (key);
1084 goto fail; 1142 goto fail;
… …
1096 int len = p - key; 1154 int len = p - key;
1097 dec->cur = p + 1; 1155 dec->cur = p + 1;
1098 1156
1099 decode_ws (dec); EXPECT_CH (':'); 1157 decode_ws (dec); EXPECT_CH (':');
1100 1158
1159 decode_ws (dec);
1101 value = decode_sv (dec); 1160 value = decode_sv (dec);
1102 if (!value) 1161 if (!value)
1103 goto fail; 1162 goto fail;
1104 1163
1105 hv_store (hv, key, len, value, 0); 1164 hv_store (hv, key, len, value, 0);
… …
1121 1180
1122 if (*dec->cur != ',') 1181 if (*dec->cur != ',')
1123 ERR (", or } expected while parsing object/hash"); 1182 ERR (", or } expected while parsing object/hash");
1124 1183
1125 ++dec->cur; 1184 ++dec->cur;
1185
1186 decode_ws (dec);
1187
1188 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1189 {
1190 ++dec->cur;
1191 break;
1192 }
1126 } 1193 }
1127 1194
1128 DEC_DEC_DEPTH; 1195 DEC_DEC_DEPTH;
1129 sv = newRV_noinc ((SV *)hv); 1196 sv = newRV_noinc ((SV *)hv);
1130 1197
… …
1195} 1262}
1196 1263
1197static SV * 1264static SV *
1198decode_sv (dec_t *dec) 1265decode_sv (dec_t *dec)
1199{ 1266{
1200 decode_ws (dec);
1201
1202 // the beauty of JSON: you need exactly one character lookahead 1267 // the beauty of JSON: you need exactly one character lookahead
1203 // to parse anything. 1268 // to parse anything.
1204 switch (*dec->cur) 1269 switch (*dec->cur)
1205 { 1270 {
1206 case '"': ++dec->cur; return decode_str (dec); 1271 case '"': ++dec->cur; return decode_str (dec);
… …
1214 1279
1215 case 't': 1280 case 't':
1216 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1281 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1217 { 1282 {
1218 dec->cur += 4; 1283 dec->cur += 4;
1284#if JSON_SLOW
1285 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
1286#endif
1219 return SvREFCNT_inc (json_true); 1287 return SvREFCNT_inc (json_true);
1220 } 1288 }
1221 else 1289 else
1222 ERR ("'true' expected"); 1290 ERR ("'true' expected");
1223 1291
… …
1225 1293
1226 case 'f': 1294 case 'f':
1227 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1295 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1228 { 1296 {
1229 dec->cur += 5; 1297 dec->cur += 5;
1298#if JSON_SLOW
1299 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1300#endif
1230 return SvREFCNT_inc (json_false); 1301 return SvREFCNT_inc (json_false);
1231 } 1302 }
1232 else 1303 else
1233 ERR ("'false' expected"); 1304 ERR ("'false' expected");
1234 1305
… …
1284 1355
1285 if (dec.json.cb_object || dec.json.cb_sk_object) 1356 if (dec.json.cb_object || dec.json.cb_sk_object)
1286 dec.json.flags |= F_HOOK; 1357 dec.json.flags |= F_HOOK;
1287 1358
1288 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1359 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1360
1361 decode_ws (&dec);
1289 sv = decode_sv (&dec); 1362 sv = decode_sv (&dec);
1290 1363
1291 if (!(offset_return || !sv)) 1364 if (!(offset_return || !sv))
1292 { 1365 {
1293 // check for trailing garbage 1366 // check for trailing garbage
… …
1361 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1434 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1362} 1435}
1363 1436
1364PROTOTYPES: DISABLE 1437PROTOTYPES: DISABLE
1365 1438
1439void CLONE (...)
1440 CODE:
1441 json_stash = 0;
1442 json_boolean_stash = 0;
1443
1366void new (char *klass) 1444void new (char *klass)
1367 PPCODE: 1445 PPCODE:
1368{ 1446{
1369 SV *pv = NEWSV (0, sizeof (JSON)); 1447 SV *pv = NEWSV (0, sizeof (JSON));
1370 SvPOK_only (pv); 1448 SvPOK_only (pv);
1371 Zero (SvPVX (pv), 1, JSON); 1449 Zero (SvPVX (pv), 1, JSON);
1372 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1450 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1373 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash))); 1451 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1374} 1452}
1375 1453
1376void ascii (JSON *self, int enable = 1) 1454void ascii (JSON *self, int enable = 1)
1377 ALIAS: 1455 ALIAS:
1378 ascii = F_ASCII 1456 ascii = F_ASCII
… …
1385 pretty = F_PRETTY 1463 pretty = F_PRETTY
1386 allow_nonref = F_ALLOW_NONREF 1464 allow_nonref = F_ALLOW_NONREF
1387 shrink = F_SHRINK 1465 shrink = F_SHRINK
1388 allow_blessed = F_ALLOW_BLESSED 1466 allow_blessed = F_ALLOW_BLESSED
1389 convert_blessed = F_CONV_BLESSED 1467 convert_blessed = F_CONV_BLESSED
1468 relaxed = F_RELAXED
1390 PPCODE: 1469 PPCODE:
1391{ 1470{
1392 if (enable) 1471 if (enable)
1393 self->flags |= ix; 1472 self->flags |= ix;
1394 else 1473 else

Diff Legend

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