summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Try to be compatible with ruby 1.8v1.8.6v1.8Florian Frank2017-01-136-5/+12
|
* Update gemspecsv1.8.5Florian Frank2017-01-122-20/+21
|
* Stop testing on 1.8, it might work thoughFlorian Frank2017-01-124-25/+21
|
* Travis don't know how to build these rubiesFlorian Frank2017-01-121-2/+0
|
* Fix conversion crash on 1.9Florian Frank2017-01-126-6/+9
|
* Require ruby version 2.0 or betterFlorian Frank2017-01-113-0/+3
|
* Reduce supported ruby versionsFlorian Frank2017-01-111-8/+0
|
* Test newer rubiesFlorian Frank2017-01-115-23/+25
|
* Use 2.3.1 for testingFlorian Frank2016-06-211-1/+1
|
* Merge RUBY_INTEGER_UNIFICATION changesFlorian Frank2016-06-216-176/+265
|
* Make it interactiveFlorian Frank2016-06-211-2/+9
|
* Easy diffingFlorian Frank2016-06-211-0/+11
|
* Use ~> 2.0 test-unit that runs on 1.8 rubies as wellFlorian Frank2016-02-254-8/+8
|
* Only test main 2.2 branchFlorian Frank2016-02-251-3/+0
|
* Move dependencies into gemspec filesFlorian Frank2016-02-255-5/+23
|
* Check for existence of #to_json method before callFlorian Frank2016-02-252-3/+11
|
* Avoid system stack errorFlorian Frank2016-02-251-1/+1
|
* Remove permutation dependencyFlorian Frank2016-02-254-41/+2
|
* Be gone…Florian Frank2016-02-251-13/+0
|
* Attempt to switch jruby into 2.0 modeFlorian Frank2016-02-251-4/+3
|
* Add 2.3.0 for travis tetingFlorian Frank2016-02-251-0/+1
|
* Add missing testsFlorian Frank2016-02-251-0/+24
|
* Call OBJECT_HANDLER for objects without #to_jsonFlorian Frank2016-02-251-5/+8
| | | as a last-ditch effort.
* Correct CHANGESFlorian Frank2015-11-061-1/+2
|
* Convert README to markdownFlorian Frank2015-11-064-35/+35
|
* Fix some linksFlorian Frank2015-11-051-15/+4
|
* Skip 1.8.4Florian Frank2015-10-204-5/+5
|
* Add 2.2.3 explicitelyFlorian Frank2015-09-111-0/+1
|
* Remove sdoc and upgrade dependenciesFlorian Frank2015-09-113-25/+11
|
* Bump version to 1.8.4 and add to CHANGESFlorian Frank2015-09-113-2/+10
|
* Remove remnants of GPL licensesFlorian Frank2015-09-1117-482/+18
|
* Bump version to 1.8.3v1.8.3Florian Frank2015-06-015-4/+6
|
* use newest rubygemsFlorian Frank2015-06-012-2/+2
|
* Check 2.2.1 and 2.2.2 explicitelyFlorian Frank2015-06-011-0/+2
|
* Merge pull request #247 from nobu/potential_memory_leakFlorian Frank2015-05-295-34/+15
|\ | | | | Potential memory leak
| * generator.c: allocate structs with wrappernobu2015-05-282-11/+5
| | | | | | | | | | | | | | | | * ext/json/ext/generator/generator.c (cState_s_allocate): allocate structs with making new wrapper objects and get rid of potential memory leak. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| * parser.rl: allocate structs with wrappernobu2015-05-283-23/+10
|/ | | | | | | | * ext/json/ext/parser/parser.rl (cJSON_parser_s_allocate): allocate structs with making new wrapper objects and get rid of potential memory leak. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Merge pull request #245 from headius/patch-1Florian Frank2015-04-221-3/+3
|\ | | | | Fix mention of C extensions in README
| * Fix mention of C extensions in READMECharles Oliver Nutter2015-04-211-3/+3
|/ | | JRuby's extension is part of json now and is written in Java.
* use ZALLOC if it can be used, and defined ZALLOC macro.SHIBATA Hiroshi2015-02-125-39/+54
|
* sync trunk again: fixed regression of r49027SHIBATA Hiroshi2015-02-122-9/+9
|
* Merge branch 'master' of storage.gate.ping.de:/git/jsonv1.8.2Florian Frank2015-01-090-0/+0
|\
| * Bump version number to 1.8.2Florian Frank2015-01-084-5/+5
| |
| * Merge branch 'master' of github.com:flori/jsonFlorian Frank2015-01-083-4/+19
| |\
| | * Merge pull request #225 from mmacvicar/fix-space-beforeFlorian Frank2015-01-032-0/+14
| | |\ | | | | | | | | JSON::State is not using the parameter space_before
| | | * Make generator format test backwards compatibleMichael Mac-Vicar2014-12-071-1/+1
| | | |
| | | * Use space_before as documented in the generatorMichael Mac-Vicar2014-12-071-0/+1
| | | | | | | | | | | | | | | | | | | | This option was already documented but not implemented, allows setting the separator used before the ":" during generation.
| | | * Add test for format options used by the generatorMichael Mac-Vicar2014-12-071-0/+13
| | | | | | | | | | | | | | | | | | | | The space_before, space, indent, object_nl and array_nl options of the space were not covered.
| | * | Merge pull request #226 from bbrowning/runtimeinfo-contention-fixFlorian Frank2015-01-022-89/+91
| | |\ \ | | | | | | | | | | Improve JRuby perf. by removing source of multithreaded contention
| | | * | Improve JRuby perf. by removing source of multithreaded contentionBen Browning2014-12-162-89/+91
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RuntimeInfo.forRuntime method synchronizes all invocations and ParserSession#parseString was calling this many times when parsing large JSON strings. Thus, when running in a heavily multithreaded environment, threads were spending a large portion of their time waiting on that synchronization instead of doing work parsing the JSON. This fix simply passes in the RuntimeInfo object to the ParserSession when it's instantiated, since the RuntimeInfo is already known and we've already incurred the synchronization cost at that time. Using the test script at https://gist.github.com/bbrowning/0b89580b03a5f19e7a9f, I get the following results before and after this fix on my machine: Before: $ jruby ~/tmp/json_contention.rb 337.920000 0.570000 338.490000 ( 57.955000) After: $ jruby ~/tmp/json_contention.rb 326.400000 0.580000 326.980000 ( 43.084000) That's a 25% reduction in processing time for parsing the same JSON on my quad core machine. I'd expect an even higher percentage improvement on a machine with more CPUs.
View Lorry Controller Status