Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Try to be compatible with ruby 1.8v1.8.6v1.8 | Florian Frank | 2017-01-13 | 6 | -5/+12 |
| | |||||
* | Update gemspecsv1.8.5 | Florian Frank | 2017-01-12 | 2 | -20/+21 |
| | |||||
* | Stop testing on 1.8, it might work though | Florian Frank | 2017-01-12 | 4 | -25/+21 |
| | |||||
* | Travis don't know how to build these rubies | Florian Frank | 2017-01-12 | 1 | -2/+0 |
| | |||||
* | Fix conversion crash on 1.9 | Florian Frank | 2017-01-12 | 6 | -6/+9 |
| | |||||
* | Require ruby version 2.0 or better | Florian Frank | 2017-01-11 | 3 | -0/+3 |
| | |||||
* | Reduce supported ruby versions | Florian Frank | 2017-01-11 | 1 | -8/+0 |
| | |||||
* | Test newer rubies | Florian Frank | 2017-01-11 | 5 | -23/+25 |
| | |||||
* | Use 2.3.1 for testing | Florian Frank | 2016-06-21 | 1 | -1/+1 |
| | |||||
* | Merge RUBY_INTEGER_UNIFICATION changes | Florian Frank | 2016-06-21 | 6 | -176/+265 |
| | |||||
* | Make it interactive | Florian Frank | 2016-06-21 | 1 | -2/+9 |
| | |||||
* | Easy diffing | Florian Frank | 2016-06-21 | 1 | -0/+11 |
| | |||||
* | Use ~> 2.0 test-unit that runs on 1.8 rubies as well | Florian Frank | 2016-02-25 | 4 | -8/+8 |
| | |||||
* | Only test main 2.2 branch | Florian Frank | 2016-02-25 | 1 | -3/+0 |
| | |||||
* | Move dependencies into gemspec files | Florian Frank | 2016-02-25 | 5 | -5/+23 |
| | |||||
* | Check for existence of #to_json method before call | Florian Frank | 2016-02-25 | 2 | -3/+11 |
| | |||||
* | Avoid system stack error | Florian Frank | 2016-02-25 | 1 | -1/+1 |
| | |||||
* | Remove permutation dependency | Florian Frank | 2016-02-25 | 4 | -41/+2 |
| | |||||
* | Be goneā¦ | Florian Frank | 2016-02-25 | 1 | -13/+0 |
| | |||||
* | Attempt to switch jruby into 2.0 mode | Florian Frank | 2016-02-25 | 1 | -4/+3 |
| | |||||
* | Add 2.3.0 for travis teting | Florian Frank | 2016-02-25 | 1 | -0/+1 |
| | |||||
* | Add missing tests | Florian Frank | 2016-02-25 | 1 | -0/+24 |
| | |||||
* | Call OBJECT_HANDLER for objects without #to_json | Florian Frank | 2016-02-25 | 1 | -5/+8 |
| | | | as a last-ditch effort. | ||||
* | Correct CHANGES | Florian Frank | 2015-11-06 | 1 | -1/+2 |
| | |||||
* | Convert README to markdown | Florian Frank | 2015-11-06 | 4 | -35/+35 |
| | |||||
* | Fix some links | Florian Frank | 2015-11-05 | 1 | -15/+4 |
| | |||||
* | Skip 1.8.4 | Florian Frank | 2015-10-20 | 4 | -5/+5 |
| | |||||
* | Add 2.2.3 explicitely | Florian Frank | 2015-09-11 | 1 | -0/+1 |
| | |||||
* | Remove sdoc and upgrade dependencies | Florian Frank | 2015-09-11 | 3 | -25/+11 |
| | |||||
* | Bump version to 1.8.4 and add to CHANGES | Florian Frank | 2015-09-11 | 3 | -2/+10 |
| | |||||
* | Remove remnants of GPL licenses | Florian Frank | 2015-09-11 | 17 | -482/+18 |
| | |||||
* | Bump version to 1.8.3v1.8.3 | Florian Frank | 2015-06-01 | 5 | -4/+6 |
| | |||||
* | use newest rubygems | Florian Frank | 2015-06-01 | 2 | -2/+2 |
| | |||||
* | Check 2.2.1 and 2.2.2 explicitely | Florian Frank | 2015-06-01 | 1 | -0/+2 |
| | |||||
* | Merge pull request #247 from nobu/potential_memory_leak | Florian Frank | 2015-05-29 | 5 | -34/+15 |
|\ | | | | | Potential memory leak | ||||
| * | generator.c: allocate structs with wrapper | nobu | 2015-05-28 | 2 | -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 wrapper | nobu | 2015-05-28 | 3 | -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-1 | Florian Frank | 2015-04-22 | 1 | -3/+3 |
|\ | | | | | Fix mention of C extensions in README | ||||
| * | Fix mention of C extensions in README | Charles Oliver Nutter | 2015-04-21 | 1 | -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 Hiroshi | 2015-02-12 | 5 | -39/+54 |
| | |||||
* | sync trunk again: fixed regression of r49027 | SHIBATA Hiroshi | 2015-02-12 | 2 | -9/+9 |
| | |||||
* | Merge branch 'master' of storage.gate.ping.de:/git/jsonv1.8.2 | Florian Frank | 2015-01-09 | 0 | -0/+0 |
|\ | |||||
| * | Bump version number to 1.8.2 | Florian Frank | 2015-01-08 | 4 | -5/+5 |
| | | |||||
| * | Merge branch 'master' of github.com:flori/json | Florian Frank | 2015-01-08 | 3 | -4/+19 |
| |\ | |||||
| | * | Merge pull request #225 from mmacvicar/fix-space-before | Florian Frank | 2015-01-03 | 2 | -0/+14 |
| | |\ | | | | | | | | | JSON::State is not using the parameter space_before | ||||
| | | * | Make generator format test backwards compatible | Michael Mac-Vicar | 2014-12-07 | 1 | -1/+1 |
| | | | | |||||
| | | * | Use space_before as documented in the generator | Michael Mac-Vicar | 2014-12-07 | 1 | -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 generator | Michael Mac-Vicar | 2014-12-07 | 1 | -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-fix | Florian Frank | 2015-01-02 | 2 | -89/+91 |
| | |\ \ | | | | | | | | | | | Improve JRuby perf. by removing source of multithreaded contention | ||||
| | | * | | Improve JRuby perf. by removing source of multithreaded contention | Ben Browning | 2014-12-16 | 2 | -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. |