--- JSON-XS/eg/bench	2007/06/11 03:18:07	1.11
+++ JSON-XS/eg/bench	2008/03/25 06:37:39	1.20
@@ -2,22 +2,24 @@
 
 # Usage: bench json-file
 
-# which modules to test (JSON usually excluded because its so slow)
+# which modules to test (JSON::PP usually excluded because its so slow)
 my %tst = (
-#   "JSON"         => ['objToJson $perl'       , 'jsonToObj $json'],
-#   "JSON::DWIW"   => ['$dwiw->to_json ($perl)', '$dwiw->from_json ($json)'],
-#   "JSON::PC"     => ['$pc->convert ($perl)'  , '$pc->parse ($json)'],
-#   "JSON::Syck"   => ['JSON::Syck::Dump $perl', 'JSON::Syck::Load $json'],
-   "JSON::XS"     => ['to_json $perl'         , 'from_json $json'],
-#   "JSON::XS/2"   => ['$xs2->encode ($perl)'  , '$xs2->decode ($json)'],
-#   "JSON::XS/3"   => ['$xs3->encode ($perl)'  , '$xs3->decode ($json)'],
-   "Storable"     => ['Storable::nfreeze $perl', 'Storable::thaw $pst'],
+#   "JSON"         => ['JSON::encode_json $perl'  , 'JSON::decode_json $json'],
+#   "JSON::PP"     => ['$pp->encode ($perl)'      , '$pp->decode ($json)'],
+   "JSON::DWIW"   => ['$dwiw->to_json ($perl)'   , '$dwiw->from_json ($json)'],
+   "JSON::PC"     => ['$pc->convert ($perl)'     , '$pc->parse ($json)'],
+   "JSON::Syck"   => ['JSON::Syck::Dump $perl'   , 'JSON::Syck::Load $json'],
+   "JSON::XS"     => ['encode_json $perl'        , 'decode_json $json'],
+   "JSON::XS/2"   => ['$xs2->encode ($perl)'     , '$xs2->decode ($json)'],
+   "JSON::XS/3"   => ['$xs3->encode ($perl)'     , '$xs3->decode ($json)'],
+   "Storable"     => ['Storable::nfreeze $perl'  , 'Storable::thaw $pst'],
 );
 
-use JSON;
+use JSON ();
 use JSON::DWIW;
 use JSON::PC;
-use JSON::XS qw(to_json from_json);
+use JSON::PP ();
+use JSON::XS qw(encode_json decode_json);
 use JSON::Syck;
 use Storable ();
 
@@ -28,6 +30,7 @@
 
 my $dwiw = new JSON::DWIW;
 my $pc   = new JSON::PC;
+my $pp   = JSON::PP->new->max_depth (512);
 my $xs2  = JSON::XS->new->utf8->pretty->canonical;
 my $xs3  = JSON::XS->new->utf8->shrink;
 
@@ -37,7 +40,7 @@
 $json = <>;
 
 # fix syck-brokenised stuff
-$json = JSON::XS->new->ascii(1)->encode (JSON::Syck::Load $json);
+#$json = JSON::XS->new->ascii(1)->encode (JSON::Syck::Load $json);
 
 #srand 0; $json = JSON::XS->new->utf8(1)->ascii(0)->encode ([join "", map +(chr rand 255), 0..2047]);
 
@@ -54,11 +57,11 @@
 sub bench($) {
    my ($code) = @_;
 
-   my $perl = jsonToObj $json;
-   my $pst  = Storable::nfreeze $perl;
+   my $pst  = Storable::nfreeze JSON::XS::decode_json $json; # seperately decode as storable stringifies :/
+   my $perl = JSON::XS::decode_json $json;
 
    my $count = 5;
-   my $times = 200;
+   my $times = 2;
 
    my $cent = eval "sub { my \$t = Time::HiRes::time; " . (join ";", ($code) x $count) . "; Time::HiRes::time - \$t }";
    $cent->();