diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-01 14:36:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-01 14:36:26 +0200 |
| commit | c47ed44be76a520ded90913099771999c8a79eeb (patch) | |
| tree | 88923b515b01907520e70f721d6f1fffd0965589 | |
| parent | 815b76bff618c07226653e11f29c4d3c5640b63a (diff) | |
| download | vim-git-8.1.1439.tar.gz | |
patch 8.1.1439: json_encode() is very slow for large resultsv8.1.1439
Problem: Json_encode() is very slow for large results.
Solution: In the growarray use a growth of at least 50%. (Ken Takata,
closes #4461)
| -rw-r--r-- | src/misc2.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/misc2.c b/src/misc2.c index 461d23e9f..69b9347bc 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -2057,6 +2057,13 @@ ga_grow(garray_T *gap, int n) { if (n < gap->ga_growsize) n = gap->ga_growsize; + + // A linear growth is very inefficient when the array grows big. This + // is a compromise between allocating memory that won't be used and too + // many copy operations. A factor of 1.5 seems reasonable. + if (n < gap->ga_len / 2) + n = gap->ga_len / 2; + new_len = gap->ga_itemsize * (gap->ga_len + n); pp = vim_realloc(gap->ga_data, new_len); if (pp == NULL) diff --git a/src/version.c b/src/version.c index 4b380d272..30c083107 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1439, +/**/ 1438, /**/ 1437, |